Fixup Makefiles

Adjust TOP and paths
2010-12-16 17:05:05 -05:00
parent 2a36a3906d
commit 31533ba62e
28 changed files with 84 additions and 84 deletions
--- 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
--- 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

--- 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


--- 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

--- 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

--- 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

--- 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

--- 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
--- 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

--- 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

--- 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
--- 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
--- 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
--- 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

--- 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

--- 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

--- 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
--- 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

--- 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
--- 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

--- 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
--- 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

--- 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
--- 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

--- 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
--- 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

--- a/src/template/base/Makefile
+++ b/src/template/base/Makefile
@@ -1,4 +1,4 @@
-TOP=../..
+TOP=../../..

 include $(TOP)/configure/CONFIG

--- a/src/template/ext/Makefile
+++ b/src/template/ext/Makefile
@@ -1,4 +1,4 @@
-TOP=../..
+TOP=../../..

 include $(TOP)/configure/CONFIG