From e1ecb4f2e0fef98495f607e3d33a19ad8f6ea63f Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Fri, 28 Jun 1996 15:20:11 +0000 Subject: [PATCH] Moved config dir to base/config. --- src/as/Makefile | 15 ++------------- src/as/Makefile.Unix | 4 ++-- src/as/Makefile.Vx | 4 ++-- src/bdt/Makefile | 12 ++---------- src/bdt/Makefile.Unix | 4 ++-- src/bdt/Makefile.Vx | 4 ++-- src/bpt/Makefile | 18 ++---------------- src/bpt/Makefile.Unix | 4 ++-- src/bpt/Makefile.Vx | 4 ++-- src/ca/Makefile | 15 ++------------- src/ca/Makefile.Unix | 4 ++-- src/ca/Makefile.Vx | 4 ++-- src/cas/Makefile | 21 ++------------------- src/cas/build/Makefile | 21 ++------------------- src/cas/build/multiThread/Makefile.Unix | 4 ++-- src/cas/build/singleThread/Makefile | 21 ++------------------- src/cas/build/singleThread/Makefile.Unix | 4 ++-- src/cas/example/Makefile | 18 ++---------------- src/cas/example/Makefile.Unix | 4 ++-- src/cas/generic/Makefile | 18 ++---------------- src/cas/generic/Makefile.Unix | 4 ++-- src/cvtDctsdr/Makefile | 18 ++---------------- src/cvtDctsdr/Makefile.Unix | 4 ++-- src/cvtDctsdr/Makefile.Vx | 4 ++-- src/cxxTemplates/Makefile | 18 ++---------------- src/cxxTemplates/Makefile.Unix | 4 ++-- src/db/Makefile | 15 ++------------- src/db/Makefile.Unix | 4 ++-- src/db/Makefile.Vx | 4 ++-- src/dbStatic/Makefile | 18 ++---------------- src/dbStatic/Makefile.Unix | 4 ++-- src/dbStatic/Makefile.Vx | 4 ++-- src/dbtools/Makefile | 15 ++------------- src/dbtools/Makefile.Unix | 4 ++-- src/dbtools/Makefile.Vx | 4 ++-- src/dev/Makefile | 15 ++------------- src/dev/Makefile.Vx | 4 ++-- src/devOpt/Makefile | 15 ++------------- src/devOpt/Makefile.Vx | 4 ++-- src/drv/Makefile | 7 ++----- src/drv/ansi/Makefile | 9 ++------- src/drv/ansi/Makefile.Vx | 4 ++-- src/drv/old/Makefile | 7 ++----- src/drv/old/Makefile.Vx | 7 ++----- src/gdd/Makefile | 7 +++++-- src/gdd/Makefile.Unix | 7 +++++-- src/include/Makefile | 18 ++---------------- src/include/Makefile.Unix | 4 ++-- src/iocCore/Makefile | 15 ++------------- src/iocCore/Makefile.Vx | 4 ++-- src/libCom/Makefile | 15 ++------------- src/libCom/Makefile.Unix | 10 +++++----- src/libCom/Makefile.Vx | 10 +++++----- src/libCom/blderrSymTbl | 2 +- src/libCompat/Makefile | 15 ++------------- src/libvxWorks/Makefile | 15 ++------------- src/libvxWorks/Makefile.Vx | 4 ++-- src/misc/Makefile | 15 ++------------- src/misc/Makefile.Vx | 4 ++-- src/rec/Makefile | 15 ++------------- src/rec/Makefile.Vx | 4 ++-- src/rsrv/Makefile | 15 ++------------- src/rsrv/Makefile.Vx | 4 ++-- src/sequencer/Makefile | 18 ++---------------- src/sequencer/Makefile.Unix | 4 ++-- src/sequencer/Makefile.Vx | 4 ++-- src/tools/Makefile | 18 ++---------------- src/tools/Makefile.Unix | 4 ++-- src/tools/getrel | 15 +++++++++++++-- src/toolsComm/antelope/Makefile | 15 ++------------- src/toolsComm/antelope/Makefile.Unix | 4 ++-- src/toolsComm/flex/Makefile | 15 ++------------- src/toolsComm/flex/Makefile.Unix | 4 ++-- src/util/Makefile | 15 ++------------- src/util/Makefile.Unix | 4 ++-- src/util/Makefile.Vx | 4 ++-- 76 files changed, 174 insertions(+), 532 deletions(-) diff --git a/src/as/Makefile b/src/as/Makefile index 58c5051bb..8cca632b9 100644 --- a/src/as/Makefile +++ b/src/as/Makefile @@ -1,18 +1,7 @@ -# -# $Id$ -# -# Lowest Level Directroy Makefile -# by Janet Anderson -# -# $Log$ -# Revision 1.1 1994/09/07 19:25:39 jba -# New file -# -# TOP=../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE -include $(TOP)/src/config/RULES_ARCHS +include $(TOP)/config/RULES_ARCHS diff --git a/src/as/Makefile.Unix b/src/as/Makefile.Unix index 165ce299b..b96d279e9 100644 --- a/src/as/Makefile.Unix +++ b/src/as/Makefile.Unix @@ -1,5 +1,5 @@ TOP = ../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE USR_CFLAGS = -D_NO_PROTO USR_LDLIBS = -lAs -lCom -lDb -lCom -lm -s @@ -19,7 +19,7 @@ LIBOBJS = asLib.o LIBNAME = libAs.a PROD = ascheck -include $(TOP)/src/config/RULES.Unix +include $(TOP)/config/RULES.Unix # Extra rule since asLib_lex.c is included in asLib.c # In my opinion, these objects should really be built diff --git a/src/as/Makefile.Vx b/src/as/Makefile.Vx index 185b2c11e..c57453975 100644 --- a/src/as/Makefile.Vx +++ b/src/as/Makefile.Vx @@ -1,5 +1,5 @@ TOP = ../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE USR_CFLAGS = -DACCESS_SECURITY -D_NO_PROTO @@ -7,7 +7,7 @@ SRCS.c = ../asDbLib.c ../asCa.c asLib.c LIBOBJS = asDbLib.o asCa.o asLib.o LIBNAME = asLibrary -include $(TOP)/src/config/RULES.Vx +include $(TOP)/config/RULES.Vx # Extra rule since asLib_lex.c is included in asLib.c # In my opinion, these objects should really be built diff --git a/src/bdt/Makefile b/src/bdt/Makefile index f0a100d00..1e3cdc13e 100644 --- a/src/bdt/Makefile +++ b/src/bdt/Makefile @@ -4,18 +4,10 @@ # Base Lowest Level Directroy Makefile # by Janet Anderson # -# $Log$ -# Revision 1.1 1995/07/27 14:22:44 winans -# first release -# -# Revision 1.1 1994/09/07 19:26:22 jba -# New file -# -# TOP=../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE -include $(TOP)/src/config/RULES_ARCHS +include $(TOP)/config/RULES_ARCHS diff --git a/src/bdt/Makefile.Unix b/src/bdt/Makefile.Unix index b8428ab34..a801df212 100644 --- a/src/bdt/Makefile.Unix +++ b/src/bdt/Makefile.Unix @@ -1,5 +1,5 @@ TOP = ../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE INC += bdt.h @@ -7,4 +7,4 @@ LIBOBJS += bdt.o LIBNAME = libBdt.a -include $(TOP)/src/config/RULES.Unix +include $(TOP)/config/RULES.Unix diff --git a/src/bdt/Makefile.Vx b/src/bdt/Makefile.Vx index aa5fc5931..377cfe49a 100644 --- a/src/bdt/Makefile.Vx +++ b/src/bdt/Makefile.Vx @@ -1,5 +1,5 @@ TOP = ../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE SRCS.c += ../bdt.c SRCS.c += ../bdtServ.c @@ -13,7 +13,7 @@ OBJS += bdtServPv.o PROD = bdt -include $(TOP)/src/config/RULES.Vx +include $(TOP)/config/RULES.Vx $(PROD): $(OBJS) $(RM) $@ diff --git a/src/bpt/Makefile b/src/bpt/Makefile index 7c1d9a2a2..8cca632b9 100644 --- a/src/bpt/Makefile +++ b/src/bpt/Makefile @@ -1,21 +1,7 @@ -# -# $Id$ -# -# Lowest Level Directroy Makefile -# by Janet Anderson -# -# $Log$ -# Revision 1.1 1995/11/29 14:18:58 mrk -# Changes for replacing default.dctsdr by all ascii files -# -# Revision 1.1 1994/09/07 19:25:39 jba -# New file -# -# TOP=../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE -include $(TOP)/src/config/RULES_ARCHS +include $(TOP)/config/RULES_ARCHS diff --git a/src/bpt/Makefile.Unix b/src/bpt/Makefile.Unix index f7c35d80a..f4aadbcc5 100644 --- a/src/bpt/Makefile.Unix +++ b/src/bpt/Makefile.Unix @@ -1,5 +1,5 @@ TOP = ../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE INC += cvtTable.h @@ -7,5 +7,5 @@ SRCS.c = ../makeBpt OBJS = makeBpt PROD = makeBpt -include $(TOP)/src/config/RULES.Unix +include $(TOP)/config/RULES.Unix diff --git a/src/bpt/Makefile.Vx b/src/bpt/Makefile.Vx index 0f2af3503..a94bcc460 100644 --- a/src/bpt/Makefile.Vx +++ b/src/bpt/Makefile.Vx @@ -1,5 +1,5 @@ TOP = ../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE USR_CFLAGS = -ansi VX_WARN_YES = -Wall -pedantic @@ -20,5 +20,5 @@ LIBOBJS = \ LIBNAME = pbtLib -include $(TOP)/src/config/RULES.Vx +include $(TOP)/config/RULES.Vx diff --git a/src/ca/Makefile b/src/ca/Makefile index 14e1eed82..8cca632b9 100644 --- a/src/ca/Makefile +++ b/src/ca/Makefile @@ -1,18 +1,7 @@ -# -# $Id$ -# -# Lowest Level Directroy Makefile -# by Janet Anderson -# -# $Log$ -# Revision 1.1 1994/09/07 19:25:58 jba -# New file -# -# TOP=../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE -include $(TOP)/src/config/RULES_ARCHS +include $(TOP)/config/RULES_ARCHS diff --git a/src/ca/Makefile.Unix b/src/ca/Makefile.Unix index 2149aa104..86b0184cf 100644 --- a/src/ca/Makefile.Unix +++ b/src/ca/Makefile.Unix @@ -1,5 +1,5 @@ TOP = ../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE USR_LDLIBS = -lca -lCom -lm USR_LDFLAGS = -L. @@ -32,7 +32,7 @@ LIBNAME = libca.a PROD = caRepeater -include $(TOP)/src/config/RULES.Unix +include $(TOP)/config/RULES.Unix acctst: acctst.o $(LIBOBJS) $(DEPLIBS_BASE)/libCom.a $(LINK.c) -o $@ $< $(LIBOBJS) $(DEPLIBS_BASE)/libCom.a \ diff --git a/src/ca/Makefile.Vx b/src/ca/Makefile.Vx index fe0edcb84..56777ea99 100644 --- a/src/ca/Makefile.Vx +++ b/src/ca/Makefile.Vx @@ -1,5 +1,5 @@ TOP = ../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE SRCS.c = \ ../iocinf.c ../access.c ../test_event.c ../service.c \ @@ -13,5 +13,5 @@ LIBOBJS = \ LIBNAME = caLib -include $(TOP)/src/config/RULES.Vx +include $(TOP)/config/RULES.Vx diff --git a/src/cas/Makefile b/src/cas/Makefile index c943860ed..1933ab824 100644 --- a/src/cas/Makefile +++ b/src/cas/Makefile @@ -1,27 +1,10 @@ -# -# $Id$ -# -# Lowest Level Directroy Makefile -# by Janet Anderson -# -# $Log$ -# Revision 1.2 1996/06/25 21:47:56 jba -# Makefile includes now from base/src/config, removed all soft links -# -# Revision 1.1.1.1 1996/06/20 00:28:05 jhill -# ca server installation -# -# Revision 1.1 1994/09/07 19:26:34 jba -# New file -# -# TOP=../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE DIRS = generic build example -include $(TOP)/src/config/RULES_DIRS +include $(TOP)/config/RULES_DIRS diff --git a/src/cas/build/Makefile b/src/cas/build/Makefile index 5f5fa5cb9..adf449d0f 100644 --- a/src/cas/build/Makefile +++ b/src/cas/build/Makefile @@ -1,27 +1,10 @@ -# -# $Id$ -# -# Lowest Level Directroy Makefile -# by Janet Anderson -# -# $Log$ -# Revision 1.2 1996/06/25 21:47:58 jba -# Makefile includes now from base/src/config, removed all soft links -# -# Revision 1.1.1.1 1996/06/20 00:28:16 jhill -# ca server installation -# -# Revision 1.1 1994/09/07 19:26:34 jba -# New file -# -# TOP=../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE DIRS = singleThread -include $(TOP)/src/config/RULES_DIRS +include $(TOP)/config/RULES_DIRS diff --git a/src/cas/build/multiThread/Makefile.Unix b/src/cas/build/multiThread/Makefile.Unix index 98b20a709..e933aa87c 100644 --- a/src/cas/build/multiThread/Makefile.Unix +++ b/src/cas/build/multiThread/Makefile.Unix @@ -7,7 +7,7 @@ OSSRC = $(CAS)/os/posix VPATH = $(SRC) $(IOSRC) $(OSSRC) include Target.include -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE USR_INCLUDES = -I$(CAS)/../ca -I$(OSSRC) -I$(IOSRC) -I$(CAS)/gdd USR_LDLIBS = -lcas -lm @@ -69,7 +69,7 @@ LIBOBJS += caServerIO.o LIBNAME = libcas.a -include $(TOP)/src/config/RULES.Unix +include $(TOP)/config/RULES.Unix obj: $(LIBOBJS) diff --git a/src/cas/build/singleThread/Makefile b/src/cas/build/singleThread/Makefile index f6d08e8c9..4cc86e933 100644 --- a/src/cas/build/singleThread/Makefile +++ b/src/cas/build/singleThread/Makefile @@ -1,25 +1,8 @@ -# -# $Id$ -# -# Lowest Level Directroy Makefile -# by Janet Anderson -# -# $Log$ -# Revision 1.2 1996/06/25 21:48:01 jba -# Makefile includes now from base/src/config, removed all soft links -# -# Revision 1.1.1.1 1996/06/20 00:28:17 jhill -# ca server installation -# -# Revision 1.1 1994/09/07 19:26:34 jba -# New file -# -# TOP= ../../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE -include $(TOP)/src/config/RULES_ARCHS +include $(TOP)/config/RULES_ARCHS diff --git a/src/cas/build/singleThread/Makefile.Unix b/src/cas/build/singleThread/Makefile.Unix index 727d6602f..df903f979 100644 --- a/src/cas/build/singleThread/Makefile.Unix +++ b/src/cas/build/singleThread/Makefile.Unix @@ -6,7 +6,7 @@ IOSRC = $(CAS)/io/bsdSocket OSSRC = $(CAS)/os/posix VPATH = $(SRC) $(IOSRC) $(OSSRC) -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE USR_INCLUDES = -I$(SRC) -I$(CAS)/../ca -I$(OSSRC) -I$(IOSRC) -I$(CAS)/../gdd -I$(CAS)/../gdd/O.$(T_A) @@ -82,7 +82,7 @@ LIBOBJS += sigPipeIgnore.o LIBNAME = libcas.a -include $(TOP)/src/config/RULES.Unix +include $(TOP)/config/RULES.Unix obj: $(LIBOBJS) diff --git a/src/cas/example/Makefile b/src/cas/example/Makefile index b309139f2..19351fe2b 100644 --- a/src/cas/example/Makefile +++ b/src/cas/example/Makefile @@ -1,21 +1,7 @@ -# -# $Id$ -# -# Lowest Level Directroy Makefile -# by Janet Anderson -# -# $Log$ -# Revision 1.1.1.1 1996/06/20 00:28:18 jhill -# ca server installation -# -# Revision 1.1 1994/09/07 19:26:34 jba -# New file -# -# TOP=../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE -include $(TOP)/src/config/RULES_ARCHS +include $(TOP)/config/RULES_ARCHS diff --git a/src/cas/example/Makefile.Unix b/src/cas/example/Makefile.Unix index a05d46121..343a3d4f3 100644 --- a/src/cas/example/Makefile.Unix +++ b/src/cas/example/Makefile.Unix @@ -2,7 +2,7 @@ CAS = ../../ TOP = $(CAS)/../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE #CPLUSPLUS = G++ @@ -76,7 +76,7 @@ GLOMBOBJ += $(BUILDDIR)casDGIO.o GLOMBOBJ += $(BUILDDIR)casStreamIO.o GLOMBOBJ += $(BUILDDIR)sigPipeIgnore.o -include $(TOP)/src/config/RULES.Unix +include $(TOP)/config/RULES.Unix excas: $(OBJS) $(DEPLIBS) $(LINK.cc) -o $@ $(OBJS) $(LDFLAGS) $(LDLIBS) diff --git a/src/cas/generic/Makefile b/src/cas/generic/Makefile index af08974b1..ccc111fa5 100644 --- a/src/cas/generic/Makefile +++ b/src/cas/generic/Makefile @@ -1,22 +1,8 @@ -# -# $Id$ -# -# Lowest Level Directroy Makefile -# by Janet Anderson -# -# $Log$ -# Revision 1.1.1.1 1996/06/20 00:28:05 jhill -# ca server installation -# -# Revision 1.1 1994/09/07 19:26:34 jba -# New file -# -# TOP = ../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE -include $(TOP)/src/config/RULES_ARCHS +include $(TOP)/config/RULES_ARCHS diff --git a/src/cas/generic/Makefile.Unix b/src/cas/generic/Makefile.Unix index e23fe8ec0..ac26b2381 100644 --- a/src/cas/generic/Makefile.Unix +++ b/src/cas/generic/Makefile.Unix @@ -1,11 +1,11 @@ TOP = ../../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE INC += casdef.h INC += casInternal.h INC += casEventMask.h INC += gddAppFuncTable.h -include $(TOP)/src/config/RULES.Unix +include $(TOP)/config/RULES.Unix diff --git a/src/cvtDctsdr/Makefile b/src/cvtDctsdr/Makefile index 54afbd394..8cca632b9 100644 --- a/src/cvtDctsdr/Makefile +++ b/src/cvtDctsdr/Makefile @@ -1,21 +1,7 @@ -# -# $Id$ -# -# Lowest Level Directroy Makefile -# by Janet Anderson -# -# $Log$ -# Revision 1.1 1995/11/29 14:19:47 mrk -# Changes for replacing default.dctsdr by all ascii files -# -# Revision 1.1 1994/09/07 19:25:39 jba -# New file -# -# TOP=../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE -include $(TOP)/src/config/RULES_ARCHS +include $(TOP)/config/RULES_ARCHS diff --git a/src/cvtDctsdr/Makefile.Unix b/src/cvtDctsdr/Makefile.Unix index 306d76850..e574d11d0 100644 --- a/src/cvtDctsdr/Makefile.Unix +++ b/src/cvtDctsdr/Makefile.Unix @@ -1,5 +1,5 @@ TOP = ../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE USR_LDLIBS = -lCom USR_LDFLAGS = -L. @@ -29,7 +29,7 @@ MAN1 = sf2db.1 PROD = sf2db sdr2gblmenu sdr2driver sdr2device sdr2recordtype -include $(TOP)/src/config/RULES.Unix +include $(TOP)/config/RULES.Unix sdr2gblmenu: sdr2gblmenu.o dbStaticLib.o $(LINK.c) -o $@ sdr2gblmenu.o dbStaticLib.o $(LDLIBS) diff --git a/src/cvtDctsdr/Makefile.Vx b/src/cvtDctsdr/Makefile.Vx index 8c5f81516..294ad4dec 100644 --- a/src/cvtDctsdr/Makefile.Vx +++ b/src/cvtDctsdr/Makefile.Vx @@ -1,5 +1,5 @@ TOP = ../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE USR_CFLAGS = -DACCESS_SECURITY -D_NO_PROTO @@ -7,5 +7,5 @@ SRCS.c = OBJS = PROD = -include $(TOP)/src/config/RULES.Vx +include $(TOP)/config/RULES.Vx diff --git a/src/cxxTemplates/Makefile b/src/cxxTemplates/Makefile index 907f409ed..8cca632b9 100644 --- a/src/cxxTemplates/Makefile +++ b/src/cxxTemplates/Makefile @@ -1,21 +1,7 @@ -# -# $Id$ -# -# Base: Lowest Level Directroy Makefile -# by Janet Anderson -# -# $Log$ -# Revision 1.1.1.1 1996/06/20 22:15:56 jhill -# installed ca server templates -# -# Revision 1.1 1994/09/07 19:26:01 jba -# New file -# -# TOP=../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE -include $(TOP)/src/config/RULES_ARCHS +include $(TOP)/config/RULES_ARCHS diff --git a/src/cxxTemplates/Makefile.Unix b/src/cxxTemplates/Makefile.Unix index 966ed10c9..632a41988 100644 --- a/src/cxxTemplates/Makefile.Unix +++ b/src/cxxTemplates/Makefile.Unix @@ -1,9 +1,9 @@ TOP = ../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE INC += resourceLib.h INC += tsDLList.h INC += tsSLList.h -include $(TOP)/src/config/RULES.Unix +include $(TOP)/config/RULES.Unix diff --git a/src/db/Makefile b/src/db/Makefile index 0a5ece918..8cca632b9 100644 --- a/src/db/Makefile +++ b/src/db/Makefile @@ -1,18 +1,7 @@ -# -# $Id$ -# -# Base: Lowest Level Directroy Makefile -# by Janet Anderson -# -# $Log$ -# Revision 1.1 1994/09/07 19:26:01 jba -# New file -# -# TOP=../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE -include $(TOP)/src/config/RULES_ARCHS +include $(TOP)/config/RULES_ARCHS diff --git a/src/db/Makefile.Unix b/src/db/Makefile.Unix index a2fcb4a71..c597b4564 100644 --- a/src/db/Makefile.Unix +++ b/src/db/Makefile.Unix @@ -1,5 +1,5 @@ TOP = ../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE INC += drvTS.h INC += drvSup.h @@ -21,5 +21,5 @@ INC += recGbl.h INC += dbBkpt.h INC += devLib.h -include $(TOP)/src/config/RULES.Unix +include $(TOP)/config/RULES.Unix diff --git a/src/db/Makefile.Vx b/src/db/Makefile.Vx index 4580daa10..0053b379d 100644 --- a/src/db/Makefile.Vx +++ b/src/db/Makefile.Vx @@ -1,5 +1,5 @@ TOP = ../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE USR_CFLAGS = -ansi VX_WARN_YES = -Wall -pedantic @@ -71,7 +71,7 @@ PROD = initHooks.o LIBNAME = dbLib -include $(TOP)/src/config/RULES.Vx +include $(TOP)/config/RULES.Vx dbCommon.h: ../dbCommonRecord.dbd ../dbCommon.dbd $(RM) $@ diff --git a/src/dbStatic/Makefile b/src/dbStatic/Makefile index df578963d..8cca632b9 100644 --- a/src/dbStatic/Makefile +++ b/src/dbStatic/Makefile @@ -1,21 +1,7 @@ -# -# $Id$ -# -# Base: Lowest Level Directroy Makefile -# by Janet Anderson -# -# $Log$ -# Revision 1.1 1995/11/29 14:33:01 mrk -# Changes for replacing default.dctsdr by all ascii files -# -# Revision 1.1 1994/09/07 19:26:01 jba -# New file -# -# TOP=../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE -include $(TOP)/src/config/RULES_ARCHS +include $(TOP)/config/RULES_ARCHS diff --git a/src/dbStatic/Makefile.Unix b/src/dbStatic/Makefile.Unix index ab2ef1f4a..90e06ea7f 100755 --- a/src/dbStatic/Makefile.Unix +++ b/src/dbStatic/Makefile.Unix @@ -1,5 +1,5 @@ TOP = ../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE USR_LDLIBS = -lDb -lCom -lm USR_LDFLAGS = -L. @@ -46,7 +46,7 @@ PROD = \ dbToMenuH\ dbToRecordtypeH -include $(TOP)/src/config/RULES.Unix +include $(TOP)/config/RULES.Unix # Extra rule since dbLexRoutines.c is included in dbYacc.c dbYacc.o: dbLex.c ../dbLexRoutines.c diff --git a/src/dbStatic/Makefile.Vx b/src/dbStatic/Makefile.Vx index 0440c07de..8a0fca2c9 100644 --- a/src/dbStatic/Makefile.Vx +++ b/src/dbStatic/Makefile.Vx @@ -1,5 +1,5 @@ TOP = ../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE USR_CFLAGS = -ansi VX_WARN_YES = -Wall -pedantic @@ -18,7 +18,7 @@ OBJSdbLib = \ PROD = dbStaticLib -include $(TOP)/src/config/RULES.Vx +include $(TOP)/config/RULES.Vx # Extra rule since dbLexRoutines.c is included in dbYacc.c dbYacc.o: dbLex.c ../dbLexRoutines.c diff --git a/src/dbtools/Makefile b/src/dbtools/Makefile index eddc5022c..8cca632b9 100644 --- a/src/dbtools/Makefile +++ b/src/dbtools/Makefile @@ -1,18 +1,7 @@ -# -# $Id$ -# -# Lowest Level Directroy Makefile -# by Janet Anderson -# -# $Log$ -# Revision 1.1 1994/09/07 19:26:04 jba -# New file -# -# TOP=../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE -include $(TOP)/src/config/RULES_ARCHS +include $(TOP)/config/RULES_ARCHS diff --git a/src/dbtools/Makefile.Unix b/src/dbtools/Makefile.Unix index 174a70fc0..e010c3361 100644 --- a/src/dbtools/Makefile.Unix +++ b/src/dbtools/Makefile.Unix @@ -1,5 +1,5 @@ TOP = ../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE # USR_CFLAGS = -v @@ -24,7 +24,7 @@ MAN1 = dbLoadTemplate.1 subtool.1 MAN3 = dbLoadRecords.3 dbLoadTemplate.3 MAN5 = templatefile.5 dbfile.5 -include $(TOP)/src/config/RULES.Unix +include $(TOP)/config/RULES.Unix dbLoadTemplate.o: dbLoadTemplate_lex.c dbLoadRecords.o: dbLoadRecords_lex.c diff --git a/src/dbtools/Makefile.Vx b/src/dbtools/Makefile.Vx index 9d1fba64a..54769adb6 100644 --- a/src/dbtools/Makefile.Vx +++ b/src/dbtools/Makefile.Vx @@ -1,5 +1,5 @@ TOP = ../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE YACCOPT = -l LEXOPT = -L @@ -15,7 +15,7 @@ MAN1 = dbLoadTemplate.1 subtool.1 MAN3 = dbLoadRecords.3 dbLoadTemplate.3 MAN5 = templatefile.5 dbfile.5 -include $(TOP)/src/config/RULES.Vx +include $(TOP)/config/RULES.Vx #dbLoadTemplate.o: dbLoadTemplate_lex.c dbLoadTemplate.c #dbLoadRecords.o: dbLoadRecords_lex.c dbLoadRecords.c diff --git a/src/dev/Makefile b/src/dev/Makefile index 1cd45a6ed..8cca632b9 100644 --- a/src/dev/Makefile +++ b/src/dev/Makefile @@ -1,18 +1,7 @@ -# -# $Id$ -# -# Lowest Level Directroy Makefile -# by Janet Anderson -# -# $Log$ -# Revision 1.1 1994/09/07 19:26:11 jba -# New file -# -# TOP=../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE -include $(TOP)/src/config/RULES_ARCHS +include $(TOP)/config/RULES_ARCHS diff --git a/src/dev/Makefile.Vx b/src/dev/Makefile.Vx index 3160f2b9c..49f5a22ab 100644 --- a/src/dev/Makefile.Vx +++ b/src/dev/Makefile.Vx @@ -1,5 +1,5 @@ TOP = ../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE USR_INCLUDES = -I../../drv/ansi -I../../drv/old @@ -125,6 +125,6 @@ LIBOBJS = $(SRCS.c:../%.c=%.o) PROD = $(LIBOBJS) LIBNAME = devSup -include $(TOP)/src/config/RULES.Vx +include $(TOP)/config/RULES.Vx diff --git a/src/devOpt/Makefile b/src/devOpt/Makefile index bb26dca41..8cca632b9 100644 --- a/src/devOpt/Makefile +++ b/src/devOpt/Makefile @@ -1,18 +1,7 @@ -# -# $Id$ -# -# Lowest Level Directroy Makefile -# by Janet Anderson -# -# $Log$ -# Revision 1.1 1994/09/07 19:26:13 jba -# New file -# -# TOP=../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE -include $(TOP)/src/config/RULES_ARCHS +include $(TOP)/config/RULES_ARCHS diff --git a/src/devOpt/Makefile.Vx b/src/devOpt/Makefile.Vx index 4f65df07e..5f02ab1cb 100644 --- a/src/devOpt/Makefile.Vx +++ b/src/devOpt/Makefile.Vx @@ -1,5 +1,5 @@ TOP = ../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE USR_INCLUDES = -I../../drv @@ -20,6 +20,6 @@ LIBNAME = devLibOpt PROD = $(LIBOBJS) -include $(TOP)/src/config/RULES.Vx +include $(TOP)/config/RULES.Vx diff --git a/src/drv/Makefile b/src/drv/Makefile index b11cc4b45..648730e7e 100644 --- a/src/drv/Makefile +++ b/src/drv/Makefile @@ -1,12 +1,9 @@ -# -# $Id$ -# TOP=../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE DIRS = ansi old combine -include $(TOP)/src/config/RULES_DIRS +include $(TOP)/config/RULES_DIRS diff --git a/src/drv/ansi/Makefile b/src/drv/ansi/Makefile index 8b87ce2d3..784cf01d0 100644 --- a/src/drv/ansi/Makefile +++ b/src/drv/ansi/Makefile @@ -1,12 +1,7 @@ -# -# $Id$ -# -# -# TOP=../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE -include $(TOP)/src/config/RULES_ARCHS +include $(TOP)/config/RULES_ARCHS diff --git a/src/drv/ansi/Makefile.Vx b/src/drv/ansi/Makefile.Vx index a1f14d2eb..96394fea8 100644 --- a/src/drv/ansi/Makefile.Vx +++ b/src/drv/ansi/Makefile.Vx @@ -3,7 +3,7 @@ # TOP = ../../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE USR_CFLAGS = -ansi @@ -36,5 +36,5 @@ TARGETS = $(SRCS.c:../%.c=%.o) MAN3 = drvEpvxi.3 -include $(TOP)/src/config/RULES.Vx +include $(TOP)/config/RULES.Vx diff --git a/src/drv/old/Makefile b/src/drv/old/Makefile index 89ebf9830..784cf01d0 100644 --- a/src/drv/old/Makefile +++ b/src/drv/old/Makefile @@ -1,10 +1,7 @@ -# -# $Id$ -# TOP=../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE -include $(TOP)/src/config/RULES_ARCHS +include $(TOP)/config/RULES_ARCHS diff --git a/src/drv/old/Makefile.Vx b/src/drv/old/Makefile.Vx index 3980cfb74..57950f986 100644 --- a/src/drv/old/Makefile.Vx +++ b/src/drv/old/Makefile.Vx @@ -1,9 +1,6 @@ -# -# $Id$ -# TOP = ../../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE USR_CFLAGS = -fshared-data -fvolatile -mnobitfield -traditional @@ -41,5 +38,5 @@ SRCS.c += ../drvXy566.c TARGETS = $(SRCS.c:../%.c=%.o) -include $(TOP)/src/config/RULES.Vx +include $(TOP)/config/RULES.Vx diff --git a/src/gdd/Makefile b/src/gdd/Makefile index 1b1750d6b..109bb30d3 100644 --- a/src/gdd/Makefile +++ b/src/gdd/Makefile @@ -5,6 +5,9 @@ # $Id$ # # $Log$ +# Revision 1.3 1996/06/26 21:17:08 jhill +# fixed to match config in src +# # Revision 1.2 1996/06/25 19:18:10 jbk # moved from extensions to base - fixed trouble in dbMapper.cc # @@ -22,7 +25,7 @@ TOP=../.. # EPICS=/usr/local/epics/R3.12.2 -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE -include $(TOP)/src/config/RULES_ARCHS +include $(TOP)/config/RULES_ARCHS diff --git a/src/gdd/Makefile.Unix b/src/gdd/Makefile.Unix index af68eee80..952275769 100644 --- a/src/gdd/Makefile.Unix +++ b/src/gdd/Makefile.Unix @@ -5,6 +5,9 @@ # $Id$ # # $Log$ +# Revision 1.3 1996/06/26 21:17:10 jhill +# fixed to match config in src +# # Revision 1.2 1996/06/25 19:18:11 jbk # moved from extensions to base - fixed trouble in dbMapper.cc # @@ -26,7 +29,7 @@ VPATH=.:.. TOP= ../../.. # EPICS = /usr/local/epics/R3.12.2 -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE OPTIM_YES=-g ifeq ($(HOST_ARCH),sun4) @@ -77,5 +80,5 @@ genApps: genApps.o $(LIBOBJS) clean:: /bin/rm -f aitConvertGenerated.cc aitGen genApps -include $(TOP)/src/config/RULES.Unix +include $(TOP)/config/RULES.Unix diff --git a/src/include/Makefile b/src/include/Makefile index e6ff629c2..8cca632b9 100644 --- a/src/include/Makefile +++ b/src/include/Makefile @@ -1,21 +1,7 @@ -# -# $Id$ -# -# Lowest Level Directroy Makefile -# by Janet Anderson -# -# $Log$ -# Revision 1.1 1996/01/25 21:38:30 mrk -# moved files from /base/include -# -# Revision 1.1 1994/09/07 19:26:32 jba -# New file -# -# TOP=../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE -include $(TOP)/src/config/RULES_ARCHS +include $(TOP)/config/RULES_ARCHS diff --git a/src/include/Makefile.Unix b/src/include/Makefile.Unix index ea2ffb492..1dbf13d3f 100755 --- a/src/include/Makefile.Unix +++ b/src/include/Makefile.Unix @@ -1,5 +1,5 @@ TOP = ../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE INC += dbDefs.h INC += camacLib.h @@ -12,5 +12,5 @@ INC += createSoftLinks.sh INC += bsdProto.h INC += task_params.h -include $(TOP)/src/config/RULES.Unix +include $(TOP)/config/RULES.Unix diff --git a/src/iocCore/Makefile b/src/iocCore/Makefile index 77ff807c7..8cca632b9 100644 --- a/src/iocCore/Makefile +++ b/src/iocCore/Makefile @@ -1,18 +1,7 @@ -# -# $Id$ -# -# Base: Lowest Level Directroy Makefile -# by Janet Anderson -# -# $Log$ -# Revision 1.1 1994/09/07 19:26:19 jba -# New file -# -# TOP=../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE -include $(TOP)/src/config/RULES_ARCHS +include $(TOP)/config/RULES_ARCHS diff --git a/src/iocCore/Makefile.Vx b/src/iocCore/Makefile.Vx index 4bbe265ce..a616bf1b8 100644 --- a/src/iocCore/Makefile.Vx +++ b/src/iocCore/Makefile.Vx @@ -1,5 +1,5 @@ TOP = ../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE LINK.c=$(LD) $(LDFLAGS) @@ -20,7 +20,7 @@ IOC_CORE_OBJS = \ PROD = iocCore vxWorks vxWorks.sym -include $(TOP)/src/config/RULES.Vx +include $(TOP)/config/RULES.Vx vxWorks: $(VX_IMAGE) @$(RM) $@ diff --git a/src/libCom/Makefile b/src/libCom/Makefile index f6be7ce5e..8cca632b9 100644 --- a/src/libCom/Makefile +++ b/src/libCom/Makefile @@ -1,18 +1,7 @@ -# -# $Id$ -# -# Base Lowest Level Directroy Makefile -# by Janet Anderson -# -# $Log$ -# Revision 1.1 1994/09/07 19:26:22 jba -# New file -# -# TOP=../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE -include $(TOP)/src/config/RULES_ARCHS +include $(TOP)/config/RULES_ARCHS diff --git a/src/libCom/Makefile.Unix b/src/libCom/Makefile.Unix index cea1d093a..ddb200035 100644 --- a/src/libCom/Makefile.Unix +++ b/src/libCom/Makefile.Unix @@ -1,5 +1,5 @@ TOP = ../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE USR_CFLAGS = -D_NO_PROTO @@ -74,7 +74,7 @@ LIBNAME = libCom.a MAN3 = gpHash.3 freeList.3 -include $(TOP)/src/config/RULES.Unix +include $(TOP)/config/RULES.Unix errSymTbl.o: errSymTbl.c errInc.o errIncCXX.o $(COMPILE.c) -o $@ $< @@ -83,9 +83,9 @@ errSymTbl.c errInc.o errIncCXX.o : ../errInc.c ../errIncCXX.cc @$(RM) errInc.o errIncCXX.o @../blderrSymTbl $(TOP) $(HOST_ARCH) "$(MAKE)" -envData.c: ../envDefs.h $(TOP)/src/config/CONFIG_ENV \ - $(TOP)/src/config/CONFIG_SITE_ENV - ../bldEnvData $(TOP)/src/config +envData.c: ../envDefs.h $(TOP)/config/CONFIG_ENV \ + $(TOP)/config/CONFIG_SITE_ENV + ../bldEnvData $(TOP)/config tsTest: tsSubr.o $(LINK.c) -o $@ tsSubr.o -lCom -lDb -lCom -lm -s diff --git a/src/libCom/Makefile.Vx b/src/libCom/Makefile.Vx index 2e82d5d3d..e5d85c81a 100644 --- a/src/libCom/Makefile.Vx +++ b/src/libCom/Makefile.Vx @@ -1,5 +1,5 @@ TOP = ../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE SRCS.c += ../calcPerform.c SRCS.c += ../cvtFast.c @@ -42,7 +42,7 @@ LIBNAME = libCom MAN3 = gpHash.3 freeList.3 -include $(TOP)/src/config/RULES.Vx +include $(TOP)/config/RULES.Vx clean:: @$(RM) errSymTbl.c envData.c @@ -53,7 +53,7 @@ errSymTbl.c errInc.o: ../errInc.c @$(RM) errInc.o ../blderrSymTbl $(TOP) $(HOST_ARCH) "$(MAKE)" -envData.c: ../envDefs.h $(TOP)/src/config/CONFIG_ENV \ - $(TOP)/src/config/CONFIG_SITE_ENV - ../bldEnvData $(TOP)/src/config +envData.c: ../envDefs.h $(TOP)/config/CONFIG_ENV \ + $(TOP)/config/CONFIG_SITE_ENV + ../bldEnvData $(TOP)/config diff --git a/src/libCom/blderrSymTbl b/src/libCom/blderrSymTbl index 5aa919b09..fec73088b 100755 --- a/src/libCom/blderrSymTbl +++ b/src/libCom/blderrSymTbl @@ -52,7 +52,7 @@ fi TOP=$1 MAKE=$2 -INCLUDE=${TOP}/src/config/CONFIG_BASE +INCLUDE=${TOP}/config/CONFIG_BASE if [ -z "$4" ]; then OPTS="" diff --git a/src/libCompat/Makefile b/src/libCompat/Makefile index 3808af369..8cca632b9 100644 --- a/src/libCompat/Makefile +++ b/src/libCompat/Makefile @@ -1,18 +1,7 @@ -# -# $Id$ -# -# Lowest Level Directroy Makefile -# by Janet Anderson -# -# $Log$ -# Revision 1.1 1994/09/07 19:26:24 jba -# New file -# -# TOP=../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE -include $(TOP)/src/config/RULES_ARCHS +include $(TOP)/config/RULES_ARCHS diff --git a/src/libvxWorks/Makefile b/src/libvxWorks/Makefile index 3d534aaec..8cca632b9 100644 --- a/src/libvxWorks/Makefile +++ b/src/libvxWorks/Makefile @@ -1,18 +1,7 @@ -# -# $Id$ -# -# Lowest Level Directroy Makefile -# by Janet Anderson -# -# $Log$ -# Revision 1.1 1994/09/07 19:26:26 jba -# New file -# -# TOP=../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE -include $(TOP)/src/config/RULES_ARCHS +include $(TOP)/config/RULES_ARCHS diff --git a/src/libvxWorks/Makefile.Vx b/src/libvxWorks/Makefile.Vx index 8cbf49ebc..400f723c9 100644 --- a/src/libvxWorks/Makefile.Vx +++ b/src/libvxWorks/Makefile.Vx @@ -1,5 +1,5 @@ TOP = ../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE SRCS.c = ../iocLogClient.c ../veclist.c ../ldpp.c @@ -8,5 +8,5 @@ LIBOBJS = veclist.o iocLogClient.o ldpp.o LIBNAME = vxComLib SCRIPTS = vxldscript.MRI -include $(TOP)/src/config/RULES.Vx +include $(TOP)/config/RULES.Vx diff --git a/src/misc/Makefile b/src/misc/Makefile index febe19ce5..8cca632b9 100644 --- a/src/misc/Makefile +++ b/src/misc/Makefile @@ -1,18 +1,7 @@ -# -# $Id$ -# -# Lowest Level Directroy Makefile -# by Janet Anderson -# -# $Log$ -# Revision 1.1 1994/09/07 19:26:29 jba -# New file -# -# TOP=../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE -include $(TOP)/src/config/RULES_ARCHS +include $(TOP)/config/RULES_ARCHS diff --git a/src/misc/Makefile.Vx b/src/misc/Makefile.Vx index e808c89b8..f7a2a1766 100644 --- a/src/misc/Makefile.Vx +++ b/src/misc/Makefile.Vx @@ -1,5 +1,5 @@ TOP = ../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE SRCS.c = ../epicsRelease.c @@ -7,6 +7,6 @@ LIBOBJS = epicsRelease.o LIBNAME = miscLib -include $(TOP)/src/config/RULES.Vx +include $(TOP)/config/RULES.Vx diff --git a/src/rec/Makefile b/src/rec/Makefile index ce4fdb9b3..8cca632b9 100644 --- a/src/rec/Makefile +++ b/src/rec/Makefile @@ -1,18 +1,7 @@ -# -# $Id$ -# -# Lowest Level Directroy Makefile -# by Janet Anderson -# -# $Log$ -# Revision 1.1 1994/09/07 19:26:32 jba -# New file -# -# TOP=../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE -include $(TOP)/src/config/RULES_ARCHS +include $(TOP)/config/RULES_ARCHS diff --git a/src/rec/Makefile.Vx b/src/rec/Makefile.Vx index de855742c..1ff6220af 100644 --- a/src/rec/Makefile.Vx +++ b/src/rec/Makefile.Vx @@ -1,5 +1,5 @@ TOP = ../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE USR_INCLUDES = -I../drv/ansi -I../../drv/old @@ -102,5 +102,5 @@ PROD = $(LIBOBJS) LIBNAME = recSup -include $(TOP)/src/config/RULES.Vx +include $(TOP)/config/RULES.Vx diff --git a/src/rsrv/Makefile b/src/rsrv/Makefile index 080b6a2b2..8cca632b9 100644 --- a/src/rsrv/Makefile +++ b/src/rsrv/Makefile @@ -1,18 +1,7 @@ -# -# $Id$ -# -# Lowest Level Directroy Makefile -# by Janet Anderson -# -# $Log$ -# Revision 1.1 1994/09/07 19:26:34 jba -# New file -# -# TOP=../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE -include $(TOP)/src/config/RULES_ARCHS +include $(TOP)/config/RULES_ARCHS diff --git a/src/rsrv/Makefile.Vx b/src/rsrv/Makefile.Vx index fad7655de..c7f4c0432 100644 --- a/src/rsrv/Makefile.Vx +++ b/src/rsrv/Makefile.Vx @@ -1,5 +1,5 @@ TOP = ../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE USR_INCLUDES = -I../../ca USR_CFLAGS = -UUNIX @@ -15,7 +15,7 @@ OBJS = \ PROD = rsrvLib -include $(TOP)/src/config/RULES.Vx +include $(TOP)/config/RULES.Vx rsrvLib: $(OBJS) $(RM) $@ diff --git a/src/sequencer/Makefile b/src/sequencer/Makefile index c91f4892f..8cca632b9 100644 --- a/src/sequencer/Makefile +++ b/src/sequencer/Makefile @@ -1,21 +1,7 @@ -# -# Makefile,v 1.2 1995/06/27 15:25:35 wright Exp -# -# Lowest Level Directroy Makefile -# by Janet Anderson -# -# Makefile,v -# Revision 1.2 1995/06/27 15:25:35 wright -# Brought over Andy's sequencer 1.9 files, compiled and created new seq and snc. -# -# Revision 1.1 1994/09/07 19:26:37 jba -# New file -# -# TOP=../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE -include $(TOP)/src/config/RULES_ARCHS +include $(TOP)/config/RULES_ARCHS diff --git a/src/sequencer/Makefile.Unix b/src/sequencer/Makefile.Unix index 14abfea8a..94e56efdd 100644 --- a/src/sequencer/Makefile.Unix +++ b/src/sequencer/Makefile.Unix @@ -1,5 +1,5 @@ TOP = ../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE #YACCOPT = -l #LEXOPT = -L @@ -19,7 +19,7 @@ OBJS = snc_main.o parse.o phase2.o gen_ss_code.o \ PROD = snc -include $(TOP)/src/config/RULES.Unix +include $(TOP)/config/RULES.Unix # # The generated lex file includes snc.h diff --git a/src/sequencer/Makefile.Vx b/src/sequencer/Makefile.Vx index a9b118792..86f473206 100644 --- a/src/sequencer/Makefile.Vx +++ b/src/sequencer/Makefile.Vx @@ -1,5 +1,5 @@ TOP = ../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE USR_CFLAGS = @@ -13,7 +13,7 @@ OBJS = \ PROD = seq -include $(TOP)/src/config/RULES.Vx +include $(TOP)/config/RULES.Vx clean:: @$(RM) seqVersion.c diff --git a/src/tools/Makefile b/src/tools/Makefile index 7c8769437..8cca632b9 100644 --- a/src/tools/Makefile +++ b/src/tools/Makefile @@ -1,21 +1,7 @@ -# -# $Id$ -# -# Lowest Level Directroy Makefile -# by Janet Anderson -# -# $Log$ -# Revision 1.1 1996/02/20 20:58:38 jba -# Moved tools to src/tools dir. base/tools dir removed. -# -# Revision 1.1 1994/09/07 19:25:39 jba -# New file -# -# TOP=../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE -include $(TOP)/src/config/RULES_ARCHS +include $(TOP)/config/RULES_ARCHS diff --git a/src/tools/Makefile.Unix b/src/tools/Makefile.Unix index ece52fdd3..2037919dc 100644 --- a/src/tools/Makefile.Unix +++ b/src/tools/Makefile.Unix @@ -1,10 +1,10 @@ TOP = ../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE PROD = installEpics SCRIPTS = InstallVersion getrel -include $(TOP)/src/config/RULES.Unix +include $(TOP)/config/RULES.Unix $(INSTALL_BIN)/installEpics: installEpics @echo "Installing $@" diff --git a/src/tools/getrel b/src/tools/getrel index f0b9f6d3b..ac44867d5 100755 --- a/src/tools/getrel +++ b/src/tools/getrel @@ -6,7 +6,7 @@ # USAGE="Usage: - getrel + getrel ex: getrel /usr/local/epics/base_R3.13 --------- OR ----------- @@ -36,15 +36,26 @@ if [ ! -d ${BASE}/bin -o \ exit 1 fi +FIRSTCHAR=`expr "${BASE}" : '\(.\).*'` +if [ ${FIRSTCHAR} != "/" ]; then + cat <<-!usage + $USAGE + + ${BASE} does not appear to be a full path name. + +!usage + exit 1 +fi + /bin/rm -f \ epics \ base \ - config \ target* \ vxWorks* \ vw +echo EPICS_BASE=${BASE} >> EPICS_BASE ln -s ${BASE} base diff --git a/src/toolsComm/antelope/Makefile b/src/toolsComm/antelope/Makefile index 006a552f2..784cf01d0 100644 --- a/src/toolsComm/antelope/Makefile +++ b/src/toolsComm/antelope/Makefile @@ -1,18 +1,7 @@ -# -# $Id$ -# -# Lowest Level Directroy Makefile -# by Janet Anderson -# -# $Log$ -# Revision 1.1 1994/09/07 19:26:39 jba -# New file -# -# TOP=../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE -include $(TOP)/src/config/RULES_ARCHS +include $(TOP)/config/RULES_ARCHS diff --git a/src/toolsComm/antelope/Makefile.Unix b/src/toolsComm/antelope/Makefile.Unix index 21ead2a3f..8511ddc1a 100644 --- a/src/toolsComm/antelope/Makefile.Unix +++ b/src/toolsComm/antelope/Makefile.Unix @@ -1,5 +1,5 @@ TOP = ../../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE USR_LDLIBS = -lm -s USR_CFLAGS = -D_NO_PROTO @@ -15,7 +15,7 @@ OBJS = \ PROD = antelope -include $(TOP)/src/config/RULES.Unix +include $(TOP)/config/RULES.Unix $(PROD): $(OBJS) $(LINK.c) -o $@ $(OBJS) $(LDLIBS) diff --git a/src/toolsComm/flex/Makefile b/src/toolsComm/flex/Makefile index 3599a6def..784cf01d0 100644 --- a/src/toolsComm/flex/Makefile +++ b/src/toolsComm/flex/Makefile @@ -1,18 +1,7 @@ -# -# $Id$ -# -# Lowest Level Directroy Makefile -# by Janet Anderson -# -# $Log$ -# Revision 1.1 1994/09/07 19:26:43 jba -# New file -# -# TOP=../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE -include $(TOP)/src/config/RULES_ARCHS +include $(TOP)/config/RULES_ARCHS diff --git a/src/toolsComm/flex/Makefile.Unix b/src/toolsComm/flex/Makefile.Unix index 5b3c0f246..601679285 100644 --- a/src/toolsComm/flex/Makefile.Unix +++ b/src/toolsComm/flex/Makefile.Unix @@ -1,5 +1,5 @@ TOP = ../../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE #CMPLR = STRICT @@ -27,7 +27,7 @@ OBJS = \ PROD = e_flex -include $(TOP)/src/config/RULES.Unix +include $(TOP)/config/RULES.Unix $(PROD): $(OBJS) $(LINK.c) -o $@ $(OBJS) $(LDLIBS) diff --git a/src/util/Makefile b/src/util/Makefile index 6066aa8e1..8cca632b9 100644 --- a/src/util/Makefile +++ b/src/util/Makefile @@ -1,18 +1,7 @@ -# -# $Id$ -# -# Lowest Level Directroy Makefile -# by Janet Anderson -# -# $Log$ -# Revision 1.1 1994/09/07 19:26:45 jba -# New file -# -# TOP=../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE -include $(TOP)/src/config/RULES_ARCHS +include $(TOP)/config/RULES_ARCHS diff --git a/src/util/Makefile.Unix b/src/util/Makefile.Unix index 1bf4a1675..51c634167 100644 --- a/src/util/Makefile.Unix +++ b/src/util/Makefile.Unix @@ -1,5 +1,5 @@ TOP = ../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE USR_LDLIBS = -lca -lCom -lm DEPLIBS = $(INSTALL_LIB)/libca.a $(INSTALL_LIB)/libCom.a @@ -25,7 +25,7 @@ PROD += S99logServer PROD += S99caRepeater endif -include $(TOP)/src/config/RULES.Unix +include $(TOP)/config/RULES.Unix S99%: ../rc2.% @/usr/bin/sed -e s%:EPICS:%`chdir $(TOP); /usr/bin/pwd`% \ diff --git a/src/util/Makefile.Vx b/src/util/Makefile.Vx index 099691fa0..1bbc02d63 100644 --- a/src/util/Makefile.Vx +++ b/src/util/Makefile.Vx @@ -1,9 +1,9 @@ TOP = ../../.. -include $(TOP)/src/config/CONFIG_BASE +include $(TOP)/config/CONFIG_BASE SRCS.c = ../ca_test.c TARGETS = ca_test.o -include $(TOP)/src/config/RULES.Vx +include $(TOP)/config/RULES.Vx