X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2FMakefile;h=54071a9e3ccd20a2037efe4c3f9fdbddb0c7e784;hb=2da6a9a95d6007eca27f715dbf77bea323cb9069;hp=522f7e272a03e03837cbaa92e7a1cfc8f954b0f3;hpb=b3500b4a0d2b4bb25bb6d4e9ab72e0e488655da6;p=yaz-moved-to-github.git

diff --git a/odr/Makefile b/odr/Makefile
index 522f7e2..54071a9 100644
--- a/odr/Makefile
+++ b/odr/Makefile
@@ -1,23 +1,24 @@
 # Copyright (C) 1994, Index Data I/S 
 # All rights reserved.
 # Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile,v 1.7 1995-03-14 10:27:34 quinn Exp $
+# $Id: Makefile,v 1.26 1997-09-17 12:10:33 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
-CPP=cc -E
+	odr_choice.o odr_any.o ber_any.o odr.o odr_mem.o dumpber.o \
+	odr_unicode.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 +28,7 @@ alll:
 $(LIB): $(PO)
 	rm -f $(LIB)
 	ar qc $(LIB) $(PO)
-	ranlib $(LIB)
+	$(RANLIB) $(LIB)
 
 $(LIBDIR):
 	mkdir $(LIBDIR)
@@ -41,13 +42,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