summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Franzke <benjaminfranzke@googlemail.com>2013-01-15 09:05:02 +0100
committerBenjamin Franzke <benjaminfranzke@googlemail.com>2013-01-15 09:05:02 +0100
commitaf13b67496ba0ccc4c3a98f6b1df65edab053b8a (patch)
tree8e5024e3b0513e9dfa5f83a7eef554c235c12d88
parent36f416126ac098b8381d1a276e913e458db669ee (diff)
downloadmmswe-af13b67496ba0ccc4c3a98f6b1df65edab053b8a.tar.gz
mmswe-af13b67496ba0ccc4c3a98f6b1df65edab053b8a.tar.bz2
mmswe-af13b67496ba0ccc4c3a98f6b1df65edab053b8a.zip
Makefile: Use directfb-voodoo submodule for building
And simplify building process.
-rw-r--r--Makefile10
1 files changed, 4 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index f9478fc..c006177 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
DEBUG:=yes
-DIRECTFB_DIR:=DirectFB141_2k11R3_beta5
DBLATEX_OPTS="-P latex.encoding=utf8 -P latex.output.revhistory=0 -P doc.publisher.show=0 -P latex.class.options=a4paper,12pt,abstraction,titlepage -b xetex"
@@ -28,11 +27,8 @@ projekt_doku.pdf: projekt_doku.asciidoc hsw.sty
.PHONY: pluggit
pluggit:
- mkdir -p install/
- $(MAKE) -C $(DIRECTFB_DIR)/ -f makefile.voodoo DESTDIR=../install DEBUG=$(DEBUG) all package
- tar -xzf $(DIRECTFB_DIR)/DirectFB_Voodoo.tar.gz -C install/ --transform 's/DirectFB_Voodoo\///'
- rmdir install/DirectFB_Voodoo
- $(MAKE) -C pluggit/ -f makefile.voodoo DIRECTFB_VOODOO=../install all
+ $(MAKE) -C directfb-voodoo/ -f makefile.voodoo DESTDIR=../install DEBUG=$(DEBUG) all package
+ $(MAKE) -C pluggit/ -f makefile.voodoo DIRECTFB_VOODOO=../directfb-voodoo/DirectFB_Voodoo all
#.SUFFIXES: .dia .svg
#.dia.svg:
@@ -45,4 +41,6 @@ clean:
rm -f document.html presentation.html document.pdf ${GenSVG}
$(MAKE) -C pluggit/ -f makefile.voodoo clean
rm -f pluggit/src/classes.cpp
+ $(MAKE) -C directfb-voodoo/ -f makefile.voodoo clean
+ rm -rf directfb-voodoo/DirectFB_Voodoo*