From: Jeremy Kerr <jk@ozlabs.org>
Date: Mon, 2 Apr 2007 00:54:51 +0000 (+1000)
Subject: Integrate devices/Makefile
X-Git-Tag: v0.0.1~38
X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=49d43d590027df23d45d3cd99f83517eeab67a43;hp=f60d0b2e7dbd9d85980866c68d0f87b6bc823663

Integrate devices/Makefile

Roll the Makefile for the udev-helper into the top-level Makefile.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---

diff --git a/Makefile b/Makefile
index b0a92ea..669e56a 100644
--- a/Makefile
+++ b/Makefile
@@ -2,14 +2,24 @@ CC=gcc
 TWIN_CFLAGS=$(shell pkg-config --cflags libtwin)
 TWIN_LDFLAGS=$(shell pkg-config --libs libtwin)
 
-LDFLAGS = $(TWIN_LDFLAGS)
-CFLAGS = -O0 -ggdb -Wall $(TWIN_CFLAGS)
+LDFLAGS = 
+CFLAGS = -O0 -ggdb -Wall
 
-OBJFILES = petitboot.o devices.o
+PARSERS = native
 
-petitboot: $(OBJFILES)
+all: petitboot udev-helper
+
+petitboot: petitboot.o devices.o
+	$(CC) $(LDFLAGS) -o $@ $^
+
+petitboot: LDFLAGS+=$(TWIN_LDFLAGS)
+petitboot: CFLAGS+=$(TWIN_CFLAGS)
+
+udev-helper: devices/udev-helper.o devices/params.o \
+		$(foreach p,$(PARSERS),devices/$(p)-parser.o)
 	$(CC) $(LDFLAGS) -o $@ $^
 
 clean:
 	rm -f petitboot
-	rm -f *.o
+	rm -f udev-helper
+	rm -f *.o devices/*.o
diff --git a/devices/Makefile b/devices/Makefile
deleted file mode 100644
index ec9d87c..0000000
--- a/devices/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-
-CC=gcc
-CFLAGS=-Wall -g -O2
-
-parsers = native-parser.o
-
-all: udev-helper
-
-udev-helper: udev-helper.o params.o $(parsers)