about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2006-08-19 06:22:11 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2006-08-19 06:22:11 +0000
commit5e2853ff615011936ee425922cbc2b437de13c53 (patch)
tree59f13e60c6b66d9fe3ca14258901ab0f9ccd163e
parenta9f3d71d8eb904664d2d55f7d4219701a9a257c7 (diff)
downloadnetpbm-mirror-5e2853ff615011936ee425922cbc2b437de13c53.tar.gz
netpbm-mirror-5e2853ff615011936ee425922cbc2b437de13c53.tar.xz
netpbm-mirror-5e2853ff615011936ee425922cbc2b437de13c53.zip
Fix distclean
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@5 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--GNUmakefile2
-rw-r--r--Makefile.common6
-rw-r--r--buildtools/Makefile3
3 files changed, 5 insertions, 6 deletions
diff --git a/GNUmakefile b/GNUmakefile
index d26ddf50..56c6126c 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -384,7 +384,7 @@ localclean:
 # because no other makes will work after that is done.
 distclean: localdistclean
 .PHONY: localdistclean
-localdistclean:
+localdistclean: localclean
 	-rm -f `find -type l`
 	-rm -f Makefile.config
 
diff --git a/Makefile.common b/Makefile.common
index a6b6952e..51aef8a0 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -451,8 +451,8 @@ EXEPATTERN =
 endif
 clean: $(SUBDIRS:%=%/clean) thisdirclean-common
 
-.PHONY: thisdirclean-common
-thisdirclean-common:
+.PHONY: thisdirclean
+thisdirclean:
 	-rm -f *.o *.o2 *.a *.so *.so.* *.dll *.dylib *.cat *~ *.i *.s \
 	  $(EXEPATTERN) *.def *.lnk \
 	  core *.core mergelist mergetrylist *.c1 empty.c \
@@ -460,7 +460,7 @@ thisdirclean-common:
 	-rm -rf importinc
 
 .PHONY: distclean
-distclean: $(SUBDIRS:%=%/distclean) thisdirclean-common
+distclean: $(SUBDIRS:%=%/distclean) thisdirclean
 	rm -f Makefile.depend
 
 DEP_SOURCES = $(wildcard *.c *.cpp *.cc)
diff --git a/buildtools/Makefile b/buildtools/Makefile
index 63da1adf..8ea61abe 100644
--- a/buildtools/Makefile
+++ b/buildtools/Makefile
@@ -39,8 +39,7 @@ typegen.o endiangen.o:%.o:%.c
 $(PROGS):%:%.o
 	$(LD_FOR_BUILD) -o $@ $<
 
-clean: cleanlocal
+distclean clean: cleanlocal
 .PHONY: cleanlocal
 cleanlocal:
 	rm -f $(PROGS)
-