Fix check for null initrd and boot args

[petitboot] / Makefile

diff --git a/Makefile b/Makefile
index cecf20c9cc096e6b8eb257280a03dad4d1300974..2759a45ea4d3997ee24ca08db88e7cf00412593d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,12 +21,12 @@ petitboot: LDFLAGS+=$(TWIN_LDFLAGS)
 petitboot: CFLAGS+=$(TWIN_CFLAGS)
 
 udev-helper: devices/udev-helper.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 $@ $^
 
 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 $@ $^
 
@@ -41,6 +41,13 @@ install: all
 
 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 $@ $^
 
@@ -49,11 +56,13 @@ $(PACKAGE)-$(VERSION): clean
        cp -a artwork $@
        cp -a utils $@
        cp *.[ch] $@
-       cp -a devices/*.[ch] $@/devices/
+       cp -a devices/*.{c,h,sh} $@/devices/
+       cp -a devices/parser-tests $@/devices/
        cp Makefile $@
        cp TODO COPYING $@
 
 clean:
+       rm -rf $(PACKAGE)-$(VERSION)
        rm -f petitboot
        rm -f udev-helper
        rm -f *.o devices/*.o