about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2008-11-01 01:58:45 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2008-11-01 01:58:45 +0000
commitbafe684838066eb0fdbc6088d8b5b4e05b84beec (patch)
tree5173351e355a7924d506002950468f90b1eb619d
parente8fcb9f8dcaf75cc182c83fde3be4a2d9676b58b (diff)
downloadnetpbm-mirror-bafe684838066eb0fdbc6088d8b5b4e05b84beec.tar.gz
netpbm-mirror-bafe684838066eb0fdbc6088d8b5b4e05b84beec.tar.xz
netpbm-mirror-bafe684838066eb0fdbc6088d8b5b4e05b84beec.zip
Rename Makefile.depend to depend.mk
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@769 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--common.mk14
-rw-r--r--lib/util/Makefile2
2 files changed, 7 insertions, 9 deletions
diff --git a/common.mk b/common.mk
index 3394a6de..5e87ba27 100644
--- a/common.mk
+++ b/common.mk
@@ -491,7 +491,7 @@ thisdirclean:
 
 .PHONY: distclean
 distclean: $(SUBDIRS:%=%/distclean) thisdirclean
-	rm -f Makefile.depend
+	rm -f depend.mk
 
 DEP_SOURCES = $(wildcard *.c *.cpp *.cc)
 
@@ -501,7 +501,7 @@ dep: $(SUBDIRS:%=%/dep) importinc
 # before the first make after a clean.
 
 ifneq ($(DEP_SOURCES)x,x)
-	$(CC) -MM -MG $(INCLUDES) $(DEP_SOURCES) >Makefile.depend
+	$(CC) -MM -MG $(INCLUDES) $(DEP_SOURCES) >depend.mk
 endif
 
 # Note: if I stack all these subdirectory targets into one rule, I get
@@ -563,13 +563,13 @@ $(SUBDIRS:%=$(CURDIR)/%) $(DIRS2):
 # The automatic dependency generation is a pain in the butt and
 # totally unnecessary for people just installing the distributed code,
 # so to avoid needless failures in the field and a complex build, the
-# rule to generate Makefile.depend automatically simply creates an
+# rule to generate depend.mk automatically simply creates an
 # empty file.  A developer may do 'make dep' to create a
-# Makefile.depend full of real dependencies.
+# depend.mk full of real dependencies.
 
-Makefile.depend:
-	cat /dev/null >Makefile.depend
+depend.mk:
+	cat /dev/null >$@
 
-include Makefile.depend
+include depend.mk
 
 FORCE:
diff --git a/lib/util/Makefile b/lib/util/Makefile
index ea290bcb..8b3fa1c1 100644
--- a/lib/util/Makefile
+++ b/lib/util/Makefile
@@ -25,5 +25,3 @@ $(UTILOBJECTS):%.o:%.c importinc
 
 testnstring: test.c nstring.h nstring.o
 	$(CC) $(CFLAGS) $(CADD) -o $@ nstring.o $<
-
-include Makefile.depend