ZDist prefix inherited. CPP command inherited. New make entry

'cleandepend' which effectively remove any dependencies specification
in sub-Makefiles.

diff --git a/Makefile b/Makefile
index 384ffb7..5d6e24d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,12 @@
 # Europagate, 1994-1995.
 #
 # $Log: Makefile,v $
-# Revision 1.10  1995/02/16 18:36:18  quinn
+# Revision 1.11  1995/02/21 12:10:56  adam
+# ZDist prefix inherited. CPP command inherited. New make entry
+# 'cleandepend' which effectively remove any dependencies specification
+# in sub-Makefiles.
+#
+# Revision 1.10  1995/02/16  18:36:18  quinn
 # Changed order yet again
 #
 # Revision 1.9  1995/02/16  18:35:43  quinn
@@ -37,24 +42,22 @@ MAKE=make
 SUBDIR=res+log util fml ccl zlayer kernel
 CFLAGS=-Wall -g -pedantic -ansi 
 #CC=gcc
+CPP=$(CC) -E
+ZPRE=/home/proj/zdist/zdist102b1-1/libz3950
 
 all:
-       for i in $(SUBDIR); do cd $$i; if $(MAKE) CFLAGS="$(CFLAGS)" CC="$(CC)"; then cd ..; else exit 1; fi; done
+       for i in $(SUBDIR); do cd $$i; if $(MAKE) CFLAGS="$(CFLAGS)" CC="$(CC)" ZPRE="$(ZPRE)" CPP="$(CPP)"; then cd ..; else exit 1; fi; done
 
 dep depend:
        for i in $(SUBDIR); do cd $$i; if $(MAKE) depend; then cd ..; else exit 1; fi; done
 
 clean:
-       rm -f lib/*.a
+       -rm -f lib/*.a
        for i in $(SUBDIR); do (cd $$i; $(MAKE) clean); done
 
-cleanup:
-       rm -f lib `find $(SUBDIR) -name "*.[oa]" -print`
-       rm -f `find $(SUBDIR) -name "core" -print`
-       rm -f `find $(SUBDIR) -name "errlist" -print`
-       rm -f `find $(SUBDIR) -name "a.out" -print`
+distclean: clean cleandepend
 
-distclean: cleanup clean
+cleandepend: 
        for i in $(SUBDIR); do (cd $$i; \
                mv Makefile Makefile.old; \
                sed '/^#Depend/q' <Makefile.old >Makefile; \