X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=Makefile;h=b26cb281f8d184d05d7a8576ee5ab4178d69394d;hp=764582bba3f20cb83c1f9d5db5b5edaab33c6476;hb=7a0b7f404028a63e9527b26eb09b6de9958acc34;hpb=0b7cc3673a866326b19f0832953557202e227347

diff --git a/Makefile b/Makefile
index 764582b..b26cb28 100644
--- a/Makefile
+++ b/Makefile
@@ -6,13 +6,13 @@ INSTALL=install
 TWIN_CFLAGS?=$(shell pkg-config --cflags libtwin)
 TWIN_LDFLAGS?=$(shell pkg-config --libs libtwin)
 
-LDFLAGS = 
-CFLAGS = -O0 -ggdb -Wall '-DPREFIX="$(PREFIX)"'
+LDFLAGS =
+CFLAGS = --std=gnu99 -O0 -ggdb -Wall '-DPREFIX="$(PREFIX)"'
 
 PARSERS = native yaboot kboot
 ARTWORK = background.jpg cdrom.png hdd.png usbpen.png tux.png cursor.gz
 
-all: petitboot udev-helper
+all: petitboot petitboot-udev-helper
 
 petitboot: petitboot.o devices.o
 	$(CC) $(LDFLAGS) -o $@ $^
@@ -20,13 +20,13 @@ petitboot: petitboot.o devices.o
 petitboot: LDFLAGS+=$(TWIN_LDFLAGS)
 petitboot: CFLAGS+=$(TWIN_CFLAGS)
 
-udev-helper: devices/udev-helper.o devices/params.o devices/parser.o \
-		devices/yaboot-cfg.o \
+petitboot-udev-helper: devices/petitboot-udev-helper.o devices/params.o \
+		devices/parser.o devices/paths.o devices/yaboot-cfg.o \
 		$(foreach p,$(PARSERS),devices/$(p)-parser.o)
 	$(CC) $(LDFLAGS) -o $@ $^
 
 parser-test: devices/parser-test.o devices/params.o devices/parser.o \
-		devices/yaboot-cfg.o \
+		devices/paths.o devices/yaboot-cfg.o \
 		$(foreach p,$(PARSERS),devices/$(p)-parser.o)
 	$(CC) $(LDFLAGS) -o $@ $^
 
@@ -34,25 +34,32 @@ devices/%: CFLAGS+=-I.
 
 install: all
 	$(INSTALL) -D petitboot $(DESTDIR)$(PREFIX)/sbin/petitboot
-	$(INSTALL) -D udev-helper $(DESTDIR)$(PREFIX)/sbin/udev-helper
+	$(INSTALL) -D petitboot-udev-helper \
+		$(DESTDIR)$(PREFIX)/sbin/petitboot-udev-helper
 	$(INSTALL) -Dd $(DESTDIR)$(PREFIX)/share/petitboot/artwork/
 	$(INSTALL) -t $(DESTDIR)$(PREFIX)/share/petitboot/artwork/ \
 		$(foreach a,$(ARTWORK),artwork/$(a))
 
 dist:	$(PACKAGE)-$(VERSION).tar.gz
 
+check:	parser-test
+	devices/parser-test.sh
+
+distcheck: dist
+	tar -xvf $(PACKAGE)-$(VERSION).tar.gz
+	cd $(PACKAGE)-$(VERSION) && make check
+
 $(PACKAGE)-$(VERSION).tar.gz: $(PACKAGE)-$(VERSION)
 	tar czvf $@ $^
 
 $(PACKAGE)-$(VERSION): clean
-	mkdir $@ $@/devices
-	cp -a artwork $@
-	cp *.[ch] $@
-	cp -a devices/*.[ch] $@/devices/
-	cp Makefile $@
-	cp TODO COPYING $@
-
+	for f in $$(git-ls-files); do \
+		d=$@/$$(dirname $$f); \
+		mkdir -p $$d; \
+		cp -a $$f $$d; \
+	done
 clean:
+	rm -rf $(PACKAGE)-$(VERSION)
 	rm -f petitboot
-	rm -f udev-helper
+	rm -f petitboot-udev-helper
 	rm -f *.o devices/*.o