Smallish adjustments.

[yaz-moved-to-github.git] / odr / Makefile

diff --git a/odr/Makefile b/odr/Makefile
index ec87fcc..b9f5bca 100644 (file)
--- 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.10 1995-03-27 08:33:13 quinn Exp $
+# $Id: Makefile,v 1.22 1995-06-25 10:53:55 quinn Exp $
 
 SHELL=/bin/sh
-INCLUDE=-I../include -I. -I../util
-LIBDIR=../../lib
+INCLUDE=-I../include -I.
+LIBDIR=../lib
 LIBINCLUDE=-L$(LIBDIR)
-CFLAGS= -g -Wall -pedantic -ansi -DODR_DEBUG
+CFLAGS= -g -Wall -pedantic -ansi   -DODR_DEBUG
 DEFS=$(INCLUDE)
 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 +28,7 @@ alll:
 $(LIB): $(PO)
        rm -f $(LIB)
        ar qc $(LIB) $(PO)
-       ranlib $(LIB)
+       $(RANLIB) $(LIB)
 
 $(LIBDIR):
        mkdir $(LIBDIR)
@@ -41,10 +42,9 @@ 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