From 31533ba62e2f00d595f85166671464f2db15ebe5 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Thu, 16 Dec 2010 17:05:05 -0500 Subject: [PATCH] Fixup Makefiles Adjust TOP and paths --- src/Makefile | 92 +++++++++---------- src/ca/client/Makefile | 2 +- src/ca/client/perl/Makefile | 2 +- src/ca/client/tools/Makefile | 2 +- src/ca/legacy/gdd/Makefile | 2 +- src/ca/legacy/pcas/Makefile | 2 +- src/ca/legacy/pcas/build/Makefile | 6 +- src/ca/legacy/pcas/ex/Makefile | 4 +- src/ca/legacy/pcas/example/Makefile | 2 +- .../pcas/example/directoryService/Makefile | 2 +- src/ioc/as/Makefile | 2 +- src/ioc/bpt/Makefile | 2 +- src/ioc/db/Makefile | 2 +- src/ioc/db/test/Makefile | 2 +- src/ioc/dbStatic/Makefile | 2 +- src/ioc/dbtemplate/Makefile | 2 +- src/ioc/misc/Makefile | 2 +- src/ioc/registry/Makefile | 2 +- src/ioc/rsrv/Makefile | 4 +- src/libCom/Makefile | 16 ++-- src/libCom/RTEMS/Makefile | 2 +- src/libCom/tools/Makefile | 2 +- src/libCom/tools/antelope/Makefile | 2 +- src/libCom/tools/flex/Makefile | 2 +- src/std/rec/Makefile | 2 +- src/std/softIoc/Makefile | 2 +- src/template/base/Makefile | 2 +- src/template/ext/Makefile | 2 +- 28 files changed, 84 insertions(+), 84 deletions(-) diff --git a/src/Makefile b/src/Makefile index 66b959101..871d4cce0 100644 --- a/src/Makefile +++ b/src/Makefile @@ -15,80 +15,80 @@ include $(TOP)/configure/CONFIG DIRS += tools -DIRS += makeBaseApp -makeBaseApp_DEPEND_DIRS = tools +DIRS += template/base +template/base_DEPEND_DIRS = tools -DIRS += makeBaseExt -makeBaseExt_DEPEND_DIRS = tools +DIRS += template/ext +template/ext_DEPEND_DIRS = tools DIRS += libCom libCom_DEPEND_DIRS = tools -DIRS += toolsComm -toolsComm_DEPEND_DIRS = libCom +DIRS += libCom/tools +libCom/tools_DEPEND_DIRS = libCom -DIRS += ca -ca_DEPEND_DIRS = libCom +DIRS += ca/client +ca/client_DEPEND_DIRS = libCom -DIRS += dbStatic -dbStatic_DEPEND_DIRS = toolsComm +DIRS += ioc/dbStatic +ioc/dbStatic_DEPEND_DIRS = libCom/tools -DIRS += registry -registry_DEPEND_DIRS = dbStatic +DIRS += ioc/registry +ioc/registry_DEPEND_DIRS = ioc/dbStatic -DIRS += bpt -bpt_DEPEND_DIRS = dbStatic +DIRS += ioc/bpt +ioc/bpt_DEPEND_DIRS = ioc/dbStatic -DIRS += db -db_DEPEND_DIRS = bpt ca +DIRS += ioc/db +ioc/db_DEPEND_DIRS = ioc/bpt ca/client -DIRS += as -as_DEPEND_DIRS = db +DIRS += ioc/as +ioc/as_DEPEND_DIRS = ioc/db DIRS += util -util_DEPEND_DIRS = ca +util_DEPEND_DIRS = ca/client -DIRS += dbtools -dbtools_DEPEND_DIRS = db +DIRS += ioc/dbtemplate +ioc/dbtemplate_DEPEND_DIRS = ioc/db -DIRS += catools -catools_DEPEND_DIRS = ca dbStatic +DIRS += ca/client/tools +ca/client/tools_DEPEND_DIRS = ca/client ioc/dbStatic -DIRS += rsrv -rsrv_DEPEND_DIRS = as +DIRS += ioc/rsrv +ioc/rsrv_DEPEND_DIRS = ioc/as -DIRS += rec -rec_DEPEND_DIRS = as registry +DIRS += std/rec +std/rec_DEPEND_DIRS = ioc/as ioc/registry -DIRS += misc -misc_DEPEND_DIRS = dbtools rsrv rec +DIRS += ioc/misc +ioc/misc_DEPEND_DIRS = ioc/dbtemplate ioc/rsrv std/rec -DIRS += dev -dev_DEPEND_DIRS = rec misc +DIRS += std/dev +std/dev_DEPEND_DIRS = std/rec ioc/misc -DIRS += RTEMS -RTEMS_DEPEND_DIRS = libCom +DIRS += libCom/RTEMS +libCom/RTEMS_DEPEND_DIRS = libCom DIRS += libCom/test -libCom/test_DEPEND_DIRS = ca RTEMS +libCom/test_DEPEND_DIRS = ca/client libCom/RTEMS -DIRS += db/test -db/test_DEPEND_DIRS = db RTEMS +DIRS += ioc/db/test +ioc/db/test_DEPEND_DIRS = ioc/db libCom/RTEMS -DIRS += softIoc -softIoc_DEPEND_DIRS = dev dbtools RTEMS +DIRS += std/softIoc +std/softIoc_DEPEND_DIRS = std/dev ioc/dbtemplate libCom/RTEMS -DIRS += gdd -gdd_DEPEND_DIRS = ca +DIRS += ca/legacy/gdd +ca/legacy/gdd_DEPEND_DIRS = ca/client -DIRS += cas -cas_DEPEND_DIRS = gdd dbStatic +DIRS += ca/legacy/pcas +ca/legacy/pcas_DEPEND_DIRS = ca/legacy/gdd ioc/dbStatic -DIRS += excas -excas_DEPEND_DIRS = cas as registry +DIRS += ca/legacy/pcas/ex +ca/legacy/pcas/ex_DEPEND_DIRS = ca/legacy/pcas ioc/as ioc/registry -DIRS += cap5 -cap5_DEPEND_DIRS = ca dbStatic +DIRS += ca/client/perl +ca/client/perl_DEPEND_DIRS = ca/client ioc/dbStatic include $(TOP)/configure/RULES_DIRS diff --git a/src/ca/client/Makefile b/src/ca/client/Makefile index ffbfa2bef..612209396 100644 --- a/src/ca/client/Makefile +++ b/src/ca/client/Makefile @@ -7,7 +7,7 @@ # in file LICENSE that is included with this distribution. #************************************************************************* -TOP=../.. +TOP=../../.. include $(TOP)/configure/CONFIG diff --git a/src/ca/client/perl/Makefile b/src/ca/client/perl/Makefile index 05f3de1e3..55693763d 100644 --- a/src/ca/client/perl/Makefile +++ b/src/ca/client/perl/Makefile @@ -5,7 +5,7 @@ # in file LICENSE that is included with this distribution. #************************************************************************* -TOP=../.. +TOP=../../../.. include $(TOP)/configure/CONFIG diff --git a/src/ca/client/tools/Makefile b/src/ca/client/tools/Makefile index e7efd2be0..539e18e65 100644 --- a/src/ca/client/tools/Makefile +++ b/src/ca/client/tools/Makefile @@ -8,7 +8,7 @@ # EPICS BASE is distributed subject to a Software License Agreement found # in file LICENSE that is included with this distribution. #************************************************************************* -TOP=../.. +TOP=../../../.. include $(TOP)/configure/CONFIG diff --git a/src/ca/legacy/gdd/Makefile b/src/ca/legacy/gdd/Makefile index 7843f67b8..77d650424 100644 --- a/src/ca/legacy/gdd/Makefile +++ b/src/ca/legacy/gdd/Makefile @@ -7,7 +7,7 @@ # in file LICENSE that is included with this distribution. #************************************************************************* -TOP=../.. +TOP=../../../.. include $(TOP)/configure/CONFIG diff --git a/src/ca/legacy/pcas/Makefile b/src/ca/legacy/pcas/Makefile index e6fd6ea91..04884424e 100644 --- a/src/ca/legacy/pcas/Makefile +++ b/src/ca/legacy/pcas/Makefile @@ -7,7 +7,7 @@ # in file LICENSE that is included with this distribution. #************************************************************************* -TOP=../.. +TOP=../../../.. include $(TOP)/configure/CONFIG diff --git a/src/ca/legacy/pcas/build/Makefile b/src/ca/legacy/pcas/build/Makefile index ab4a14d99..296bc59ef 100644 --- a/src/ca/legacy/pcas/build/Makefile +++ b/src/ca/legacy/pcas/build/Makefile @@ -7,10 +7,10 @@ # and higher are distributed subject to a Software License Agreement found # in file LICENSE that is included with this distribution. #************************************************************************* -TOP := ../../.. -CAS := $(TOP)/src/cas +TOP := ../../../../.. +CAS := $(TOP)/src/ca/legacy/pcas SRC := $(CAS)/generic -CA := $(CAS)/../ca +CA := $(TOP)/src/ca/client IOSRC := $(CAS)/io/bsdSocket STSRC := $(SRC)/st diff --git a/src/ca/legacy/pcas/ex/Makefile b/src/ca/legacy/pcas/ex/Makefile index 72950f2ef..ce8049f3e 100644 --- a/src/ca/legacy/pcas/ex/Makefile +++ b/src/ca/legacy/pcas/ex/Makefile @@ -7,13 +7,13 @@ # in file LICENSE that is included with this distribution. #************************************************************************* -TOP=../.. +TOP=../../../../.. include $(TOP)/configure/CONFIG PROD_LIBS += $(EPICS_BASE_HOST_LIBS) -SRC_DIRS += $(TOP)/src/makeBaseApp/top/caServerApp +SRC_DIRS += $(TOP)/src/template/base/top/caServerApp # # Added ws2_32 winmm user32 for the non-dll build diff --git a/src/ca/legacy/pcas/example/Makefile b/src/ca/legacy/pcas/example/Makefile index 8f4cc5100..9ec9d6b6a 100644 --- a/src/ca/legacy/pcas/example/Makefile +++ b/src/ca/legacy/pcas/example/Makefile @@ -8,7 +8,7 @@ # in file LICENSE that is included with this distribution. #************************************************************************* -TOP=../../.. +TOP=../../../../.. include $(TOP)/configure/CONFIG diff --git a/src/ca/legacy/pcas/example/directoryService/Makefile b/src/ca/legacy/pcas/example/directoryService/Makefile index d6b4aefb7..93d3c2ef6 100644 --- a/src/ca/legacy/pcas/example/directoryService/Makefile +++ b/src/ca/legacy/pcas/example/directoryService/Makefile @@ -8,7 +8,7 @@ # in file LICENSE that is included with this distribution. #************************************************************************* -TOP=../../../.. +TOP=../../../../../.. include $(TOP)/configure/CONFIG diff --git a/src/ioc/as/Makefile b/src/ioc/as/Makefile index 0f72ae7ab..0b4d04c5b 100644 --- a/src/ioc/as/Makefile +++ b/src/ioc/as/Makefile @@ -6,7 +6,7 @@ # EPICS BASE is distributed subject to a Software License Agreement found # in file LICENSE that is included with this distribution. #************************************************************************* -TOP=../.. +TOP=../../.. include $(TOP)/configure/CONFIG INC += asLib.h diff --git a/src/ioc/bpt/Makefile b/src/ioc/bpt/Makefile index de98cd0f4..0c6adc3d7 100644 --- a/src/ioc/bpt/Makefile +++ b/src/ioc/bpt/Makefile @@ -6,7 +6,7 @@ # EPICS BASE is distributed subject to a Software License Agreement found # in file LICENSE that is included with this distribution. #************************************************************************* -TOP=../.. +TOP=../../.. include $(TOP)/configure/CONFIG INC += cvtTable.h diff --git a/src/ioc/db/Makefile b/src/ioc/db/Makefile index 6898107a7..33a2aa821 100644 --- a/src/ioc/db/Makefile +++ b/src/ioc/db/Makefile @@ -6,7 +6,7 @@ # EPICS BASE is distributed subject to a Software License Agreement found # in file LICENSE that is included with this distribution. #************************************************************************* -TOP=../.. +TOP=../../.. include $(TOP)/configure/CONFIG # includes to install from this sub-project diff --git a/src/ioc/db/test/Makefile b/src/ioc/db/test/Makefile index 164ab4d1a..63b754661 100644 --- a/src/ioc/db/test/Makefile +++ b/src/ioc/db/test/Makefile @@ -6,7 +6,7 @@ # EPICS BASE is distributed subject to a Software License Agreement found # in the file LICENSE that is included with this distribution. #************************************************************************* -TOP=../../.. +TOP=../../../.. include $(TOP)/configure/CONFIG diff --git a/src/ioc/dbStatic/Makefile b/src/ioc/dbStatic/Makefile index aa29eb968..364b8364f 100644 --- a/src/ioc/dbStatic/Makefile +++ b/src/ioc/dbStatic/Makefile @@ -6,7 +6,7 @@ # EPICS BASE is distributed subject to a Software License Agreement found # in file LICENSE that is included with this distribution. #************************************************************************* -TOP=../.. +TOP=../../.. include $(TOP)/configure/CONFIG diff --git a/src/ioc/dbtemplate/Makefile b/src/ioc/dbtemplate/Makefile index 4ae2d322c..28ff1a38e 100644 --- a/src/ioc/dbtemplate/Makefile +++ b/src/ioc/dbtemplate/Makefile @@ -6,7 +6,7 @@ # EPICS BASE is distributed subject to a Software License Agreement found # in file LICENSE that is included with this distribution. #************************************************************************* -TOP=../.. +TOP=../../.. include $(TOP)/configure/CONFIG diff --git a/src/ioc/misc/Makefile b/src/ioc/misc/Makefile index 78bf27229..8eeb65c97 100644 --- a/src/ioc/misc/Makefile +++ b/src/ioc/misc/Makefile @@ -7,7 +7,7 @@ # in file LICENSE that is included with this distribution. #************************************************************************* -TOP=../.. +TOP=../../.. include $(TOP)/configure/CONFIG DBD += base.dbd diff --git a/src/ioc/registry/Makefile b/src/ioc/registry/Makefile index 5a4f904ea..4787b03ee 100644 --- a/src/ioc/registry/Makefile +++ b/src/ioc/registry/Makefile @@ -6,7 +6,7 @@ # EPICS BASE is distributed subject to a Software License Agreement found # in file LICENSE that is included with this distribution. #************************************************************************* -TOP=../.. +TOP=../../.. include $(TOP)/configure/CONFIG diff --git a/src/ioc/rsrv/Makefile b/src/ioc/rsrv/Makefile index 002cc42d8..7dab12b6f 100644 --- a/src/ioc/rsrv/Makefile +++ b/src/ioc/rsrv/Makefile @@ -6,11 +6,11 @@ # EPICS BASE is distributed subject to a Software License Agreement found # in file LICENSE that is included with this distribution. #************************************************************************* -TOP=../.. +TOP=../../.. include $(TOP)/configure/CONFIG -USR_INCLUDES = -I../../ca +USR_INCLUDES = -I../../../ca/client INC += rsrv.h INC += rsrvIocRegister.h diff --git a/src/libCom/Makefile b/src/libCom/Makefile index 57c2f7ab0..cfca99a1e 100644 --- a/src/libCom/Makefile +++ b/src/libCom/Makefile @@ -294,15 +294,15 @@ PROD_SYS_LIBS_WIN32 = ws2_32 advapi32 # for bldErrSymTbl: # ERR_S_FILES += $(TOP)/src/libCom/osi/devLib.h -ERR_S_FILES += $(TOP)/src/as/asLib.h -ERR_S_FILES += $(TOP)/src/db/dbAccessDefs.h -ERR_S_FILES += $(TOP)/src/dbStatic/devSup.h -ERR_S_FILES += $(TOP)/src/dbStatic/drvSup.h -ERR_S_FILES += $(TOP)/src/dbStatic/recSup.h -ERR_S_FILES += $(TOP)/src/dbStatic/dbStaticLib.h +ERR_S_FILES += $(TOP)/src/ioc/as/asLib.h +ERR_S_FILES += $(TOP)/src/ioc/db/dbAccessDefs.h +ERR_S_FILES += $(TOP)/src/ioc/dbStatic/devSup.h +ERR_S_FILES += $(TOP)/src/ioc/dbStatic/drvSup.h +ERR_S_FILES += $(TOP)/src/ioc/dbStatic/recSup.h +ERR_S_FILES += $(TOP)/src/ioc/dbStatic/dbStaticLib.h ERR_S_FILES += $(LIBCOM)/error/errMdef.h -ERR_S_FILES += $(TOP)/src/cas/generic/casdef.h -ERR_S_FILES += $(TOP)/src/gdd/gddAppFuncTable.h +ERR_S_FILES += $(TOP)/src/ca/legacy/pcas/generic/casdef.h +ERR_S_FILES += $(TOP)/src/ca/legacy/gdd/gddAppFuncTable.h include $(TOP)/configure/RULES diff --git a/src/libCom/RTEMS/Makefile b/src/libCom/RTEMS/Makefile index 93a7c26d7..0709ac2ff 100644 --- a/src/libCom/RTEMS/Makefile +++ b/src/libCom/RTEMS/Makefile @@ -6,7 +6,7 @@ # EPICS BASE is distributed subject to a Software License Agreement found # in file LICENSE that is included with this distribution. #************************************************************************* -TOP=../.. +TOP=../../.. include $(TOP)/configure/CONFIG INC += epicsRtemsInitHooks.h diff --git a/src/libCom/tools/Makefile b/src/libCom/tools/Makefile index cf31067b2..bd7c0a8f1 100644 --- a/src/libCom/tools/Makefile +++ b/src/libCom/tools/Makefile @@ -7,7 +7,7 @@ # in file LICENSE that is included with this distribution. #************************************************************************* -TOP=../.. +TOP=../../.. include $(TOP)/configure/CONFIG diff --git a/src/libCom/tools/antelope/Makefile b/src/libCom/tools/antelope/Makefile index c7115d56d..b7435c0d1 100644 --- a/src/libCom/tools/antelope/Makefile +++ b/src/libCom/tools/antelope/Makefile @@ -6,7 +6,7 @@ # EPICS BASE is distributed subject to a Software License Agreement found # in file LICENSE that is included with this distribution. #************************************************************************* -TOP=../../.. +TOP=../../../.. include $(TOP)/configure/CONFIG SRCS += closure.c diff --git a/src/libCom/tools/flex/Makefile b/src/libCom/tools/flex/Makefile index 6086e0ff9..6e2aa8497 100644 --- a/src/libCom/tools/flex/Makefile +++ b/src/libCom/tools/flex/Makefile @@ -6,7 +6,7 @@ # EPICS BASE is distributed subject to a Software License Agreement found # in file LICENSE that is included with this distribution. #************************************************************************* -TOP=../../.. +TOP=../../../.. include $(TOP)/configure/CONFIG diff --git a/src/std/rec/Makefile b/src/std/rec/Makefile index c634062ba..8068271dd 100644 --- a/src/std/rec/Makefile +++ b/src/std/rec/Makefile @@ -6,7 +6,7 @@ # EPICS BASE is distributed subject to a Software License Agreement found # in file LICENSE that is included with this distribution. #************************************************************************* -TOP=../.. +TOP=../../.. include $(TOP)/configure/CONFIG DBDINC += aaiRecord diff --git a/src/std/softIoc/Makefile b/src/std/softIoc/Makefile index 80989a450..00f528643 100644 --- a/src/std/softIoc/Makefile +++ b/src/std/softIoc/Makefile @@ -5,7 +5,7 @@ # in the file LICENSE that is included with this distribution. ########################################################################## -TOP=../.. +TOP=../../.. include $(TOP)/configure/CONFIG diff --git a/src/template/base/Makefile b/src/template/base/Makefile index c7f89f8e1..8873d258c 100644 --- a/src/template/base/Makefile +++ b/src/template/base/Makefile @@ -1,4 +1,4 @@ -TOP=../.. +TOP=../../.. include $(TOP)/configure/CONFIG diff --git a/src/template/ext/Makefile b/src/template/ext/Makefile index b4e9635d1..06c529aa1 100644 --- a/src/template/ext/Makefile +++ b/src/template/ext/Makefile @@ -1,4 +1,4 @@ -TOP=../.. +TOP=../../.. include $(TOP)/configure/CONFIG