[Fedora-livecd-list] [PATCH 4/4] Split Makefile

[Horst H. von Brand]

From: Horst H. von Brand <vonbrand(a)inf.utfsm.cl&gt; - unquoted

Signed-off-by: Horst H. von Brand <vonbrand(a)inf.utfsm.cl&gt;
---
 Makefile           |   11 ++++++-----
 creator/Makefile   |   19 +++++++++++++++++++
 installer/Makefile |    8 ++++++++
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 305ae4b..4ad6e7c 100644
--- a/Makefile
+++ b/Makefile
@@ -6,10 +6,9 @@ INSTALL_PROGRAM = ${INSTALL}
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_SCRIPT = ${INSTALL_PROGRAM}
 
-all: creator/run-init
-
-creator/run-init : creator/run-init.c creator/run-init.h creator/runinitlib.c Makefile
-	cd creator && gcc -o run-init -static run-init.c runinitlib.c && strip
run-init
+all:
+	make -C creator all
+	make -C installer all
 
 install:
 	$(INSTALL_PROGRAM) -D creator/livecd-creator $(DESTDIR)/usr/bin/livecd-creator
@@ -40,7 +39,9 @@ dist : all
 	git-tar-tree HEAD livecd-tools-$(VERSION) | bzip2 -9v >
livecd-tools-$(VERSION).tar.bz2
 
 clean:
-	rm -f *~ creator/*~ creator/run-init installer/*~
+	rm -f *~ 
+	make -C creator clean
+	make -C installer clean
 
 .PHONY: all install uninstall dist clean
 
diff --git a/creator/Makefile b/creator/Makefile
new file mode 100644
index 0000000..c736e90
--- /dev/null
+++ b/creator/Makefile
@@ -0,0 +1,19 @@
+CC	= gcc
+CFLAGS  = -static
+
+all: run-init
+
+run-init: run-init.o runinitlib.o
+	$(CC) $(CFLAGS) $^ -o $@
+	/usr/bin/strip run-init
+
+run-init.o: run-init.h
+runinitlib.o: run-init.h
+
+clean:
+	rm -f run-init-o runinitlib.o run-init \
+	      *~
+
+.PHONY: all clean
+
+	
\ No newline at end of file
diff --git a/installer/Makefile b/installer/Makefile
new file mode 100644
index 0000000..9db2a72
--- /dev/null
+++ b/installer/Makefile
@@ -0,0 +1,8 @@
+all:
+
+clean:
+	rm -f *~
+	
+.PHONY: all clean
+	
+	
\ No newline at end of file
-- 
1.5.0.rc1.gb60d