Fixed dependency control

diff --git a/Makefile b/Makefile
index e690b1b..851f031 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Copyright (C) 1994, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.13 1995-05-22 14:02:23 quinn Exp $
+# $Id: Makefile,v 1.14 1995-05-30 10:25:40 quinn Exp $
 
 # Uncomment the lines below to enable mOSI communcation.
 DEFS=-DUSE_XTIMOSI
@@ -30,28 +30,28 @@ cleanup:
        rm -f `find $(SUBDIR) -name "errlist" -print`
        rm -f `find $(SUBDIR) -name "a.out" -print`
 
-distclean: cleanup clean
+distclean: clean cleandepend
+
+cleandepend: 
        for i in $(SUBDIR); do (cd $$i; \
-               mv Makefile Makefile.old; \
-               sed '/^#Depend/q' <Makefile.old >Makefile; \
-               rm Makefile.old); done
+               if sed '/^#Depend/q' <Makefile >Makefile.tmp; then \
+               mv -f Makefile.tmp Makefile; fi; rm -f .depend); done
 
-usedepend1:
+taildepend:
        for i in $(SUBDIR); do (cd $$i; \
-               mv Makefile Makefile.tmp; \
-               sed 's/^if/#if/' <Makefile.tmp|sed 's/^include/#include/'| \
+               if sed 's/^if/#if/' <Makefile|sed 's/^include/#include/'| \
                sed 's/^endif/#endif/' | \
-               sed 's/^depend: depend2/depend: depend1/g' >Makefile; \
-               rm Makefile.tmp); done
+               sed 's/^depend: depend2/depend: depend1/g' | \
+               sed '/^#Depend/q' >Makefile.tmp; then \
+               mv -f Makefile.tmp Makefile; fi); done
 
-usedepend2:
+gnudepend:
        for i in $(SUBDIR); do (cd $$i; \
-               mv Makefile Makefile.tmp; \
-               sed '/^#Depend/q' <Makefile.tmp| \
+               if sed '/^#Depend/q' <Makefile| \
                sed 's/^#if/if/' |sed 's/^#include/include/'| \
                sed 's/^#endif/endif/' | \
-               sed 's/^depend: depend1/depend: depend2/g' >Makefile; \
-               rm Makefile.tmp); done
+               sed 's/^depend: depend1/depend: depend2/g' >Makefile.tmp;then \
+               mv -f Makefile.tmp Makefile; fi); done
 
 wc:
        wc `find . -name '*.[ch]'`

diff --git a/asn/Makefile b/asn/Makefile
index a37c56e..02329af 100644 (file)
--- a/asn/Makefile
+++ b/asn/Makefile
@@ -1,7 +1,7 @@
 # Copyright (C) 1994, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.12 1995-05-29 08:10:38 quinn Exp $
+# $Id: Makefile,v 1.13 1995-05-30 10:25:45 quinn Exp $
 
 SHELL=/bin/sh
 INCLUDE=-I../include -I.
@@ -35,10 +35,9 @@ clean:
 depend: depend2
 
 depend1:
-       mv Makefile Makefile.tmp
-       sed '/^#Depend/q' <Makefile.tmp >Makefile
-       $(CPP) $(INCLUDE) -M *.c >>Makefile
-       -rm Makefile.tmp
+       sed '/^#Depend/q' <Makefile >Makefile.tmp
+       $(CPP) $(DEFS) -M *.c >>Makefile.tmp
+       mv -f Makefile.tmp Makefile
 
 depend2:
        $(CPP) $(INCLUDE) -M *.c >.depend       

diff --git a/ccl/Makefile b/ccl/Makefile
index f25d7d9..c0379d5 100644 (file)
--- a/ccl/Makefile
+++ b/ccl/Makefile
@@ -2,7 +2,10 @@
 # Europagate, 1995
 #
 # $Log: Makefile,v $
-# Revision 1.2  1995-04-17 09:37:36  quinn
+# Revision 1.3  1995-05-30 10:25:45  quinn
+# Fixed dependency control
+#
+# Revision 1.2  1995/04/17  09:37:36  quinn
 # *** empty log message ***
 #
 # Revision 1.1  1995/04/10  10:28:16  quinn
@@ -57,10 +60,6 @@ clean:
 depend: depend2
 
 depend1:
-       mv Makefile Makefile.tmp
-       sed '/^#Depend/q' <Makefile.tmp >Makefile
-       $(CPP) $(INCLUDE) -M *.c >>Makefile
-       -rm Makefile.tmp
 
 depend2:
        $(CPP) $(INCLUDE) -M *.c >.depend       

diff --git a/client/Makefile b/client/Makefile
index e4c37d2..db508de 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -1,7 +1,7 @@
 # Copyright (C) 1994, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.4 1995-05-30 10:16:03 quinn Exp $
+# $Id: Makefile,v 1.5 1995-05-30 10:25:45 quinn Exp $
 
 LIBDIR=../lib
 
@@ -37,10 +37,9 @@ clean:
 depend: depend2
 
 depend1:
-       mv Makefile Makefile.tmp
-       sed '/^#Depend/q' <Makefile.tmp >Makefile
-       $(CPP) $(INCLUDE) -M *.c >>Makefile
-       -rm Makefile.tmp
+       sed '/^#Depend/q' <Makefile >Makefile.tmp
+       $(CPP) $(DEFS) -M *.c >>Makefile.tmp
+       mv -f Makefile.tmp Makefile
 
 depend2:
        $(CPP) $(INCLUDE) -M *.c >.depend       

diff --git a/odr/Makefile b/odr/Makefile
index 00cc1ce..1af7ed4 100644 (file)
--- a/odr/Makefile
+++ b/odr/Makefile
@@ -1,7 +1,7 @@
 # Copyright (C) 1994, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.19 1995-04-21 16:31:56 quinn Exp $
+# $Id: Makefile,v 1.20 1995-05-30 10:25:46 quinn Exp $
 
 SHELL=/bin/sh
 INCLUDE=-I../include -I.
@@ -41,10 +41,9 @@ clean:
 depend: depend2
 
 depend1:
-       mv Makefile Makefile.tmp
-       sed '/^#Depend/q' <Makefile.tmp >Makefile
-       $(CPP) $(INCLUDE) -M *.c >>Makefile
-       -rm Makefile.tmp
+       sed '/^#Depend/q' <Makefile >Makefile.tmp
+       $(CPP) $(DEFS) -M *.c >>Makefile.tmp
+       mv -f Makefile.tmp Makefile
 
 depend2:
        $(CPP) $(INCLUDE) -M *.c >.depend       

diff --git a/rfc1006/Makefile b/rfc1006/Makefile
index 78fde4d..3e679d7 100644 (file)
--- a/rfc1006/Makefile
+++ b/rfc1006/Makefile
@@ -1,7 +1,7 @@
 # Copyright (C) 1994, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.4 1995-05-29 08:11:54 quinn Exp $
+# $Id: Makefile,v 1.5 1995-05-30 10:25:46 quinn Exp $
 
 SHELL=/bin/sh
 INCLUDE=-I../include -I. -I../../xtimosi/src
@@ -38,10 +38,9 @@ clean:
 depend: depend2
 
 depend1:
-       mv Makefile Makefile.tmp
-       sed '/^#Depend/q' <Makefile.tmp >Makefile
-       $(CPP) $(INCLUDE) -M *.c >>Makefile
-       -rm Makefile.tmp
+       sed '/^#Depend/q' <Makefile >Makefile.tmp
+       $(CPP) $(DEFS) -M *.c >>Makefile.tmp
+       mv -f Makefile.tmp Makefile
 
 depend2:
        $(CPP) $(INCLUDE) -M *.c >.depend       

diff --git a/server/Makefile b/server/Makefile
index 824b76e..e90ac81 100644 (file)
--- a/server/Makefile
+++ b/server/Makefile
@@ -1,7 +1,7 @@
 # Copyright (C) 1994, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.24 1995-05-30 10:16:09 quinn Exp $
+# $Id: Makefile,v 1.25 1995-05-30 10:25:46 quinn Exp $
 
 LIBDIR=../lib
 
@@ -44,10 +44,9 @@ clean:
 depend: depend2
 
 depend1:
-       mv Makefile Makefile.tmp
-       sed '/^#Depend/q' <Makefile.tmp >Makefile
-       $(CPP) $(INCLUDE) -M *.c >>Makefile
-       -rm Makefile.tmp
+       sed '/^#Depend/q' <Makefile >Makefile.tmp
+       $(CPP) $(DEFS) -M *.c >>Makefile.tmp
+       mv -f Makefile.tmp Makefile
 
 depend2:
        $(CPP) $(INCLUDE) -M *.c >.depend       

diff --git a/util/Makefile b/util/Makefile
index 03884b5..c98821a 100644 (file)
--- a/util/Makefile
+++ b/util/Makefile
@@ -1,7 +1,7 @@
 # Copyright (C) 1994, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.11 1995-05-29 08:12:16 quinn Exp $
+# $Id: Makefile,v 1.12 1995-05-30 10:25:47 quinn Exp $
 
 SHELL=/bin/sh
 INCLUDE=-I../include -I.
@@ -41,10 +41,9 @@ clean:
 depend: depend2
 
 depend1:
-       mv Makefile Makefile.tmp
-       sed '/^#Depend/q' <Makefile.tmp >Makefile
-       $(CPP) $(INCLUDE) -M *.c >>Makefile
-       -rm Makefile.tmp
+       sed '/^#Depend/q' <Makefile >Makefile.tmp
+       $(CPP) $(DEFS) -M *.c >>Makefile.tmp
+       mv -f Makefile.tmp Makefile
 
 depend2:
        $(CPP) $(INCLUDE) -M *.c >.depend