Fix "make clean", "make installer"

- "make clean" should not clean up things that "make installer" cannot
  regenerate.
- "make installer" should not descend into subdirectories which are
  target only, e.g. com32 and sample.

The Linux platform stuff in com32 is old and bitrotted, and was only
for debugging in the first place.  Just ignore it.

diff --git a/Makefile b/Makefile
index fa49c2c..2be5389 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -40,12 +40,12 @@ BOBJECTS = $(BTARGET) \
 # BESUBDIRS and IESUBDIRS are "early", i.e. before the root; BSUBDIRS
 # and ISUBDIRS are "late", after the root.
 BESUBDIRS = 
-BSUBDIRS = codepage core memdisk mbr memdump gpxe dos win32
+BSUBDIRS = codepage core memdisk com32 mbr memdump gpxe sample dos win32
 ITARGET  = 
 IOBJECTS = $(ITARGET) dos/copybs.com utils/gethostip utils/mkdiskimage \
        mtools/syslinux linux/syslinux extlinux/extlinux
 IESUBDIRS =
-ISUBDIRS = mtools linux extlinux utils com32 sample
+ISUBDIRS = mtools linux extlinux utils
 
 # Things to install in /usr/bin
 INSTALL_BIN   =        mtools/syslinux

diff --git a/core/Makefile b/core/Makefile
index 983a341..ccbb055 100644 (file)
--- a/core/Makefile
+++ b/core/Makefile
@@ -165,10 +165,10 @@ tidy dist:
        rm -f $(OBSOLETE)
 
 clean: tidy
-       rm -f $(ITARGET) *_bin.c
+       rm -f $(ITARGET)
 
 spotless: clean
-       rm -f $(BTARGET) .depend
+       rm -f $(BTARGET) *_bin.c .depend
 
 .depend:
        rm -f .depend

diff --git a/gpxe/Makefile b/gpxe/Makefile
index 7568ea0..6190af5 100644 (file)
--- a/gpxe/Makefile
+++ b/gpxe/Makefile
@@ -23,9 +23,9 @@ all: $(TARGETS)
 tidy:
 
 clean: tidy
-       rm -f $(TARGETS) src/bin/undionly.kpxe
 
 dist:
+       rm -f $(TARGETS)
        $(MAKE) -C src veryclean > /dev/null 2>&1
 
 spotless: clean dist