X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=Makefile;h=8c5647e6903359d99a398a8c7f20c7ff32e648cf;hp=cdb9d9b719b4585744f2f332cef2e1e230ca02f7;hb=77fe8ea4a114c45e899a63ccfe767ce0dff722a0;hpb=57a0976b6e7d84f77a08dcd4cf03d6656dae60d4

diff --git a/Makefile b/Makefile
index cdb9d9b..8c5647e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,28 +1,29 @@
 # Copyright (C) 1994, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.10 1995-05-15 11:55:13 quinn Exp $
+# $Id: Makefile,v 1.18 1995-06-15 12:29:45 quinn Exp $
 
-# Define -DUSE_XTIMOSI to enable the xtimosi functionality. Remeber to
-# also modify the makefiles under yazlib/ and server/ (according the
-# comments found there). Uncomment RFC1006.
-
-DEFS=-DUSE_XTIMOSI -DDEBUG_MALLOC
+# Uncomment the lines below to enable mOSI communcation.
+ODEFS=-DUSE_XTIMOSI
 RFC1006=rfc1006
+LIBMOSI=../../xtimosi/src/libmosi.a ../lib/librfc.a
+XMOSI=xmosi.o
 
+DEFS=$(ODEFS)
 #CC=
 SHELL=/bin/sh
 MAKE=make
-SUBDIR=util odr asn $(RFC1006) ccl yazlib server makelib
+SUBDIR=util odr asn $(RFC1006) ccl comstack client server makelib
 
 all:
-	for i in $(SUBDIR); do cd $$i; if $(MAKE) CFLAGS="$(CFLAGS) $(DEFS)"; then cd ..; else exit 1; fi; done
+	for i in $(SUBDIR); do cd $$i; if $(MAKE) CFLAGS="$(CFLAGS) $(DEFS)" 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
 
 clean:
 	for i in $(SUBDIR); do (cd $$i; $(MAKE) clean); done
+	-rm lib/*.a
 
 cleanup:
 	rm -f `find $(SUBDIR) -name "*.[oa]" -print`
@@ -30,28 +31,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]'`