X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=Makefile;h=a491ea6b327f159042a0789edad3901288d18661;hp=e690b1b11a704f49ad71bbf7973fae260b267e10;hb=f305305306da9af74ed6c559f2b06353fd5a7c82;hpb=2d093b88ca5c238b6394c1254078841b19f724ff

diff --git a/Makefile b/Makefile
index e690b1b..a491ea6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,27 @@
 # 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.22 1995-08-28 16:29:45 quinn Exp $
 
 # Uncomment the lines below to enable mOSI communcation.
-DEFS=-DUSE_XTIMOSI
-RFC1006=rfc1006
-LIBMOSI=../../xtimosi/src/libmosi.a ../lib/librfc.a
-XMOSI=xmosi.o
+#ODEFS=-DUSE_XTIMOSI
+#RFC1006=rfc1006
+#LIBMOSI=../../xtimosi/src/libmosi.a ../lib/librfc.a
+#XMOSI=xmosi.o
 
+CDEFS=$(ODEFS)
 #CC=
 SHELL=/bin/sh
 MAKE=make
-SUBDIR=util odr asn $(RFC1006) ccl yazlib client server makelib
+SUBDIR=util odr asn $(RFC1006) ccl comstack client server makelib
+# Add external libraries to the ELIBS macro
+ELIBS=
+CONTROL=RANLIB="ranlib" ELIBS=$(ELIBS)
 
 all:
-	for i in $(SUBDIR); do cd $$i; if $(MAKE) CFLAGS="$(CFLAGS) $(DEFS)" LIBMOSI="$(LIBMOSI)" XMOSI="$(XMOSI)"; then cd ..; else exit 1; fi; done
+	for i in $(SUBDIR); do cd $$i; if $(MAKE) $(CONTROL)\
+	CFLAGS="$(CFLAGS) $(CDEFS)" LIBMOSI="$(LIBMOSI)" XMOSI="$(XMOSI)";\
+	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
@@ -30,28 +36,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]'`