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

diff --git a/odr/Makefile b/odr/Makefile
index 24a2d47..0512fb8 100644
--- a/odr/Makefile
+++ b/odr/Makefile
@@ -1,23 +1,23 @@
-# 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.8 1995-03-17 10:17:37 quinn Exp $
+# $Id: Makefile,v 1.27 1998-01-29 13:18:29 adam Exp $
 
 SHELL=/bin/sh
 INCLUDE=-I../include -I.
-LIBDIR=../../lib
+LIBDIR=../lib
 LIBINCLUDE=-L$(LIBDIR)
-#CFLAGS= -g -Wall -pedantic -ansi -DODR_DEBUG
-DEFS=$(INCLUDE)
+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 odr_mem.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: $(LIBDIR) $(LIB)
+all: $(LIBDIR) $(INCDIR) $(LIB)
 
 test: test.o $(LIB)
 	$(CC) $(CFLAGS) $(LIBINCLUDE) -o test test.o $(LIBS)
@@ -27,7 +27,7 @@ alll:
 $(LIB): $(PO)
 	rm -f $(LIB)
 	ar qc $(LIB) $(PO)
-	ranlib $(LIB)
+	$(RANLIB) $(LIB)
 
 $(LIBDIR):
 	mkdir $(LIBDIR)
@@ -41,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