From d4b2d9a55eff084aa7db77d1aa98e032f4c7659e Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Mon, 30 Oct 1995 14:10:44 +0000 Subject: [PATCH] Replaced cc with $(CC) in CPP definition. --- Makefile | 4 ++-- bfile/Makefile | 4 ++-- dfa/Makefile | 4 ++-- dict/Makefile | 4 ++-- index/Makefile | 4 ++-- isam/Makefile | 4 ++-- rset/Makefile | 4 ++-- util/Makefile | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 2d043ba..c3f9ede 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,14 @@ # Copyright (C) 1994, Index Data I/S # All rights reserved. # Sebastian Hammer, Adam Dickmeiss -# $Id: Makefile,v 1.31 1995-10-12 12:38:40 adam Exp $ +# $Id: Makefile,v 1.32 1995-10-30 14:10:44 adam Exp $ SHELL=/bin/sh MAKE=make SUBDIR=util str bfile dfa dict isam rset data1 index base RANLIB=ranlib YAZ=../../yaz -OSILIB=../../xtimosi/src/libmosi.a $(YAZ)/lib/librfc.a +#OSILIB=../../xtimosi/src/libmosi.a $(YAZ)/lib/librfc.a all: for i in $(SUBDIR); do cd $$i; if $(MAKE) OSILIB="$(OSILIB)" YAZ="$(YAZ)" RANLIB="$(RANLIB)" CFLAGS="$(CFLAGS)" CC="$(CC)"; then cd ..; else exit 1; fi; done diff --git a/bfile/Makefile b/bfile/Makefile index 2c5f980..9b15ff9 100644 --- a/bfile/Makefile +++ b/bfile/Makefile @@ -1,7 +1,7 @@ # Copyright (C) 1994, Index Data I/S # All rights reserved. # Sebastian Hammer, Adam Dickmeiss -# $Id: Makefile,v 1.12 1995-09-04 12:33:21 adam Exp $ +# $Id: Makefile,v 1.13 1995-10-30 14:10:47 adam Exp $ SHELL=/bin/sh RANLIB=ranlib @@ -15,7 +15,7 @@ CFLAGS=-g -Wall -pedantic -ansi DEFS=$(INCLUDE) LIB=../lib/bfile.a PO = bfile.o mfile.o -CPP=cc -E +CPP=$(CC) -E all: $(LIB) diff --git a/dfa/Makefile b/dfa/Makefile index 6f14f02..7c78a60 100644 --- a/dfa/Makefile +++ b/dfa/Makefile @@ -1,7 +1,7 @@ # Copyright (C) 1994, Index Data I/S # All rights reserved. # Sebastian Hammer, Adam Dickmeiss -# $Id: Makefile,v 1.10 1995-09-28 09:18:50 adam Exp $ +# $Id: Makefile,v 1.11 1995-10-30 14:10:50 adam Exp $ SHELL=/bin/sh RANLIB=ranlib @@ -14,7 +14,7 @@ TPROG3=grepper DEFS=$(INCLUDE) -DMEMDEBUG=1 LIB=../lib/dfa.a PO = dfa.o imalloc.o states.o set.o bset.o -CPP=cc -E +CPP=$(CC) -E all: $(LIB) diff --git a/dict/Makefile b/dict/Makefile index ece4b6b..71a6de8 100644 --- a/dict/Makefile +++ b/dict/Makefile @@ -1,7 +1,7 @@ # Copyright (C) 1994, Index Data I/S # All rights reserved. # Sebastian Hammer, Adam Dickmeiss -# $Id: Makefile,v 1.16 1995-10-06 09:04:03 adam Exp $ +# $Id: Makefile,v 1.17 1995-10-30 14:10:52 adam Exp $ SHELL=/bin/sh RANLIB=ranlib @@ -15,7 +15,7 @@ DEFS=$(INCLUDE) LIB=../lib/dict.a PO = scan.o dopen.o dclose.o drdwr.o open.o close.o insert.o lookup.o \ lookupec.o lookgrep.o -CPP=cc -E +CPP=$(CC) -E all: $(LIB) diff --git a/index/Makefile b/index/Makefile index dce36d0..eb75bcb 100644 --- a/index/Makefile +++ b/index/Makefile @@ -1,7 +1,7 @@ # Copyright (C) 1995, Index Data I/S # All rights reserved. # Sebastian Hammer, Adam Dickmeiss -# $Id: Makefile,v 1.13 1995-10-10 16:28:12 quinn Exp $ +# $Id: Makefile,v 1.14 1995-10-30 14:10:54 adam Exp $ SHELL=/bin/sh RANLIB=ranlib @@ -17,7 +17,7 @@ O1 = main.o dir.o trav.o extract.o kinput.o kcompare.o \ symtab.o text.o recctrl.o O2 = kdump.o O3 = zserver.o kcompare.o zrpn.o zsets.o text.o recctrl.o -CPP=cc -E +CPP=$(CC) -E all: $(TPROG1) $(TPROG2) $(TPROG3) diff --git a/isam/Makefile b/isam/Makefile index 12d6115..a48d20a 100644 --- a/isam/Makefile +++ b/isam/Makefile @@ -1,7 +1,7 @@ # Copyright (C) 1994, Index Data I/S # All rights reserved. # Sebastian Hammer, Adam Dickmeiss -# $Id: Makefile,v 1.13 1995-09-04 12:33:46 adam Exp $ +# $Id: Makefile,v 1.14 1995-10-30 14:10:55 adam Exp $ SHELL=/bin/sh RANLIB=ranlib @@ -12,7 +12,7 @@ INCLUDE=-I../include -I$(YAZ)/include DEFS=$(INCLUDE) LIB=../lib/isam.a PO = isam.o isutil.o rootblk.o memory.o physical.o -CPP=cc -E +CPP=$(CC) -E all: $(LIB) diff --git a/rset/Makefile b/rset/Makefile index 570d1ac..fafcfc9 100644 --- a/rset/Makefile +++ b/rset/Makefile @@ -1,7 +1,7 @@ # Copyright (C) 1994, Index Data I/S # All rights reserved. # Sebastian Hammer, Adam Dickmeiss -# $Id: Makefile,v 1.7 1995-09-08 14:52:41 adam Exp $ +# $Id: Makefile,v 1.8 1995-10-30 14:10:59 adam Exp $ SHELL=/bin/sh RANLIB=ranlib @@ -12,7 +12,7 @@ DEFS=$(INCLUDE) LIB=../lib/rset.a PROG= PO=rset.o rstemp.o rsisam.o rsnull.o rsbool.o rsrel.o -CPP=cc -E +CPP=$(CC) -E all: $(LIB) diff --git a/util/Makefile b/util/Makefile index cd833fa..c8a0ea3 100644 --- a/util/Makefile +++ b/util/Makefile @@ -1,7 +1,7 @@ # Copyright (C) 1994, Index Data I/S # All rights reserved. # Sebastian Hammer, Adam Dickmeiss -# $Id: Makefile,v 1.18 1995-10-10 16:28:17 quinn Exp $ +# $Id: Makefile,v 1.19 1995-10-30 14:11:03 adam Exp $ SHELL=/bin/sh RANLIB=ranlib @@ -11,7 +11,7 @@ INCLUDE=-I../include -I$(YAZ)/include TPROG=opt-test #CFLAGS=-g -Wall -pedantic -ansi DEFS=$(INCLUDE) -CPP=cc -E +CPP=$(CC) -E LIB=../lib/alexutil.a PO = xmalloc.o res.o alexpath.o common.o readconf.o -- 1.7.10.4