projects
/
yaz-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1fbf990
)
Minor changes to Makefile(s).
author
Adam Dickmeiss
<adam@indexdata.dk>
Tue, 25 Aug 1998 16:19:37 +0000
(16:19 +0000)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Tue, 25 Aug 1998 16:19:37 +0000
(16:19 +0000)
Makefile.in
patch
|
blob
|
history
asn/Makefile.in
patch
|
blob
|
history
ccl/Makefile.in
patch
|
blob
|
history
client/Makefile.in
patch
|
blob
|
history
comstack/Makefile.in
patch
|
blob
|
history
makelib/Makefile.in
patch
|
blob
|
history
odr/Makefile.in
patch
|
blob
|
history
server/Makefile.in
patch
|
blob
|
history
util/Makefile.in
patch
|
blob
|
history
ztest/Makefile.in
patch
|
blob
|
history
diff --git
a/Makefile.in
b/Makefile.in
index
57d6b39
..
fcda7e6
100644
(file)
--- a/
Makefile.in
+++ b/
Makefile.in
@@
-1,7
+1,7
@@
# Copyright (C) 1995-1998, Index Data
# All rights reserved.
# Sebastian Hammer, Adam Dickmeiss
# Copyright (C) 1995-1998, Index Data
# All rights reserved.
# Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.1 1998-08-21 14:13:23 adam Exp $
+# $Id: Makefile.in,v 1.2 1998-08-25 16:19:37 adam Exp $
# Uncomment the lines below to enable mOSI communcation.
#ODEFS=-DUSE_XTIMOSI
# Uncomment the lines below to enable mOSI communcation.
#ODEFS=-DUSE_XTIMOSI
@@
-30,8
+30,8
@@
CPP=@CPP@
SHELL=/bin/sh
MAKE=make
SUBDIR=$(MOD) util odr $(RFC1006) ccl comstack retrieval client server ztest makelib
SHELL=/bin/sh
MAKE=make
SUBDIR=$(MOD) util odr $(RFC1006) ccl comstack retrieval client server ztest makelib
-# Add external libraries to the ELIBS macro
-ELIBS=@LIBS@
+# Add external libraries to the LIBS macro
+LIBS=@LIBS@
RANLIB=@RANLIB@
RANLIB=@RANLIB@
@@
-49,7
+49,7
@@
YAZDIR=$(prefix)/lib/yaz
all:
for i in $(SUBDIR); do cd $$i; if $(MAKE) CC="$(CC)" \
all:
for i in $(SUBDIR); do cd $$i; if $(MAKE) CC="$(CC)" \
- RANLIB="$(RANLIB)" ELIBS="$(ELIBS)" \
+ RANLIB="$(RANLIB)" LIBS="$(LIBS)" \
INCLUDE="$(INCLUDE)" CFLAGS="$(CFLAGS)" \
CDEFS="$(CDEFS)" \
LIBMOSI="$(LIBMOSI)" XMOSI="$(XMOSI)";\
INCLUDE="$(INCLUDE)" CFLAGS="$(CFLAGS)" \
CDEFS="$(CDEFS)" \
LIBMOSI="$(LIBMOSI)" XMOSI="$(XMOSI)";\
diff --git
a/asn/Makefile.in
b/asn/Makefile.in
index
1deefa4
..
743530a
100644
(file)
--- a/
asn/Makefile.in
+++ b/
asn/Makefile.in
@@
-1,7
+1,7
@@
# Copyright (C) 1995-1998, Index Data I/S
# All rights reserved.
# Sebastian Hammer, Adam Dickmeiss
# Copyright (C) 1995-1998, Index Data I/S
# All rights reserved.
# Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.1 1998-08-21 14:13:25 adam Exp $
+# $Id: Makefile.in,v 1.2 1998-08-25 16:19:38 adam Exp $
SHELL=/bin/sh
SHELL=/bin/sh
@@
-9,7
+9,7
@@
CC=@CC@
CPP=@CPP@
RANLIB=@RANLIB@
CDEFS=@DEFS@ @ODEFS@
CPP=@CPP@
RANLIB=@RANLIB@
CDEFS=@DEFS@ @ODEFS@
-ELIBS=@LIBS@
+LIBS=@LIBS@
INCLUDE=-I../include -I.
LIBDIR=../lib
INCLUDE=-I../include -I.
LIBDIR=../lib
@@
-22,9
+22,6
@@
PO = proto.o diagbib1.o zget.o prt-rsc.o prt-acc.o prt-exp.o prt-ext.o \
prt-dat.o prt-univ.o
all: $(LIB)
prt-dat.o prt-univ.o
all: $(LIB)
-test: test.o $(LIB) ../odr/odr.a
- $(CC) $(CFLAGS) $(INCLUDE) -o test test.o $(LIB) ../odr/odr.a $(ELIBS)
-
alll:
$(LIB): $(PO)
alll:
$(LIB): $(PO)
diff --git
a/ccl/Makefile.in
b/ccl/Makefile.in
index
5c2db4f
..
889b5ab
100644
(file)
--- a/
ccl/Makefile.in
+++ b/
ccl/Makefile.in
@@
-2,7
+2,10
@@
# Europagate, 1995
#
# $Log: Makefile.in,v $
# Europagate, 1995
#
# $Log: Makefile.in,v $
-# Revision 1.1 1998-08-21 14:13:26 adam
+# Revision 1.2 1998-08-25 16:19:39 adam
+# Minor changes to Makefile(s).
+#
+# Revision 1.1 1998/08/21 14:13:26 adam
# Added GNU Configure script to build Makefiles.
#
# Revision 1.8 1997/09/17 12:10:28 adam
# Added GNU Configure script to build Makefiles.
#
# Revision 1.8 1997/09/17 12:10:28 adam
@@
-55,7
+58,7
@@
CC=@CC@
CPP=@CPP@
RANLIB=@RANLIB@
CDEFS=@DEFS@ @ODEFS@
CPP=@CPP@
RANLIB=@RANLIB@
CDEFS=@DEFS@ @ODEFS@
-ELIBS=@LIBS@
+LIBS=@LIBS@
INCLUDE=-I../include
PROG=cclsh
INCLUDE=-I../include
PROG=cclsh
@@
-66,7
+69,7
@@
DEFS=$(INCLUDE) $(CDEFS)
all: $(LIB)
$(PROG): $(PROG).o $(LIB)
all: $(LIB)
$(PROG): $(PROG).o $(LIB)
- $(CC) $(CFLAGS) -o $(PROG) $(PROG).o $(LIB)
+ $(CC) $(CFLAGS) -o $(PROG) $(PROG).o $(LIB) $(LIBS)
$(LIB): $(PO)
rm -f $(LIB)
$(LIB): $(PO)
rm -f $(LIB)
diff --git
a/client/Makefile.in
b/client/Makefile.in
index
27f613c
..
19f7f86
100644
(file)
--- a/
client/Makefile.in
+++ b/
client/Makefile.in
@@
-1,7
+1,7
@@
# Copyright (C) 1995-1998, Index Data I/S
# All rights reserved.
# Sebastian Hammer, Adam Dickmeiss
# Copyright (C) 1995-1998, Index Data I/S
# All rights reserved.
# Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.1 1998-08-21 14:13:27 adam Exp $
+# $Id: Makefile.in,v 1.2 1998-08-25 16:19:40 adam Exp $
SHELL=/bin/sh
SHELL=/bin/sh
@@
-9,7
+9,7
@@
CC=@CC@
CPP=@CPP@
RANLIB=@RANLIB@
CDEFS=@DEFS@ @ODEFS@
CPP=@CPP@
RANLIB=@RANLIB@
CDEFS=@DEFS@ @ODEFS@
-ELIBS=@LIBS@
+LIBS=@LIBS@
LIBDIR=../lib
LIBDIR=../lib
@@
-17,7
+17,7
@@
LIBDIR=../lib
INCLUDE=-I../include -I. -I../../xtimosi/src
DEFS=$(INCLUDE) $(CDEFS) -DCCL2RPN=1
INCLUDE=-I../include -I. -I../../xtimosi/src
DEFS=$(INCLUDE) $(CDEFS) -DCCL2RPN=1
-LIBS=$(LIBDIR)/libasn.a $(LIBDIR)/libutil.a \
+YAZLIBS=$(LIBDIR)/libasn.a $(LIBDIR)/libutil.a \
$(LIBDIR)/libcomstack.a ../lib/ccl.a $(LIBMOSI) $(LIBDIR)/libodr.a
PROG=client
PROGO=client.o
$(LIBDIR)/libcomstack.a ../lib/ccl.a $(LIBMOSI) $(LIBDIR)/libodr.a
PROG=client
PROGO=client.o
@@
-25,7
+25,7
@@
PROGO=client.o
all: $(PROG)
$(PROG): $(LIB) $(PROGO) $(LIBS)
all: $(PROG)
$(PROG): $(LIB) $(PROGO) $(LIBS)
- $(CC) $(CFLAGS) -o $(PROG) $(PROGO) $(LIBS) $(ELIBS)
+ $(CC) $(CFLAGS) -o $(PROG) $(PROGO) $(YAZLIBS) $(LIBS)
alll:
alll:
diff --git
a/comstack/Makefile.in
b/comstack/Makefile.in
index
c3f99b2
..
78e8111
100644
(file)
--- a/
comstack/Makefile.in
+++ b/
comstack/Makefile.in
@@
-1,14
+1,14
@@
# Copyright (C) 1994, Index Data I/S
# All rights reserved.
# Sebastian Hammer, Adam Dickmeiss
# Copyright (C) 1994, Index Data I/S
# All rights reserved.
# Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.1 1998-08-21 14:13:28 adam Exp $
+# $Id: Makefile.in,v 1.2 1998-08-25 16:19:41 adam Exp $
SHELL=/bin/sh
CC=@CC@
CPP=@CPP@
RANLIB=@RANLIB@
CDEFS=@DEFS@ @ODEFS@
SHELL=/bin/sh
CC=@CC@
CPP=@CPP@
RANLIB=@RANLIB@
CDEFS=@DEFS@ @ODEFS@
-ELIBS=@LIBS@
+LIBS=@LIBS@
LIBDIR=../lib
LIBDIR=../lib
@@
-21,8
+21,6
@@
LIBINCLUDE=-L$(LIBDIR) -L../../xtimosi/src
DEFS=$(INCLUDE) $(CDEFS)
# -DTRACE_TCPIP
LIB= $(LIBDIR)/libcomstack.a
DEFS=$(INCLUDE) $(CDEFS)
# -DTRACE_TCPIP
LIB= $(LIBDIR)/libcomstack.a
-LIBS=$(LIBDIR)/libasn.a $(LIBDIR)/libodr.a $(LIBDIR)/libcomstack.a \
- ../lib/ccl.a $(LIBDIR)/libutil.a $(LIBMOSI)
PO = comstack.o tcpip.o waislen.o $(XMOSI)
all: $(LIB)
PO = comstack.o tcpip.o waislen.o $(XMOSI)
all: $(LIB)
diff --git
a/makelib/Makefile.in
b/makelib/Makefile.in
index
21543e9
..
44314cd
100644
(file)
--- a/
makelib/Makefile.in
+++ b/
makelib/Makefile.in
@@
-1,7
+1,7
@@
# Copyright (C) 1994, Index Data I/S
# All rights reserved.
# Sebastian Hammer, Adam Dickmeiss
# Copyright (C) 1994, Index Data I/S
# All rights reserved.
# Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.1 1998-08-21 14:13:29 adam Exp $
+# $Id: Makefile.in,v 1.2 1998-08-25 16:19:42 adam Exp $
SHELL=/bin/sh
SHELL=/bin/sh
@@
-9,7
+9,7
@@
RANLIB=@RANLIB@
MAKE=make
LIBDIR=../lib
MAKE=make
LIBDIR=../lib
-LIBS=$(LIBDIR)/libodr.a $(LIBDIR)/libasn.a $(LIBDIR)/libcomstack.a \
+YAZLIBS=$(LIBDIR)/libodr.a $(LIBDIR)/libasn.a $(LIBDIR)/libcomstack.a \
$(LIBDIR)/libserver.a $(LIBDIR)/libutil.a $(LIBDIR)/libret.a
LIB=$(LIBDIR)/libyaz.a
$(LIBDIR)/libserver.a $(LIBDIR)/libutil.a $(LIBDIR)/libret.a
LIB=$(LIBDIR)/libyaz.a
@@
-17,7
+17,7
@@
all: $(LIB)
$(LIB): $(LIBS)
rm -f $(LIB)
$(LIB): $(LIBS)
rm -f $(LIB)
- for i in $(LIBS); do echo $$i; ar x $$i; rm -f __*; done
+ for i in $(YAZLIBS); do echo $$i; ar x $$i; rm -f __*; done
ar qc $(LIB) *.o
rm -f *.o
$(RANLIB) $(LIB)
ar qc $(LIB) *.o
rm -f *.o
$(RANLIB) $(LIB)
diff --git
a/odr/Makefile.in
b/odr/Makefile.in
index
74c653f
..
8381700
100644
(file)
--- a/
odr/Makefile.in
+++ b/
odr/Makefile.in
@@
-1,7
+1,7
@@
# Copyright (C) 1995-1998, Index Data I/S
# All rights reserved.
# Sebastian Hammer, Adam Dickmeiss
# Copyright (C) 1995-1998, Index Data I/S
# All rights reserved.
# Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.1 1998-08-21 14:13:30 adam Exp $
+# $Id: Makefile.in,v 1.2 1998-08-25 16:19:43 adam Exp $
SHELL=/bin/sh
SHELL=/bin/sh
@@
-9,7
+9,7
@@
CC=@CC@
CPP=@CPP@
RANLIB=@RANLIB@
CDEFS=@DEFS@ @ODEFS@
CPP=@CPP@
RANLIB=@RANLIB@
CDEFS=@DEFS@ @ODEFS@
-ELIBS=@LIBS@
+LIBS=@LIBS@
INCLUDE=-I../include -I.
LIBDIR=../lib
INCLUDE=-I../include -I.
LIBDIR=../lib
diff --git
a/server/Makefile.in
b/server/Makefile.in
index
579c7b8
..
b37cde9
100644
(file)
--- a/
server/Makefile.in
+++ b/
server/Makefile.in
@@
-1,7
+1,7
@@
# Copyright (C) 1995-1998, Index Data I/S
# All rights reserved.
# Sebastian Hammer, Adam Dickmeiss
# Copyright (C) 1995-1998, Index Data I/S
# All rights reserved.
# Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.1 1998-08-21 14:13:34 adam Exp $
+# $Id: Makefile.in,v 1.2 1998-08-25 16:19:44 adam Exp $
SHELL=/bin/sh
SHELL=/bin/sh
@@
-19,7
+19,7
@@
CDEFS=@DEFS@ @ODEFS@
DEFS=$(INCLUDE) $(CDEFS)
LIB=$(LIBDIR)/libserver.a
PO = eventl.o seshigh.o statserv.o requestq.o
DEFS=$(INCLUDE) $(CDEFS)
LIB=$(LIBDIR)/libserver.a
PO = eventl.o seshigh.o statserv.o requestq.o
-ELIBS=@LIBS@
+LIBS=@LIBS@
all: $(LIB)
all: $(LIB)
diff --git
a/util/Makefile.in
b/util/Makefile.in
index
6b39a03
..
d11a8cd
100644
(file)
--- a/
util/Makefile.in
+++ b/
util/Makefile.in
@@
-1,7
+1,7
@@
# Copyright (C) 1994-1997, Index Data I/S
# All rights reserved.
# Sebastian Hammer, Adam Dickmeiss
# Copyright (C) 1994-1997, Index Data I/S
# All rights reserved.
# Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.1 1998-08-21 14:13:36 adam Exp $
+# $Id: Makefile.in,v 1.2 1998-08-25 16:19:45 adam Exp $
SHELL=/bin/sh
SHELL=/bin/sh
@@
-9,7
+9,7
@@
CC=@CC@
CPP=@CPP@
RANLIB=@RANLIB@
CDEFS=@DEFS@ @ODEFS@
CPP=@CPP@
RANLIB=@RANLIB@
CDEFS=@DEFS@ @ODEFS@
-ELIBS=@LIBS@
+LIBS=@LIBS@
INCLUDE=-I../include -I.
LIBDIR=../lib
INCLUDE=-I../include -I.
LIBDIR=../lib
@@
-22,7
+22,7
@@
PO = options.o log.o marcdisp.o yaz-ccl.o pquery.o oid.o wrbuf.o nmemsdup.o \
all: $(LIB) marcdump
marcdump: marcdump.o $(LIB)
all: $(LIB) marcdump
marcdump: marcdump.o $(LIB)
- $(CC) $(CFLAGS) $(INCLUDE) -o marcdump marcdump.o $(LIB) $(ELIBS)
+ $(CC) $(CFLAGS) $(INCLUDE) -o marcdump marcdump.o $(LIB) $(LIBS)
alll:
alll:
diff --git
a/ztest/Makefile.in
b/ztest/Makefile.in
index
624da6c
..
fa31891
100644
(file)
--- a/
ztest/Makefile.in
+++ b/
ztest/Makefile.in
@@
-1,7
+1,7
@@
# Copyright (C) 1995-1998, Index Data I/S
# All rights reserved.
# Sebastian Hammer, Adam Dickmeiss
# Copyright (C) 1995-1998, Index Data I/S
# All rights reserved.
# Sebastian Hammer, Adam Dickmeiss
-# $Id: Makefile.in,v 1.1 1998-08-21 14:13:38 adam Exp $
+# $Id: Makefile.in,v 1.2 1998-08-25 16:19:46 adam Exp $
SHELL=/bin/sh
SHELL=/bin/sh
@@
-9,7
+9,7
@@
CC=@CC@
CPP=@CPP@
RANLIB=@RANLIB@
CDEFS=@DEFS@ @ODEFS@
CPP=@CPP@
RANLIB=@RANLIB@
CDEFS=@DEFS@ @ODEFS@
-ELIBS=@LIBS@
+LIBS=@LIBS@
LIBDIR=../lib
LIBDIR=../lib
@@
-19,7
+19,7
@@
SHELL=/bin/sh
INCLUDE=-I../include -I. -I../../xtimosi/src
DEFS=$(INCLUDE) $(CDEFS)
LIB=$(LIBDIR)/libserver.a
INCLUDE=-I../include -I. -I../../xtimosi/src
DEFS=$(INCLUDE) $(CDEFS)
LIB=$(LIBDIR)/libserver.a
-LIBS=$(LIBDIR)/libserver.a $(LIBDIR)/libasn.a $(LIBDIR)/libodr.a \
+YAZLIBS=$(LIBDIR)/libserver.a $(LIBDIR)/libasn.a $(LIBDIR)/libodr.a \
$(LIBDIR)/libcomstack.a $(LIBMOSI) $(LIBDIR)/libutil.a
PROG=ztest
PROGO=ztest.o read-grs.o
$(LIBDIR)/libcomstack.a $(LIBMOSI) $(LIBDIR)/libutil.a
PROG=ztest
PROGO=ztest.o read-grs.o
@@
-28,7
+28,7
@@
RANLIB=ranlib
all: $(PROG)
$(PROG): $(LIB) $(PROGO) $(LIBS)
all: $(PROG)
$(PROG): $(LIB) $(PROGO) $(LIBS)
- $(CC) $(CFLAGS) -o $(PROG) $(PROGO) $(LIBS) $(ELIBS)
+ $(CC) $(CFLAGS) -o $(PROG) $(PROGO) $(YAZLIBS) $(LIBS)
alll:
alll: