X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=odr%2FMakefile;h=0512fb89c37b1c5660709a507e0fb7a8165b49c6;hp=b17aa3d79c282547035bcf7e50e57233cb957da8;hb=ffb88e8bb97c6e24989b7f04b8bbf1a4203d2f72;hpb=398d5857516b707c1697721ec92bb0ec15619252

diff --git a/odr/Makefile b/odr/Makefile
index b17aa3d..0512fb8 100644
--- a/odr/Makefile
+++ b/odr/Makefile
@@ -1,30 +1,36 @@
-# Copyright (C) 1994, Index Data I/S 
+# Copyright (C) 1995-1998, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.4 1995-03-07 09:23:12 quinn Exp $
+# $Id: Makefile,v 1.27 1998-01-29 13:18:29 adam Exp $
 
 SHELL=/bin/sh
 INCLUDE=-I../include -I.
-#CFLAGS= -g -Wall -pedantic -ansi -DODR_DEBUG
-DEFS=$(INCLUDE)
-LIB=odr.a
+LIBDIR=../lib
+LIBINCLUDE=-L$(LIBDIR)
+DEFS=$(INCLUDE) $(CDEFS) # -DODR_DEBUG
+LIB=$(LIBDIR)/libodr.a
+LIBS=-lodr
 PO = odr_bool.o ber_bool.o ber_len.o ber_tag.o odr_util.o odr_null.o \
 	ber_null.o odr_int.o ber_int.o odr_tag.o odr_cons.o odr_seq.o\
 	odr_oct.o ber_oct.o odr_bit.o ber_bit.o odr_oid.o ber_oid.o odr_use.o \
-	odr_choice.o odr_any.o ber_any.o odr.o
-CPP=cc -E
+	odr_choice.o odr_any.o ber_any.o odr.o odr_mem.o dumpber.o
+CPP=$(CC) -E
+RANLIB=ranlib
 
-all: $(LIB) test
+all: $(LIBDIR) $(INCDIR) $(LIB)
 
 test: test.o $(LIB)
-	$(CC) $(CFLAGS) $(INCLUDE) -o test test.o $(LIB)
+	$(CC) $(CFLAGS) $(LIBINCLUDE) -o test test.o $(LIBS)
 
 alll:
 
 $(LIB): $(PO)
 	rm -f $(LIB)
 	ar qc $(LIB) $(PO)
-	ranlib $(LIB)
+	$(RANLIB) $(LIB)
+
+$(LIBDIR):
+	mkdir $(LIBDIR)
 
 .c.o:
 	$(CC) -c $(DEFS) $(CFLAGS) $<
@@ -35,13 +41,12 @@ 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	
+	$(CPP) $(DEFS) -M *.c >.depend	
 
 ifeq (.depend,$(wildcard .depend))
 include .depend