Some makefile changes to account for memdisk

diff --git a/Makefile b/Makefile
index 5914833..79a5d30 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -130,17 +130,23 @@ gethostip: gethostip.o
 install: all
        install -c $(INSTALL_BIN) $(INSTALLROOT)$(BINDIR)
 
-tidy:
+local-tidy:
        rm -f *.o *_bin.c stupid.*
        rm -f syslinux.lst copybs.lst pxelinux.lst isolinux*.lst
        rm -f $(OBSOLETE)
 
-clean: tidy
+tidy: local-tidy
+       $(MAKE) -C memdisk tidy
+
+clean: local-tidy
        rm -f $(ITARGET)
        $(MAKE) -C sample clean
+       $(MAKE) -C memdisk clean
 
 dist: tidy
-       rm -f *~ \#* core
+       for $$dir in . sample memdisk ; do \
+               ( cd $$dir && rm -f *~ \#* core ) ; \
+       done
 
 spotless: clean dist
        rm -f $(BTARGET)

diff --git a/sample/Makefile b/sample/Makefile
index d38d5a3..689278b 100644 (file)
--- a/sample/Makefile
+++ b/sample/Makefile
@@ -24,6 +24,5 @@ syslogo.lss:  syslogo.png $(PPMTOLSS16)
                $(PPMTOLSS16) \#000000=0 \#d0d0d0=7 \#f6f6f6=15 \
                > syslogo.lss
 
-
 clean:
        rm -f *.lss