From ed67201fcc004ccb0eb20e5489d71ed69cfb7428 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Thu, 25 Sep 2008 16:46:02 -0700 Subject: [PATCH] Fix "make clean" confusion "make clean" must NOT remove stuff that "make installer" should not rebuild. This is a somewhat unfortunate choice of naming, but that's the way it is. Signed-off-by: H. Peter Anvin --- com32/gdbstub/Makefile | 5 +++-- com32/lib/Makefile | 6 ++---- com32/libutil/Makefile | 5 ++++- com32/menu/Makefile | 3 ++- com32/modules/Makefile | 3 ++- com32/samples/Makefile | 3 ++- modules/Makefile | 2 +- 7 files changed, 16 insertions(+), 11 deletions(-) diff --git a/com32/gdbstub/Makefile b/com32/gdbstub/Makefile index c5b79ea..2c9171e 100644 --- a/com32/gdbstub/Makefile +++ b/com32/gdbstub/Makefile @@ -32,13 +32,14 @@ all: $(MODULES) $(TESTFILES) gdbstub.elf : $(OBJS) $(LIBS) $(C_LIBS) $(LD) $(LDFLAGS) -o $@ $^ -tidy dist: +tidy dist clean: rm -f *.o *.lo *.a *.lst *.elf .*.d *.tmp clean: tidy - rm -f *.lss *.c32 *.lnx *.com + rm -f *.lnx spotless: clean + rm -f *.lss *.c32 *.com rm -f *~ \#* install: all diff --git a/com32/lib/Makefile b/com32/lib/Makefile index dbca5b6..0279904 100644 --- a/com32/lib/Makefile +++ b/com32/lib/Makefile @@ -108,15 +108,13 @@ libcom32.a : $(LIBOBJS) $(AR) cq $@ $^ $(RANLIB) $@ -tidy dist: +tidy dist clean: rm -f sys/vesa/alphatbl.c find . \( -name \*.o -o -name .\*.d -o -name \*.tmp \) -print0 | \ xargs -0r rm -f -clean: tidy - rm -f *.a - spotless: clean + rm -f *.a rm -f *~ \#* */*~ */\#* install: all diff --git a/com32/libutil/Makefile b/com32/libutil/Makefile index d7967cd..31754a9 100644 --- a/com32/libutil/Makefile +++ b/com32/libutil/Makefile @@ -52,7 +52,10 @@ tidy dist: rm -f *.o *.lo *.lst *.elf .*.d *.tmp clean: tidy - rm -f *.lss *.a *.c32 *.lnx *.com + rm -f *.lnx libutil_lnx.a + +spotless: clean + rm -f *.lss *.a *.c32 *.com spotless: clean rm -f *~ \#* diff --git a/com32/menu/Makefile b/com32/menu/Makefile index 44212c3..d6293bb 100644 --- a/com32/menu/Makefile +++ b/com32/menu/Makefile @@ -38,9 +38,10 @@ tidy dist: rm -f *.o *.lo *.a *.lst *.elf .*.d *.tmp clean: tidy - rm -f *.lss *.c32 *.lnx *.com + rm -f *.lnx spotless: clean + rm -f *.lss *.c32 *.com rm -f *~ \#* install: all diff --git a/com32/modules/Makefile b/com32/modules/Makefile index eb3a9a1..7a52ba9 100644 --- a/com32/modules/Makefile +++ b/com32/modules/Makefile @@ -41,9 +41,10 @@ tidy dist: rm -f *.o *.lo *.a *.lst *.elf .*.d *.tmp clean: tidy - rm -f *.lss *.c32 *.lnx *.com + rm -f *.lnx spotless: clean + rm -f *.lss *.c32 *.com rm -f *~ \#* install: all diff --git a/com32/samples/Makefile b/com32/samples/Makefile index 28260a3..abba4d6 100644 --- a/com32/samples/Makefile +++ b/com32/samples/Makefile @@ -27,9 +27,10 @@ tidy dist: rm -f *.o *.lo *.a *.lst *.elf .*.d *.tmp clean: tidy - rm -f *.lss *.c32 *.lnx *.com + rm -f *.lnx spotless: clean + rm -f *.lss *.c32 *.com rm -f *~ \#* install: # Don't install samples diff --git a/modules/Makefile b/modules/Makefile index 5caf5e6..1ffe9ef 100644 --- a/modules/Makefile +++ b/modules/Makefile @@ -58,6 +58,6 @@ tidy dist: rm -f *.o *.a *.lst *.elf clean: tidy - rm -f $(BINS) spotless: clean + rm -f $(BINS) -- 2.7.4