Two versions of depend. Type 1 is the tail-type compatible with

all make programs. Type 2 is the GNU make with include facility.
Type 2 is default. Choose with 'make usedepend1/usedepend2'.

diff --git a/Makefile b/Makefile
index 719c68b..ef6f11b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,20 @@
 # Copyright (C) 1994, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.13 1994-09-22 10:38:34 quinn Exp $
+# $Id: Makefile,v 1.14 1994-09-22 10:42:45 adam Exp $
 
 SHELL=/bin/sh
-SUBDIR=util bfile dict
+MAKE=make
+SUBDIR=util bfile dict 
 
 all:
-       for i in $(SUBDIR); do cd $$i; if make; then cd ..; else exit 1; fi; done
+       for i in $(SUBDIR); do cd $$i; if $(MAKE); then cd ..; else exit 1; fi; done
 
 dep depend:
-       for i in $(SUBDIR); do (cd $$i; make dep); done
+       for i in $(SUBDIR); do cd $$i; if $(MAKE) depend; then cd ..; else exit 1; fi; done
 
 clean:
-       for i in $(SUBDIR); do (cd $$i; make clean); done
+       for i in $(SUBDIR); do (cd $$i; $(MAKE) clean); done
 
 cleanup:
        rm -f `find $(SUBDIR) -name "*.[oa]" -print`
@@ -26,7 +27,24 @@ distclean: cleanup clean
                mv Makefile Makefile.old; \
                sed '/^#Depend/q' <Makefile.old >Makefile; \
                rm Makefile.old); done
-               
+
+usedepend1:
+       for i in $(SUBDIR); do (cd $$i; \
+               mv Makefile Makefile.tmp; \
+               sed 's/^if/#if/' <Makefile.tmp|sed 's/^include/#include/'| \
+               sed 's/^endif/#endif/' | \
+               sed 's/^depend: depend2/depend: depend1/g' >Makefile; \
+               rm Makefile.tmp); done
+
+usedepend2:
+       for i in $(SUBDIR); do (cd $$i; \
+               mv Makefile Makefile.tmp; \
+               sed '/^#Depend/q' <Makefile.tmp| \
+               sed 's/^#if/if/' |sed 's/^#include/include/'| \
+               sed 's/^#endif/endif/' | \
+               sed 's/^depend: depend1/depend: depend2/g' >Makefile; \
+               rm Makefile.tmp); done
+
 wc:
        wc `find . -name '*.[ch]'`