From 28c4ce844d04d70337996404a4cca0ea5583f594 Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Tue, 25 Jun 1996 21:48:55 +0000 Subject: [PATCH] Makefile includes now from base/src/config, removed all soft links --- src/as/Makefile | 9 ++-- src/as/Makefile.Unix | 9 ++-- src/as/Makefile.Vx | 7 ++- src/bdt/Makefile | 9 ++-- src/bdt/Makefile.Unix | 7 ++- src/bdt/Makefile.Vx | 7 ++- src/bpt/Makefile | 9 ++-- src/bpt/Makefile.Unix | 9 ++-- src/bpt/Makefile.Vx | 7 ++- src/ca/Makefile | 9 ++-- src/ca/Makefile.Unix | 9 ++-- src/ca/Makefile.Vx | 7 ++- src/cas/Makefile | 10 ++-- src/cas/Makefile.Unix | 7 ++- src/cas/build/Makefile | 9 ++-- src/cas/build/multiThread/Makefile.Unix | 6 +-- src/cas/build/singleThread/Makefile | 9 ++-- src/cas/build/singleThread/Makefile.Unix | 6 +-- src/cas/example/Makefile | 9 ++-- src/cas/example/Makefile.Unix | 7 ++- src/cvtDctsdr/Makefile | 9 ++-- src/cvtDctsdr/Makefile.Unix | 9 ++-- src/cvtDctsdr/Makefile.Vx | 7 ++- src/cxxTemplates/Makefile | 9 ++-- src/cxxTemplates/Makefile.Unix | 7 ++- src/db/Makefile | 9 ++-- src/db/Makefile.Unix | 8 ++-- src/db/Makefile.Vx | 17 ++----- src/dbStatic/Makefile | 9 ++-- src/dbStatic/Makefile.Unix | 9 ++-- src/dbStatic/Makefile.Vx | 8 ++-- src/dbtools/Makefile | 9 ++-- src/dbtools/Makefile.Unix | 7 ++- src/dbtools/Makefile.Vx | 7 ++- src/dev/Makefile | 9 ++-- src/dev/Makefile.Vx | 7 ++- src/devOpt/Makefile | 9 ++-- src/devOpt/Makefile.Vx | 8 ++-- src/drv/Makefile | 6 +-- src/drv/ansi/Makefile | 10 ++-- src/drv/ansi/Makefile.Vx | 7 ++- src/drv/old/Makefile | 10 ++-- src/drv/old/Makefile.Vx | 7 ++- src/include/Makefile | 9 ++-- src/include/Makefile.Unix | 8 ++-- src/iocCore/Makefile | 9 ++-- src/iocCore/Makefile.Vx | 7 ++- src/libCom/Makefile | 9 ++-- src/libCom/Makefile.Unix | 20 ++++---- src/libCom/Makefile.Vx | 22 ++++----- src/libCom/bldEnvData | 9 ++-- src/libCom/blderrSymTbl | 24 +++++----- src/libCompat/Makefile | 9 ++-- src/libvxWorks/Makefile | 9 ++-- src/libvxWorks/Makefile.Vx | 8 ++-- src/misc/Makefile | 9 ++-- src/misc/Makefile.Vx | 8 ++-- src/rec/Makefile | 9 ++-- src/rec/Makefile.Vx | 7 ++- src/rsrv/Makefile | 9 ++-- src/rsrv/Makefile.Vx | 8 ++-- src/sequencer/Makefile | 6 +-- src/sequencer/Makefile.Unix | 8 ++-- src/sequencer/Makefile.Vx | 7 ++- src/tools/Makefile | 9 ++-- src/tools/Makefile.Unix | 7 ++- src/tools/getrel | 58 +++--------------------- src/toolsComm/antelope/Makefile | 13 ++++-- src/toolsComm/antelope/Makefile.Unix | 7 ++- src/toolsComm/flex/Makefile | 13 ++++-- src/toolsComm/flex/Makefile.Unix | 9 ++-- src/util/Makefile | 9 ++-- src/util/Makefile.Unix | 11 ++--- src/util/Makefile.Vx | 7 ++- 74 files changed, 352 insertions(+), 363 deletions(-) diff --git a/src/as/Makefile b/src/as/Makefile index 62888d5349..58c5051bb8 100644 --- a/src/as/Makefile +++ b/src/as/Makefile @@ -5,11 +5,14 @@ # by Janet Anderson # # $Log$ +# Revision 1.1 1994/09/07 19:25:39 jba +# New file +# # -EPICS=../../.. +TOP=../.. -include $(EPICS)/config/CONFIG_BASE +include $(TOP)/src/config/CONFIG_BASE -include $(EPICS)/config/RULES_ARCHS +include $(TOP)/src/config/RULES_ARCHS diff --git a/src/as/Makefile.Unix b/src/as/Makefile.Unix index 2ecb8c64f1..165ce299b0 100644 --- a/src/as/Makefile.Unix +++ b/src/as/Makefile.Unix @@ -1,12 +1,11 @@ -EPICS = ../../../.. -include Target.include -include $(EPICS)/config/CONFIG_BASE +TOP = ../../.. +include $(TOP)/src/config/CONFIG_BASE USR_CFLAGS = -D_NO_PROTO USR_LDLIBS = -lAs -lCom -lDb -lCom -lm -s USR_LDFLAGS = -L. -DEPLIBS_BASE = $(EPICS_BASE_LIB) +DEPLIBS_BASE = $(INSTALL_LIB) DEPLIBS = ./libAs.a\ $(DEPLIBS_BASE)/libCom.a\ $(DEPLIBS_BASE)/libDb.a @@ -20,7 +19,7 @@ LIBOBJS = asLib.o LIBNAME = libAs.a PROD = ascheck -include $(EPICS)/config/RULES.Unix +include $(TOP)/src/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 61b1da5651..185b2c11e9 100644 --- a/src/as/Makefile.Vx +++ b/src/as/Makefile.Vx @@ -1,6 +1,5 @@ -EPICS = ../../../.. -include Target.include -include $(EPICS)/config/CONFIG_BASE +TOP = ../../.. +include $(TOP)/src/config/CONFIG_BASE USR_CFLAGS = -DACCESS_SECURITY -D_NO_PROTO @@ -8,7 +7,7 @@ SRCS.c = ../asDbLib.c ../asCa.c asLib.c LIBOBJS = asDbLib.o asCa.o asLib.o LIBNAME = asLibrary -include $(EPICS)/config/RULES.Vx +include $(TOP)/src/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 4c4cbe2bb8..f0a100d005 100644 --- a/src/bdt/Makefile +++ b/src/bdt/Makefile @@ -5,14 +5,17 @@ # 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 # # -EPICS=../../.. +TOP=../.. -include $(EPICS)/config/CONFIG_BASE +include $(TOP)/src/config/CONFIG_BASE -include $(EPICS)/config/RULES_ARCHS +include $(TOP)/src/config/RULES_ARCHS diff --git a/src/bdt/Makefile.Unix b/src/bdt/Makefile.Unix index 26239b6175..b8428ab342 100644 --- a/src/bdt/Makefile.Unix +++ b/src/bdt/Makefile.Unix @@ -1,6 +1,5 @@ -EPICS = ../../../.. -include Target.include -include $(EPICS)/config/CONFIG_BASE +TOP = ../../.. +include $(TOP)/src/config/CONFIG_BASE INC += bdt.h @@ -8,4 +7,4 @@ LIBOBJS += bdt.o LIBNAME = libBdt.a -include $(EPICS)/config/RULES.Unix +include $(TOP)/src/config/RULES.Unix diff --git a/src/bdt/Makefile.Vx b/src/bdt/Makefile.Vx index 4257793d1c..aa5fc59316 100644 --- a/src/bdt/Makefile.Vx +++ b/src/bdt/Makefile.Vx @@ -1,6 +1,5 @@ -EPICS = ../../../.. -include Target.include -include $(EPICS)/config/CONFIG_BASE +TOP = ../../.. +include $(TOP)/src/config/CONFIG_BASE SRCS.c += ../bdt.c SRCS.c += ../bdtServ.c @@ -14,7 +13,7 @@ OBJS += bdtServPv.o PROD = bdt -include $(EPICS)/config/RULES.Vx +include $(TOP)/src/config/RULES.Vx $(PROD): $(OBJS) $(RM) $@ diff --git a/src/bpt/Makefile b/src/bpt/Makefile index 977081d2dd..7c1d9a2a2e 100644 --- a/src/bpt/Makefile +++ b/src/bpt/Makefile @@ -5,14 +5,17 @@ # 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 # # -EPICS=../../.. +TOP=../.. -include $(EPICS)/config/CONFIG_BASE +include $(TOP)/src/config/CONFIG_BASE -include $(EPICS)/config/RULES_ARCHS +include $(TOP)/src/config/RULES_ARCHS diff --git a/src/bpt/Makefile.Unix b/src/bpt/Makefile.Unix index 3bfe38dad1..f7c35d80a7 100644 --- a/src/bpt/Makefile.Unix +++ b/src/bpt/Makefile.Unix @@ -1,7 +1,5 @@ -EPICS = ../../../.. -include Target.include -include $(EPICS)/config/CONFIG_BASE - +TOP = ../../.. +include $(TOP)/src/config/CONFIG_BASE INC += cvtTable.h @@ -9,4 +7,5 @@ SRCS.c = ../makeBpt OBJS = makeBpt PROD = makeBpt -include $(EPICS)/config/RULES.Unix +include $(TOP)/src/config/RULES.Unix + diff --git a/src/bpt/Makefile.Vx b/src/bpt/Makefile.Vx index 4bb8322022..0f2af35030 100644 --- a/src/bpt/Makefile.Vx +++ b/src/bpt/Makefile.Vx @@ -1,6 +1,5 @@ -EPICS = ../../../.. -include Target.include -include $(EPICS)/config/CONFIG_BASE +TOP = ../../.. +include $(TOP)/src/config/CONFIG_BASE USR_CFLAGS = -ansi VX_WARN_YES = -Wall -pedantic @@ -21,5 +20,5 @@ LIBOBJS = \ LIBNAME = pbtLib -include $(EPICS)/config/RULES.Vx +include $(TOP)/src/config/RULES.Vx diff --git a/src/ca/Makefile b/src/ca/Makefile index 62888d5349..14e1eed82c 100644 --- a/src/ca/Makefile +++ b/src/ca/Makefile @@ -5,11 +5,14 @@ # by Janet Anderson # # $Log$ +# Revision 1.1 1994/09/07 19:25:58 jba +# New file +# # -EPICS=../../.. +TOP=../.. -include $(EPICS)/config/CONFIG_BASE +include $(TOP)/src/config/CONFIG_BASE -include $(EPICS)/config/RULES_ARCHS +include $(TOP)/src/config/RULES_ARCHS diff --git a/src/ca/Makefile.Unix b/src/ca/Makefile.Unix index c54826a7ec..c5efdcf650 100644 --- a/src/ca/Makefile.Unix +++ b/src/ca/Makefile.Unix @@ -1,11 +1,10 @@ -EPICS = ../../../.. -include Target.include -include $(EPICS)/config/CONFIG_BASE +TOP = ../../.. +include $(TOP)/src/config/CONFIG_BASE USR_LDLIBS = -lca -lCom -lm USR_LDFLAGS = -L. -DEPLIBS_BASE = $(EPICS_BASE_LIB) +DEPLIBS_BASE = $(INSTALL_LIB) DEPLIBS = ./libca.a\ $(DEPLIBS_BASE)/libCom.a @@ -33,7 +32,7 @@ LIBNAME = libca.a PROD = caRepeater -include $(EPICS)/config/RULES.Unix +include $(TOP)/src/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 46fe7bdc0c..fe0edcb845 100644 --- a/src/ca/Makefile.Vx +++ b/src/ca/Makefile.Vx @@ -1,6 +1,5 @@ -EPICS = ../../../.. -include Target.include -include $(EPICS)/config/CONFIG_BASE +TOP = ../../.. +include $(TOP)/src/config/CONFIG_BASE SRCS.c = \ ../iocinf.c ../access.c ../test_event.c ../service.c \ @@ -14,5 +13,5 @@ LIBOBJS = \ LIBNAME = caLib -include $(EPICS)/config/RULES.Vx +include $(TOP)/src/config/RULES.Vx diff --git a/src/cas/Makefile b/src/cas/Makefile index 492d374d79..a8d9d56395 100644 --- a/src/cas/Makefile +++ b/src/cas/Makefile @@ -5,17 +5,19 @@ # 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 # # -EPICS=../../.. +TOP=../.. -include $(EPICS)/config/CONFIG_BASE +include $(TOP)/src/config/CONFIG_BASE DIRS = build example -include $(EPICS)/config/RULES_ARCHS - +include $(TOP)/src/config/RULES_ARCHS diff --git a/src/cas/Makefile.Unix b/src/cas/Makefile.Unix index e7e0e96f1d..3c476aa8dd 100644 --- a/src/cas/Makefile.Unix +++ b/src/cas/Makefile.Unix @@ -1,10 +1,9 @@ +TOP = ../../.. +include $(TOP)/src/config/CONFIG_BASE -EPICS = ../../../.. SRC = .. IOTYPE = bsdSocket OSTYPE = posix -include Target.include -include $(EPICS)/config/CONFIG_BASE USR_INCLUDES = -I../../ca -I../os/$(OSTYPE) -I../io/$(IOTYPE) -I../gdd -I../gdd/sun4 USR_LDLIBS = -lcas -lm @@ -53,7 +52,7 @@ LIBOBJS += casMapDBR.o LIBNAME = libcas.a -include $(EPICS)/config/RULES.Unix +include $(TOP)/src/config/RULES.Unix obj: $(LIBOBJS) diff --git a/src/cas/build/Makefile b/src/cas/build/Makefile index 019f0d2b5a..72a8f2ef7f 100644 --- a/src/cas/build/Makefile +++ b/src/cas/build/Makefile @@ -5,17 +5,20 @@ # by Janet Anderson # # $Log$ +# 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 # # -EPICS=../../../.. +TOP=../../.. -include $(EPICS)/config/CONFIG_BASE +include $(TOP)/src/config/CONFIG_BASE DIRS = posix-sockets -include $(EPICS)/config/RULES_ARCHS +include $(TOP)/src/config/RULES_ARCHS diff --git a/src/cas/build/multiThread/Makefile.Unix b/src/cas/build/multiThread/Makefile.Unix index 2ebc06003c..98b20a709b 100644 --- a/src/cas/build/multiThread/Makefile.Unix +++ b/src/cas/build/multiThread/Makefile.Unix @@ -1,5 +1,5 @@ -EPICS = ../../../.. +TOP = ../../.. CAS = ../../.. SRC = $(CAS)/generic IOSRC = $(CAS)/io/bsdSocket @@ -7,7 +7,7 @@ OSSRC = $(CAS)/os/posix VPATH = $(SRC) $(IOSRC) $(OSSRC) include Target.include -include $(EPICS)/config/CONFIG_BASE +include $(TOP)/src/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 $(EPICS)/config/RULES.Unix +include $(TOP)/src/config/RULES.Unix obj: $(LIBOBJS) diff --git a/src/cas/build/singleThread/Makefile b/src/cas/build/singleThread/Makefile index b0ba1d1f87..c479ab6b80 100644 --- a/src/cas/build/singleThread/Makefile +++ b/src/cas/build/singleThread/Makefile @@ -5,15 +5,18 @@ # by Janet Anderson # # $Log$ +# 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 # # -EPICS=../../../../../ +TOP= ../../../../ -include $(EPICS)/config/CONFIG_BASE +include $(TOP)/src/config/CONFIG_BASE -include $(EPICS)/config/RULES_ARCHS +include $(TOP)/src/config/RULES_ARCHS diff --git a/src/cas/build/singleThread/Makefile.Unix b/src/cas/build/singleThread/Makefile.Unix index 675b309221..f6e3dc2baf 100644 --- a/src/cas/build/singleThread/Makefile.Unix +++ b/src/cas/build/singleThread/Makefile.Unix @@ -1,5 +1,5 @@ -EPICS = ../../../../../.. +TOP = ../../../../.. CAS = ../../.. SRC = $(CAS)/generic IOSRC = $(CAS)/io/bsdSocket @@ -7,7 +7,7 @@ OSSRC = $(CAS)/os/posix VPATH = $(SRC) $(IOSRC) $(OSSRC) include Target.include -include $(EPICS)/config/CONFIG_BASE +include $(TOP)/src/config/CONFIG_BASE USR_INCLUDES = -I$(SRC) -I$(CAS)/../ca -I$(OSSRC) -I$(IOSRC) -I$(CAS)/gdd USR_LDLIBS = -lcas -lm @@ -88,7 +88,7 @@ LIBOBJS += sigPipeIgnore.o LIBNAME = libcas.a -include $(EPICS)/config/RULES.Unix +include $(TOP)/src/config/RULES.Unix obj: $(LIBOBJS) diff --git a/src/cas/example/Makefile b/src/cas/example/Makefile index eb1b12fe79..b309139f24 100644 --- a/src/cas/example/Makefile +++ b/src/cas/example/Makefile @@ -5,14 +5,17 @@ # 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 # # -EPICS=../../../.. +TOP=../../.. -include $(EPICS)/config/CONFIG_BASE +include $(TOP)/src/config/CONFIG_BASE -include $(EPICS)/config/RULES_ARCHS +include $(TOP)/src/config/RULES_ARCHS diff --git a/src/cas/example/Makefile.Unix b/src/cas/example/Makefile.Unix index 9fd36d1307..26db77a64b 100644 --- a/src/cas/example/Makefile.Unix +++ b/src/cas/example/Makefile.Unix @@ -1,9 +1,8 @@ -EPICS = ../../../../.. +TOP = ../../../.. CAS = ../../ -include Target.include -include $(EPICS)/config/CONFIG_BASE +include $(TOP)/src/config/CONFIG_BASE #CPLUSPLUS = G++ @@ -74,7 +73,7 @@ GLOMBOBJ += $(BUILDDIR)casDGIO.o GLOMBOBJ += $(BUILDDIR)casStreamIO.o GLOMBOBJ += $(BUILDDIR)sigPipeIgnore.o -include $(EPICS)/config/RULES.Unix +include $(TOP)/src/config/RULES.Unix #PURIFY = /remote/lear_local/pure/purify-3.0a-sunos4/purify nolib: $(OBJS) $(GLOMBOBJ) $(DEPLIBS) diff --git a/src/cvtDctsdr/Makefile b/src/cvtDctsdr/Makefile index 977081d2dd..54afbd3940 100644 --- a/src/cvtDctsdr/Makefile +++ b/src/cvtDctsdr/Makefile @@ -5,14 +5,17 @@ # 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 # # -EPICS=../../.. +TOP=../.. -include $(EPICS)/config/CONFIG_BASE +include $(TOP)/src/config/CONFIG_BASE -include $(EPICS)/config/RULES_ARCHS +include $(TOP)/src/config/RULES_ARCHS diff --git a/src/cvtDctsdr/Makefile.Unix b/src/cvtDctsdr/Makefile.Unix index 3508124bb8..306d768506 100644 --- a/src/cvtDctsdr/Makefile.Unix +++ b/src/cvtDctsdr/Makefile.Unix @@ -1,12 +1,11 @@ -EPICS = ../../../.. -include Target.include -include $(EPICS)/config/CONFIG_BASE +TOP = ../../.. +include $(TOP)/src/config/CONFIG_BASE USR_LDLIBS = -lCom USR_LDFLAGS = -L. -DEPLIBS_BASE = $(EPICS_BASE_LIB) +DEPLIBS_BASE = $(INSTALL_LIB) DEPLIBS = \ $(DEPLIBS_BASE)/libCom.a @@ -30,7 +29,7 @@ MAN1 = sf2db.1 PROD = sf2db sdr2gblmenu sdr2driver sdr2device sdr2recordtype -include $(EPICS)/config/RULES.Unix +include $(TOP)/src/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 1bf3bcb145..8c5f815165 100644 --- a/src/cvtDctsdr/Makefile.Vx +++ b/src/cvtDctsdr/Makefile.Vx @@ -1,6 +1,5 @@ -EPICS = ../../../.. -include Target.include -include $(EPICS)/config/CONFIG_BASE +TOP = ../../.. +include $(TOP)/src/config/CONFIG_BASE USR_CFLAGS = -DACCESS_SECURITY -D_NO_PROTO @@ -8,5 +7,5 @@ SRCS.c = OBJS = PROD = -include $(EPICS)/config/RULES.Vx +include $(TOP)/src/config/RULES.Vx diff --git a/src/cxxTemplates/Makefile b/src/cxxTemplates/Makefile index 5ab776fa92..907f409edb 100644 --- a/src/cxxTemplates/Makefile +++ b/src/cxxTemplates/Makefile @@ -5,14 +5,17 @@ # 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 # # -EPICS=../../.. +TOP=../.. -include $(EPICS)/config/CONFIG_BASE +include $(TOP)/src/config/CONFIG_BASE -include $(EPICS)/config/RULES_ARCHS +include $(TOP)/src/config/RULES_ARCHS diff --git a/src/cxxTemplates/Makefile.Unix b/src/cxxTemplates/Makefile.Unix index c9438d3be9..9d8b3e620c 100644 --- a/src/cxxTemplates/Makefile.Unix +++ b/src/cxxTemplates/Makefile.Unix @@ -1,6 +1,5 @@ -EPICS = ../../../.. -include Target.include -include $(EPICS)/config/CONFIG_BASE +TOP = ../../.. +include $(TOP)/src/config/CONFIG_BASE INC += osiTime.h INC += osiTimer.h @@ -8,4 +7,4 @@ INC += resourceLib.h INC += tsDLList.h INC += tsSLList.h -include $(EPICS)/config/RULES.Unix +include $(TOP)/src/config/RULES.Unix diff --git a/src/db/Makefile b/src/db/Makefile index a7af5f5ef6..0a5ece9180 100644 --- a/src/db/Makefile +++ b/src/db/Makefile @@ -5,11 +5,14 @@ # by Janet Anderson # # $Log$ +# Revision 1.1 1994/09/07 19:26:01 jba +# New file +# # -EPICS=../../.. +TOP=../.. -include $(EPICS)/config/CONFIG_BASE +include $(TOP)/src/config/CONFIG_BASE -include $(EPICS)/config/RULES_ARCHS +include $(TOP)/src/config/RULES_ARCHS diff --git a/src/db/Makefile.Unix b/src/db/Makefile.Unix index 949a52e535..a2fcb4a719 100644 --- a/src/db/Makefile.Unix +++ b/src/db/Makefile.Unix @@ -1,6 +1,5 @@ -EPICS = ../../../.. -include Target.include -include $(EPICS)/config/CONFIG_BASE +TOP = ../../.. +include $(TOP)/src/config/CONFIG_BASE INC += drvTS.h INC += drvSup.h @@ -22,4 +21,5 @@ INC += recGbl.h INC += dbBkpt.h INC += devLib.h -include $(EPICS)/config/RULES.Unix +include $(TOP)/src/config/RULES.Unix + diff --git a/src/db/Makefile.Vx b/src/db/Makefile.Vx index 7502ea6c0e..45336ff2bd 100644 --- a/src/db/Makefile.Vx +++ b/src/db/Makefile.Vx @@ -1,6 +1,5 @@ -EPICS = ../../../.. -include Target.include -include $(EPICS)/config/CONFIG_BASE +TOP = ../../.. +include $(TOP)/src/config/CONFIG_BASE USR_CFLAGS = -ansi VX_WARN_YES = -Wall -pedantic @@ -72,15 +71,9 @@ PROD = initHooks.o LIBNAME = dbLib -include $(EPICS)/config/RULES.Vx +include $(TOP)/src/config/RULES.Vx -dbCommon.h: ../dbCommonRecord.dbd dbCommon.dbd +dbCommon.h: ../dbCommonRecord.dbd ../dbCommon.dbd $(RM) $@ - $(EPICS_BASE)/bin/$(HOST_ARCH)/dbToRecordtypeH \ - $(USER_DBDFLAGS) $< + $(DB_TO_RECTYPE_H) $(USER_DBDFLAGS) $< -dbCommon.dbd: ../dbCommon.dbd - @test -f $@ || ln -s $< $@ - -clean:: - @$(RM) dbCommon.dbd rec base diff --git a/src/dbStatic/Makefile b/src/dbStatic/Makefile index 5ab776fa92..df578963db 100644 --- a/src/dbStatic/Makefile +++ b/src/dbStatic/Makefile @@ -5,14 +5,17 @@ # 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 # # -EPICS=../../.. +TOP=../.. -include $(EPICS)/config/CONFIG_BASE +include $(TOP)/src/config/CONFIG_BASE -include $(EPICS)/config/RULES_ARCHS +include $(TOP)/src/config/RULES_ARCHS diff --git a/src/dbStatic/Makefile.Unix b/src/dbStatic/Makefile.Unix index 50801c240c..ab2ef1f4a1 100755 --- a/src/dbStatic/Makefile.Unix +++ b/src/dbStatic/Makefile.Unix @@ -1,6 +1,5 @@ -EPICS = ../../../.. -include Target.include -include $(EPICS)/config/CONFIG_BASE +TOP = ../../.. +include $(TOP)/src/config/CONFIG_BASE USR_LDLIBS = -lDb -lCom -lm USR_LDFLAGS = -L. @@ -9,7 +8,7 @@ USR_LDFLAGS = -L. #CC = $(PURIFYHOME)/purify $(C_$(CMPLR)) -DEPLIBS_BASE = $(EPICS_BASE_LIB) +DEPLIBS_BASE = $(INSTALL_LIB) DEPLIBS = ./libDb.a\ $(DEPLIBS_BASE)/libCom.a @@ -47,7 +46,7 @@ PROD = \ dbToMenuH\ dbToRecordtypeH -include $(EPICS)/config/RULES.Unix +include $(TOP)/src/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 a663c73461..0440c07de8 100644 --- a/src/dbStatic/Makefile.Vx +++ b/src/dbStatic/Makefile.Vx @@ -1,7 +1,5 @@ -EPICS = ../../../.. -include Target.include -include $(EPICS)/config/CONFIG_BASE - +TOP = ../../.. +include $(TOP)/src/config/CONFIG_BASE USR_CFLAGS = -ansi VX_WARN_YES = -Wall -pedantic @@ -20,7 +18,7 @@ OBJSdbLib = \ PROD = dbStaticLib -include $(EPICS)/config/RULES.Vx +include $(TOP)/src/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 62888d5349..eddc5022cd 100644 --- a/src/dbtools/Makefile +++ b/src/dbtools/Makefile @@ -5,11 +5,14 @@ # by Janet Anderson # # $Log$ +# Revision 1.1 1994/09/07 19:26:04 jba +# New file +# # -EPICS=../../.. +TOP=../.. -include $(EPICS)/config/CONFIG_BASE +include $(TOP)/src/config/CONFIG_BASE -include $(EPICS)/config/RULES_ARCHS +include $(TOP)/src/config/RULES_ARCHS diff --git a/src/dbtools/Makefile.Unix b/src/dbtools/Makefile.Unix index 8621b5166b..174a70fc07 100644 --- a/src/dbtools/Makefile.Unix +++ b/src/dbtools/Makefile.Unix @@ -1,6 +1,5 @@ -EPICS = ../../../.. -include Target.include -include $(EPICS)/config/CONFIG_BASE +TOP = ../../.. +include $(TOP)/src/config/CONFIG_BASE # USR_CFLAGS = -v @@ -25,7 +24,7 @@ MAN1 = dbLoadTemplate.1 subtool.1 MAN3 = dbLoadRecords.3 dbLoadTemplate.3 MAN5 = templatefile.5 dbfile.5 -include $(EPICS)/config/RULES.Unix +include $(TOP)/src/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 3e54291be4..9d1fba64a3 100644 --- a/src/dbtools/Makefile.Vx +++ b/src/dbtools/Makefile.Vx @@ -1,6 +1,5 @@ -EPICS = ../../../.. -include Target.include -include $(EPICS)/config/CONFIG_BASE +TOP = ../../.. +include $(TOP)/src/config/CONFIG_BASE YACCOPT = -l LEXOPT = -L @@ -16,7 +15,7 @@ MAN1 = dbLoadTemplate.1 subtool.1 MAN3 = dbLoadRecords.3 dbLoadTemplate.3 MAN5 = templatefile.5 dbfile.5 -include $(EPICS)/config/RULES.Vx +include $(TOP)/src/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 62888d5349..1cd45a6ed0 100644 --- a/src/dev/Makefile +++ b/src/dev/Makefile @@ -5,11 +5,14 @@ # by Janet Anderson # # $Log$ +# Revision 1.1 1994/09/07 19:26:11 jba +# New file +# # -EPICS=../../.. +TOP=../.. -include $(EPICS)/config/CONFIG_BASE +include $(TOP)/src/config/CONFIG_BASE -include $(EPICS)/config/RULES_ARCHS +include $(TOP)/src/config/RULES_ARCHS diff --git a/src/dev/Makefile.Vx b/src/dev/Makefile.Vx index 1621454be9..3160f2b9c3 100644 --- a/src/dev/Makefile.Vx +++ b/src/dev/Makefile.Vx @@ -1,6 +1,5 @@ -EPICS = ../../../.. -include Target.include -include $(EPICS)/config/CONFIG_BASE +TOP = ../../.. +include $(TOP)/src/config/CONFIG_BASE USR_INCLUDES = -I../../drv/ansi -I../../drv/old @@ -126,6 +125,6 @@ LIBOBJS = $(SRCS.c:../%.c=%.o) PROD = $(LIBOBJS) LIBNAME = devSup -include $(EPICS)/config/RULES.Vx +include $(TOP)/src/config/RULES.Vx diff --git a/src/devOpt/Makefile b/src/devOpt/Makefile index 62888d5349..bb26dca410 100644 --- a/src/devOpt/Makefile +++ b/src/devOpt/Makefile @@ -5,11 +5,14 @@ # by Janet Anderson # # $Log$ +# Revision 1.1 1994/09/07 19:26:13 jba +# New file +# # -EPICS=../../.. +TOP=../.. -include $(EPICS)/config/CONFIG_BASE +include $(TOP)/src/config/CONFIG_BASE -include $(EPICS)/config/RULES_ARCHS +include $(TOP)/src/config/RULES_ARCHS diff --git a/src/devOpt/Makefile.Vx b/src/devOpt/Makefile.Vx index f785de2a0d..4f65df07e7 100644 --- a/src/devOpt/Makefile.Vx +++ b/src/devOpt/Makefile.Vx @@ -1,6 +1,5 @@ -EPICS = ../../../.. -include Target.include -include $(EPICS)/config/CONFIG_BASE +TOP = ../../.. +include $(TOP)/src/config/CONFIG_BASE USR_INCLUDES = -I../../drv @@ -21,5 +20,6 @@ LIBNAME = devLibOpt PROD = $(LIBOBJS) -include $(EPICS)/config/RULES.Vx +include $(TOP)/src/config/RULES.Vx + diff --git a/src/drv/Makefile b/src/drv/Makefile index 73502a4cf2..b11cc4b458 100644 --- a/src/drv/Makefile +++ b/src/drv/Makefile @@ -2,11 +2,11 @@ # $Id$ # -EPICS=../../.. +TOP=../.. -include $(EPICS)/config/CONFIG_BASE +include $(TOP)/src/config/CONFIG_BASE DIRS = ansi old combine -include $(EPICS)/config/RULES_DIRS +include $(TOP)/src/config/RULES_DIRS diff --git a/src/drv/ansi/Makefile b/src/drv/ansi/Makefile index 76b94a7bf5..8b87ce2d33 100644 --- a/src/drv/ansi/Makefile +++ b/src/drv/ansi/Makefile @@ -4,9 +4,9 @@ # # -EPICS=../../../.. - -include $(EPICS)/config/CONFIG_BASE - -include $(EPICS)/config/RULES_ARCHS +TOP=../../.. + +include $(TOP)/src/config/CONFIG_BASE + +include $(TOP)/src/config/RULES_ARCHS diff --git a/src/drv/ansi/Makefile.Vx b/src/drv/ansi/Makefile.Vx index 01313387e8..2aab3f9bf2 100644 --- a/src/drv/ansi/Makefile.Vx +++ b/src/drv/ansi/Makefile.Vx @@ -2,9 +2,8 @@ # $Id$ # -EPICS = ../../../../.. -include Target.include -include $(EPICS)/config/CONFIG_BASE +TOP = ../../../.. +include $(TOP)/src/config/CONFIG_BASE USR_CFLAGS = -ansi @@ -37,5 +36,5 @@ TARGETS = $(SRCS.c:../%.c=%.o) MAN3 = drvEpvxi.3 -include $(EPICS)/config/RULES.Vx +include $(TOP)/src/config/RULES.Vx diff --git a/src/drv/old/Makefile b/src/drv/old/Makefile index 685f5d2fce..89ebf9830e 100644 --- a/src/drv/old/Makefile +++ b/src/drv/old/Makefile @@ -2,9 +2,9 @@ # $Id$ # -EPICS=../../../.. - -include $(EPICS)/config/CONFIG_BASE - -include $(EPICS)/config/RULES_ARCHS +TOP=../../.. + +include $(TOP)/src/config/CONFIG_BASE + +include $(TOP)/src/config/RULES_ARCHS diff --git a/src/drv/old/Makefile.Vx b/src/drv/old/Makefile.Vx index c642461ff5..3980cfb746 100644 --- a/src/drv/old/Makefile.Vx +++ b/src/drv/old/Makefile.Vx @@ -2,9 +2,8 @@ # $Id$ # -EPICS = ../../../../.. -include Target.include -include $(EPICS)/config/CONFIG_BASE +TOP = ../../../.. +include $(TOP)/src/config/CONFIG_BASE USR_CFLAGS = -fshared-data -fvolatile -mnobitfield -traditional @@ -42,5 +41,5 @@ SRCS.c += ../drvXy566.c TARGETS = $(SRCS.c:../%.c=%.o) -include $(EPICS)/config/RULES.Vx +include $(TOP)/src/config/RULES.Vx diff --git a/src/include/Makefile b/src/include/Makefile index 965d8fbe48..e6ff629c27 100644 --- a/src/include/Makefile +++ b/src/include/Makefile @@ -5,14 +5,17 @@ # 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 # # -EPICS=../../.. +TOP=../.. -include $(EPICS)/config/CONFIG_BASE +include $(TOP)/src/config/CONFIG_BASE -include $(EPICS)/config/RULES_ARCHS +include $(TOP)/src/config/RULES_ARCHS diff --git a/src/include/Makefile.Unix b/src/include/Makefile.Unix index 725509627d..ea2ffb4929 100755 --- a/src/include/Makefile.Unix +++ b/src/include/Makefile.Unix @@ -1,6 +1,5 @@ -EPICS = ../../../.. -include Target.include -include $(EPICS)/config/CONFIG_BASE +TOP = ../../.. +include $(TOP)/src/config/CONFIG_BASE INC += dbDefs.h INC += camacLib.h @@ -13,4 +12,5 @@ INC += createSoftLinks.sh INC += bsdProto.h INC += task_params.h -include $(EPICS)/config/RULES.Unix +include $(TOP)/src/config/RULES.Unix + diff --git a/src/iocCore/Makefile b/src/iocCore/Makefile index a7af5f5ef6..77ff807c73 100644 --- a/src/iocCore/Makefile +++ b/src/iocCore/Makefile @@ -5,11 +5,14 @@ # by Janet Anderson # # $Log$ +# Revision 1.1 1994/09/07 19:26:19 jba +# New file +# # -EPICS=../../.. +TOP=../.. -include $(EPICS)/config/CONFIG_BASE +include $(TOP)/src/config/CONFIG_BASE -include $(EPICS)/config/RULES_ARCHS +include $(TOP)/src/config/RULES_ARCHS diff --git a/src/iocCore/Makefile.Vx b/src/iocCore/Makefile.Vx index 28aa295e47..4bbe265ced 100644 --- a/src/iocCore/Makefile.Vx +++ b/src/iocCore/Makefile.Vx @@ -1,6 +1,5 @@ -EPICS = ../../../.. -include Target.include -include $(EPICS)/config/CONFIG_BASE +TOP = ../../.. +include $(TOP)/src/config/CONFIG_BASE LINK.c=$(LD) $(LDFLAGS) @@ -21,7 +20,7 @@ IOC_CORE_OBJS = \ PROD = iocCore vxWorks vxWorks.sym -include $(EPICS)/config/RULES.Vx +include $(TOP)/src/config/RULES.Vx vxWorks: $(VX_IMAGE) @$(RM) $@ diff --git a/src/libCom/Makefile b/src/libCom/Makefile index 2e96b4dcea..f6be7ce5ef 100644 --- a/src/libCom/Makefile +++ b/src/libCom/Makefile @@ -5,11 +5,14 @@ # by Janet Anderson # # $Log$ +# Revision 1.1 1994/09/07 19:26:22 jba +# New file +# # -EPICS=../../.. +TOP=../.. -include $(EPICS)/config/CONFIG_BASE +include $(TOP)/src/config/CONFIG_BASE -include $(EPICS)/config/RULES_ARCHS +include $(TOP)/src/config/RULES_ARCHS diff --git a/src/libCom/Makefile.Unix b/src/libCom/Makefile.Unix index fd2d8b3af4..b8b918666c 100644 --- a/src/libCom/Makefile.Unix +++ b/src/libCom/Makefile.Unix @@ -1,6 +1,5 @@ -EPICS = ../../../.. -include Target.include -include $(EPICS)/config/CONFIG_BASE +TOP = ../../.. +include $(TOP)/src/config/CONFIG_BASE USR_CFLAGS = -D_NO_PROTO @@ -69,21 +68,18 @@ LIBNAME = libCom.a MAN3 = gpHash.3 freeList.3 -include $(EPICS)/config/RULES.Unix +include $(TOP)/src/config/RULES.Unix errSymTbl.o: errSymTbl.c errInc.o $(COMPILE.c) -o $@ $< -errSymTbl.c errInc.o: errInc.c +errSymTbl.c errInc.o: ../errInc.c @$(RM) errInc.o - @../blderrSymTbl $(EPICS) $(HOST_ARCH) "$(MAKE)" + @../blderrSymTbl $(TOP) $(HOST_ARCH) "$(MAKE)" -envData.c: ../envDefs.h $(EPICS)/config/CONFIG_ENV \ - $(EPICS)/config/CONFIG_SITE_ENV - ../bldEnvData $(EPICS) - -pre_build: - @test -f errInc.c || ln -s ../errInc.c errInc.c +envData.c: ../envDefs.h $(TOP)/src/config/CONFIG_ENV \ + $(TOP)/src/config/CONFIG_SITE_ENV + ../bldEnvData $(TOP)/src/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 cb6cbae645..2e82d5d3d6 100644 --- a/src/libCom/Makefile.Vx +++ b/src/libCom/Makefile.Vx @@ -1,6 +1,5 @@ -EPICS = ../../../.. -include Target.include -include $(EPICS)/config/CONFIG_BASE +TOP = ../../.. +include $(TOP)/src/config/CONFIG_BASE SRCS.c += ../calcPerform.c SRCS.c += ../cvtFast.c @@ -43,21 +42,18 @@ LIBNAME = libCom MAN3 = gpHash.3 freeList.3 -include $(EPICS)/config/RULES.Vx +include $(TOP)/src/config/RULES.Vx clean:: - @$(RM) errInc.c errSymTbl.c envData.c + @$(RM) errSymTbl.c envData.c build: errSymTbl.o errInc.o -errSymTbl.c errInc.o: errInc.c +errSymTbl.c errInc.o: ../errInc.c @$(RM) errInc.o - ../blderrSymTbl $(EPICS) $(HOST_ARCH) "$(MAKE)" + ../blderrSymTbl $(TOP) $(HOST_ARCH) "$(MAKE)" -envData.c: $(EPICS_BASE)/include/envDefs.h $(EPICS)/config/CONFIG_ENV \ - $(EPICS)/config/CONFIG_SITE_ENV - ../bldEnvData $(EPICS) - -pre_build: - @test -f errInc.c || ln -s ../errInc.c errInc.c +envData.c: ../envDefs.h $(TOP)/src/config/CONFIG_ENV \ + $(TOP)/src/config/CONFIG_SITE_ENV + ../bldEnvData $(TOP)/src/config diff --git a/src/libCom/bldEnvData b/src/libCom/bldEnvData index 1a3358967c..27dc973a46 100755 --- a/src/libCom/bldEnvData +++ b/src/libCom/bldEnvData @@ -7,6 +7,9 @@ # Experimental Physics and Industrial Control System (EPICS) # # $Log$ +# Revision 1.3 1996/05/10 16:10:18 mrk +# remove hard path to base/include +# # Revision 1.2 1995/09/29 22:16:27 jhill # ms windows changes # @@ -30,11 +33,11 @@ HERE=`/bin/pwd` cd $1 -EPICS=`/bin/pwd` +CONFIG_DIR=`/bin/pwd` cd ${HERE} SRC=../envDefs.h -ENV_DATA=${EPICS}/config/CONFIG_ENV -SITE_DATA=${EPICS}/config/CONFIG_SITE_ENV +ENV_DATA=${CONFIG_DIR}/CONFIG_ENV +SITE_DATA=${CONFIG_DIR}/CONFIG_SITE_ENV OBJ=envData.c TOOL=`basename $0` diff --git a/src/libCom/blderrSymTbl b/src/libCom/blderrSymTbl index 247966bf5f..9c1ff38ae3 100755 --- a/src/libCom/blderrSymTbl +++ b/src/libCom/blderrSymTbl @@ -34,7 +34,7 @@ # ... # -# tool to rebuild errSymTbl.c when errInc.c or it's depends change +# tool to rebuild errSymTbl.c when ../errInc.c or it's depends change # Usage blderrSymTbl EPICS HOST_ARCH MAKE VXLIST - IOC and commmon # Usage blderrSymTbl EPICS HOST_ARCH MAKE - just common @@ -48,10 +48,10 @@ if [ -z "$2" ]; then exit 1 fi -EPICS=$1 +TOP=$1 MAKE=$2 -INCLUDE=${EPICS}/config/CONFIG_BASE +INCLUDE=${TOP}/src/config/CONFIG_BASE if [ -z "$4" ]; then OPTS="" @@ -64,7 +64,7 @@ PID=$$ # Construct temporary makefile cat - < /tmp/Makefile.tmp.$$ -EPICS=$EPICS +TOP=$TOP include ${INCLUDE} @@ -91,11 +91,11 @@ fi TMPMAKEFILE=/tmp/tmpmakefile SFILES=/tmp/sfiles -EPICS=$1 +TOP=$1 HOST_ARCH=$2 MAKE=$3 -SRC=$EPICS/base/src -INCLUDEH="-I$SRC/include -I$SRC/as -I$SRC/ca -I$SRC/db -I$SRC/libCom\ +SRC=$TOP/src +INCLUDEH="-I$SRC/include -I$SRC/as -I$SRC/ca -I$SRC/db -I..\ -I$SRC/drv/old -I$SRC/drv/ansi -I$SRC/dbStatic -I$SRC/bpt -I$SRC/dev" case $HOST_ARCH in @@ -105,13 +105,13 @@ case $HOST_ARCH in GCC=`which gcc` if [ -x "$GCC" ]; then FILES=`"$GCC" -M -D$DEF $INCLUDEH \ - errInc.c 2>/dev/null \ + ../errInc.c 2>/dev/null \ | sed -e 's/errInc\.o.*: errInc\.c//' -e 's/\\\//'` else MAKEDEPEND=`which makedepend` if [ -x "$MAKEDEPEND" ]; then FILES=`"$MAKEDEPEND" -f- -D$DEF $INCLUDEH \ - errInc.c 2>/dev/null | sed -e 's/errInc.o://' -e 's/\\\//'` + ../errInc.c 2>/dev/null | sed -e 's/errInc.o://' -e 's/\\\//'` else echo Neither GCC or MAKEDEPEND found. exit 1 @@ -122,8 +122,8 @@ case $HOST_ARCH in # use -xM option of ACC to list dependencies #CC=`$EPICS/base/bin/$HOST_ARCH/GetVar $EPICS $MAKE ACC $HOST_ARCH` - CC=`GetVar $EPICS $MAKE ACC $HOST_ARCH` - FILES=`$CC -xM -D$DEF $INCLUDEH errInc.c \ + CC=`GetVar $TOP $MAKE ACC $HOST_ARCH` + FILES=`$CC -xM -D$DEF $INCLUDEH ../errInc.c \ | grep "errInc.o" | grep -v "errInc.c" \ | sed -e 's/errInc\.o://'` ;; @@ -148,7 +148,7 @@ grep "^#define[ ]*S_" $FILES /dev/null \ # create a tmpmakefile cat $SFILES | (awk ' -BEGIN {print "errInc.o : errInc.c \\"} +BEGIN {print "errInc.o : ../errInc.c \\"} {print " "$0" \\" } END {print " ../errMdef.h"} diff --git a/src/libCompat/Makefile b/src/libCompat/Makefile index 62888d5349..3808af369d 100644 --- a/src/libCompat/Makefile +++ b/src/libCompat/Makefile @@ -5,11 +5,14 @@ # by Janet Anderson # # $Log$ +# Revision 1.1 1994/09/07 19:26:24 jba +# New file +# # -EPICS=../../.. +TOP=../.. -include $(EPICS)/config/CONFIG_BASE +include $(TOP)/src/config/CONFIG_BASE -include $(EPICS)/config/RULES_ARCHS +include $(TOP)/src/config/RULES_ARCHS diff --git a/src/libvxWorks/Makefile b/src/libvxWorks/Makefile index 62888d5349..3d534aaece 100644 --- a/src/libvxWorks/Makefile +++ b/src/libvxWorks/Makefile @@ -5,11 +5,14 @@ # by Janet Anderson # # $Log$ +# Revision 1.1 1994/09/07 19:26:26 jba +# New file +# # -EPICS=../../.. +TOP=../.. -include $(EPICS)/config/CONFIG_BASE +include $(TOP)/src/config/CONFIG_BASE -include $(EPICS)/config/RULES_ARCHS +include $(TOP)/src/config/RULES_ARCHS diff --git a/src/libvxWorks/Makefile.Vx b/src/libvxWorks/Makefile.Vx index 1a58981f6f..8cbf49ebc2 100644 --- a/src/libvxWorks/Makefile.Vx +++ b/src/libvxWorks/Makefile.Vx @@ -1,7 +1,5 @@ -EPICS = ../../../.. -include Target.include -include $(EPICS)/config/CONFIG_BASE - +TOP = ../../.. +include $(TOP)/src/config/CONFIG_BASE SRCS.c = ../iocLogClient.c ../veclist.c ../ldpp.c @@ -10,5 +8,5 @@ LIBOBJS = veclist.o iocLogClient.o ldpp.o LIBNAME = vxComLib SCRIPTS = vxldscript.MRI -include $(EPICS)/config/RULES.Vx +include $(TOP)/src/config/RULES.Vx diff --git a/src/misc/Makefile b/src/misc/Makefile index 62888d5349..febe19ce53 100644 --- a/src/misc/Makefile +++ b/src/misc/Makefile @@ -5,11 +5,14 @@ # by Janet Anderson # # $Log$ +# Revision 1.1 1994/09/07 19:26:29 jba +# New file +# # -EPICS=../../.. +TOP=../.. -include $(EPICS)/config/CONFIG_BASE +include $(TOP)/src/config/CONFIG_BASE -include $(EPICS)/config/RULES_ARCHS +include $(TOP)/src/config/RULES_ARCHS diff --git a/src/misc/Makefile.Vx b/src/misc/Makefile.Vx index 182edfa1cf..e808c89b8e 100644 --- a/src/misc/Makefile.Vx +++ b/src/misc/Makefile.Vx @@ -1,6 +1,5 @@ -EPICS = ../../../.. -include Target.include -include $(EPICS)/config/CONFIG_BASE +TOP = ../../.. +include $(TOP)/src/config/CONFIG_BASE SRCS.c = ../epicsRelease.c @@ -8,5 +7,6 @@ LIBOBJS = epicsRelease.o LIBNAME = miscLib -include $(EPICS)/config/RULES.Vx +include $(TOP)/src/config/RULES.Vx + diff --git a/src/rec/Makefile b/src/rec/Makefile index 62888d5349..ce4fdb9b31 100644 --- a/src/rec/Makefile +++ b/src/rec/Makefile @@ -5,11 +5,14 @@ # by Janet Anderson # # $Log$ +# Revision 1.1 1994/09/07 19:26:32 jba +# New file +# # -EPICS=../../.. +TOP=../.. -include $(EPICS)/config/CONFIG_BASE +include $(TOP)/src/config/CONFIG_BASE -include $(EPICS)/config/RULES_ARCHS +include $(TOP)/src/config/RULES_ARCHS diff --git a/src/rec/Makefile.Vx b/src/rec/Makefile.Vx index 997aa6e3e0..de855742cb 100644 --- a/src/rec/Makefile.Vx +++ b/src/rec/Makefile.Vx @@ -1,6 +1,5 @@ -EPICS = ../../../.. -include Target.include -include $(EPICS)/config/CONFIG_BASE +TOP = ../../.. +include $(TOP)/src/config/CONFIG_BASE USR_INCLUDES = -I../drv/ansi -I../../drv/old @@ -103,5 +102,5 @@ PROD = $(LIBOBJS) LIBNAME = recSup -include $(EPICS)/config/RULES.Vx +include $(TOP)/src/config/RULES.Vx diff --git a/src/rsrv/Makefile b/src/rsrv/Makefile index 62888d5349..080b6a2b29 100644 --- a/src/rsrv/Makefile +++ b/src/rsrv/Makefile @@ -5,11 +5,14 @@ # by Janet Anderson # # $Log$ +# Revision 1.1 1994/09/07 19:26:34 jba +# New file +# # -EPICS=../../.. +TOP=../.. -include $(EPICS)/config/CONFIG_BASE +include $(TOP)/src/config/CONFIG_BASE -include $(EPICS)/config/RULES_ARCHS +include $(TOP)/src/config/RULES_ARCHS diff --git a/src/rsrv/Makefile.Vx b/src/rsrv/Makefile.Vx index 9aeade75f9..fad7655de4 100644 --- a/src/rsrv/Makefile.Vx +++ b/src/rsrv/Makefile.Vx @@ -1,7 +1,5 @@ - -EPICS = ../../../.. -include Target.include -include $(EPICS)/config/CONFIG_BASE +TOP = ../../.. +include $(TOP)/src/config/CONFIG_BASE USR_INCLUDES = -I../../ca USR_CFLAGS = -UUNIX @@ -17,7 +15,7 @@ OBJS = \ PROD = rsrvLib -include $(EPICS)/config/RULES.Vx +include $(TOP)/src/config/RULES.Vx rsrvLib: $(OBJS) $(RM) $@ diff --git a/src/sequencer/Makefile b/src/sequencer/Makefile index adc7b674af..c91f4892fa 100644 --- a/src/sequencer/Makefile +++ b/src/sequencer/Makefile @@ -13,9 +13,9 @@ # # -EPICS=../../.. +TOP=../.. -include $(EPICS)/config/CONFIG_BASE +include $(TOP)/src/config/CONFIG_BASE -include $(EPICS)/config/RULES_ARCHS +include $(TOP)/src/config/RULES_ARCHS diff --git a/src/sequencer/Makefile.Unix b/src/sequencer/Makefile.Unix index 19aba1bb20..14abfea8a4 100644 --- a/src/sequencer/Makefile.Unix +++ b/src/sequencer/Makefile.Unix @@ -1,7 +1,5 @@ -EPICS = ../../../.. -include Target.include -include $(EPICS)/config/CONFIG_BASE - +TOP = ../../.. +include $(TOP)/src/config/CONFIG_BASE #YACCOPT = -l #LEXOPT = -L @@ -21,7 +19,7 @@ OBJS = snc_main.o parse.o phase2.o gen_ss_code.o \ PROD = snc -include $(EPICS)/config/RULES.Unix +include $(TOP)/src/config/RULES.Unix # # The generated lex file includes snc.h diff --git a/src/sequencer/Makefile.Vx b/src/sequencer/Makefile.Vx index 3cd1dec1d4..a9b118792f 100644 --- a/src/sequencer/Makefile.Vx +++ b/src/sequencer/Makefile.Vx @@ -1,6 +1,5 @@ -EPICS = ../../../.. -include Target.include -include $(EPICS)/config/CONFIG_BASE +TOP = ../../.. +include $(TOP)/src/config/CONFIG_BASE USR_CFLAGS = @@ -14,7 +13,7 @@ OBJS = \ PROD = seq -include $(EPICS)/config/RULES.Vx +include $(TOP)/src/config/RULES.Vx clean:: @$(RM) seqVersion.c diff --git a/src/tools/Makefile b/src/tools/Makefile index 977081d2dd..7c87694373 100644 --- a/src/tools/Makefile +++ b/src/tools/Makefile @@ -5,14 +5,17 @@ # 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 # # -EPICS=../../.. +TOP=../.. -include $(EPICS)/config/CONFIG_BASE +include $(TOP)/src/config/CONFIG_BASE -include $(EPICS)/config/RULES_ARCHS +include $(TOP)/src/config/RULES_ARCHS diff --git a/src/tools/Makefile.Unix b/src/tools/Makefile.Unix index 0b582e8274..ece52fdd3a 100644 --- a/src/tools/Makefile.Unix +++ b/src/tools/Makefile.Unix @@ -1,11 +1,10 @@ -EPICS = ../../../.. -include Target.include -include $(EPICS)/config/CONFIG_BASE +TOP = ../../.. +include $(TOP)/src/config/CONFIG_BASE PROD = installEpics SCRIPTS = InstallVersion getrel -include $(EPICS)/config/RULES.Unix +include $(TOP)/src/config/RULES.Unix $(INSTALL_BIN)/installEpics: installEpics @echo "Installing $@" diff --git a/src/tools/getrel b/src/tools/getrel index 6baeb1b101..f0b9f6d3b2 100755 --- a/src/tools/getrel +++ b/src/tools/getrel @@ -4,56 +4,13 @@ # # Author: Matthew Needes # -# $Log$ -# Revision 1.1 1996/02/20 20:58:42 jba -# Moved tools to src/tools dir. base/tools dir removed. -# -# Revision 1.13 1996/01/25 21:03:20 mrk -# Changes for new all ascii database definitions -# -# Revision 1.12 1995/08/18 15:26:05 jba -# Added pathname to GetVar -# -# Revision 1.11 1995/08/17 20:35:20 jba -# EPICS added on calls to GetVar -# -# Revision 1.10 1995/04/26 16:20:35 jba -# Added date to .current_rel_hist file output -# -# Revision 1.9 1995/03/30 23:16:07 jba -# Changed example comment -# -# Revision 1.8 1994/09/15 22:06:36 mcn -# Removed -h from test flags. -# -# Revision 1.7 1994/09/07 20:59:17 mcn -# Revamped GetVar, modified scripts for new GetVar. -# -# Revision 1.6 1994/09/07 19:08:52 jba -# Modified to work with extensions and do depends -# -# Revision 1.5 1994/08/21 00:56:43 mcn -# New Stuff -# -# Revision 1.4 1994/08/16 17:20:45 mcn -# exported variable -# -# Revision 1.3 1994/08/16 16:12:19 mcn -# Added GetVar, made use of 'ln' compatible with SYSV Unix. -# -# Revision 1.2 1994/08/02 18:36:30 mcn -# Support new configuration. -# -# Revision 1.1 1994/07/14 16:17:36 mcn -# Modified to support structure of base, made more intelligent (mcn) -# USAGE="Usage: getrel -ex: getrel /usr/local/epics/R3.12 +ex: getrel /usr/local/epics/base_R3.13 --------- OR ----------- - getrel ~/epics + getrel ~/epics/base " @@ -66,15 +23,14 @@ $USAGE exit fi -EPICS=${1} -BASE=${1}/base +BASE=${1} if [ ! -d ${BASE}/bin -o \ - ! -d ${BASE}/db ]; then + ! -d ${BASE}/dbd ]; then cat <<-!usage $USAGE - ${EPICS} does not appear to be an EPICS root tree... + ${BASE} does not appear to be an epics BASE root tree... !usage exit 1 @@ -89,10 +45,10 @@ fi vxWorks* \ vw -ln -s ${EPICS} epics +ln -s ${BASE} base touch .current_rel_hist -echo ${EPICS} - `date` >> .current_rel_hist +echo ${BASE} - `date` >> .current_rel_hist exit 0 diff --git a/src/toolsComm/antelope/Makefile b/src/toolsComm/antelope/Makefile index 1b77c7cfa1..006a552f2c 100644 --- a/src/toolsComm/antelope/Makefile +++ b/src/toolsComm/antelope/Makefile @@ -5,11 +5,14 @@ # by Janet Anderson # # $Log$ +# Revision 1.1 1994/09/07 19:26:39 jba +# New file +# # -EPICS=../../../.. - -include $(EPICS)/config/CONFIG_BASE - -include $(EPICS)/config/RULES_ARCHS +TOP=../../.. + +include $(TOP)/src/config/CONFIG_BASE + +include $(TOP)/src/config/RULES_ARCHS diff --git a/src/toolsComm/antelope/Makefile.Unix b/src/toolsComm/antelope/Makefile.Unix index 3f8972b6af..21ead2a3f7 100644 --- a/src/toolsComm/antelope/Makefile.Unix +++ b/src/toolsComm/antelope/Makefile.Unix @@ -1,6 +1,5 @@ -EPICS = ../../../../.. -include Target.include -include $(EPICS)/config/CONFIG_BASE +TOP = ../../../.. +include $(TOP)/src/config/CONFIG_BASE USR_LDLIBS = -lm -s USR_CFLAGS = -D_NO_PROTO @@ -16,7 +15,7 @@ OBJS = \ PROD = antelope -include $(EPICS)/config/RULES.Unix +include $(TOP)/src/config/RULES.Unix $(PROD): $(OBJS) $(LINK.c) -o $@ $(OBJS) $(LDLIBS) diff --git a/src/toolsComm/flex/Makefile b/src/toolsComm/flex/Makefile index 1b77c7cfa1..3599a6def7 100644 --- a/src/toolsComm/flex/Makefile +++ b/src/toolsComm/flex/Makefile @@ -5,11 +5,14 @@ # by Janet Anderson # # $Log$ +# Revision 1.1 1994/09/07 19:26:43 jba +# New file +# # -EPICS=../../../.. - -include $(EPICS)/config/CONFIG_BASE - -include $(EPICS)/config/RULES_ARCHS +TOP=../../.. + +include $(TOP)/src/config/CONFIG_BASE + +include $(TOP)/src/config/RULES_ARCHS diff --git a/src/toolsComm/flex/Makefile.Unix b/src/toolsComm/flex/Makefile.Unix index 7a68e9a274..5b3c0f2468 100644 --- a/src/toolsComm/flex/Makefile.Unix +++ b/src/toolsComm/flex/Makefile.Unix @@ -1,7 +1,6 @@ -EPICS = ../../../../.. -include Target.include -include $(EPICS)/config/CONFIG_BASE - +TOP = ../../../.. +include $(TOP)/src/config/CONFIG_BASE + #CMPLR = STRICT YACC = $(EYACC) @@ -28,7 +27,7 @@ OBJS = \ PROD = e_flex -include $(EPICS)/config/RULES.Unix +include $(TOP)/src/config/RULES.Unix $(PROD): $(OBJS) $(LINK.c) -o $@ $(OBJS) $(LDLIBS) diff --git a/src/util/Makefile b/src/util/Makefile index 62888d5349..6066aa8e11 100644 --- a/src/util/Makefile +++ b/src/util/Makefile @@ -5,11 +5,14 @@ # by Janet Anderson # # $Log$ +# Revision 1.1 1994/09/07 19:26:45 jba +# New file +# # -EPICS=../../.. +TOP=../.. -include $(EPICS)/config/CONFIG_BASE +include $(TOP)/src/config/CONFIG_BASE -include $(EPICS)/config/RULES_ARCHS +include $(TOP)/src/config/RULES_ARCHS diff --git a/src/util/Makefile.Unix b/src/util/Makefile.Unix index a74f32ee7d..1bf4a1675c 100644 --- a/src/util/Makefile.Unix +++ b/src/util/Makefile.Unix @@ -1,9 +1,8 @@ -EPICS = ../../../.. -include Target.include -include $(EPICS)/config/CONFIG_BASE +TOP = ../../.. +include $(TOP)/src/config/CONFIG_BASE USR_LDLIBS = -lca -lCom -lm -DEPLIBS = $(EPICS_BASE_LIB)/libca.a $(EPICS_BASE_LIB)/libCom.a +DEPLIBS = $(INSTALL_LIB)/libca.a $(INSTALL_LIB)/libCom.a SRCS.c = \ ../ca_test.c \ @@ -26,10 +25,10 @@ PROD += S99logServer PROD += S99caRepeater endif -include $(EPICS)/config/RULES.Unix +include $(TOP)/src/config/RULES.Unix S99%: ../rc2.% - @/usr/bin/sed -e s%:EPICS:%`chdir $(EPICS); /usr/bin/pwd`% \ + @/usr/bin/sed -e s%:EPICS:%`chdir $(TOP); /usr/bin/pwd`% \ -e s%:INSTALL_BIN:%`chdir $(INSTALL_BIN); /usr/bin/pwd`% \ $< >$@ diff --git a/src/util/Makefile.Vx b/src/util/Makefile.Vx index 4977bd3862..099691fa0d 100644 --- a/src/util/Makefile.Vx +++ b/src/util/Makefile.Vx @@ -1,10 +1,9 @@ -EPICS = ../../../.. -include Target.include -include $(EPICS)/config/CONFIG_BASE +TOP = ../../.. +include $(TOP)/src/config/CONFIG_BASE SRCS.c = ../ca_test.c TARGETS = ca_test.o -include $(EPICS)/config/RULES.Vx +include $(TOP)/src/config/RULES.Vx