From b27e22d75e8e36fd51f8855a4d8ee24351cd11d9 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Mon, 14 Nov 2011 12:33:07 -0600 Subject: [PATCH] Makefile cleanup Various minor changes to comments and build variable names. --- configure/CONFIG_ADDONS | 3 ++- configure/CONFIG_COMMON | 5 ++--- src/RTEMS/base/Makefile | 15 +++++++-------- src/bpt/Makefile | 3 ++- src/cas/example/directoryService/Makefile | 4 ++-- src/excas/Makefile | 4 ++-- src/makeBaseApp/top/caServerApp/Makefile | 16 ++++++++-------- src/rec/Makefile | 5 ++--- 8 files changed, 27 insertions(+), 28 deletions(-) diff --git a/configure/CONFIG_ADDONS b/configure/CONFIG_ADDONS index f86b30185..7fdff395d 100644 --- a/configure/CONFIG_ADDONS +++ b/configure/CONFIG_ADDONS @@ -1,5 +1,5 @@ #************************************************************************* -# Copyright (c) 2002 The University of Chicago, as Operator of Argonne +# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne # National Laboratory. # Copyright (c) 2002 The Regents of the University of California, as # Operator of Los Alamos National Laboratory. @@ -34,6 +34,7 @@ # LIBSRCS source files for building libraries (deprecated) # PROD_OBJS object files for building prods # LIB_OBJS object files for building libraries +# USR_OBJS object files for building libraries and prods # USR_LIBS libs needed by PROD and TESTPROD and LIBRARY # PROD_LIBS libs needed by PROD and TESTPROD # LIB_LIBS libs needed by shared LIBRARY diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON index 20aa9ccec..4527e997a 100644 --- a/configure/CONFIG_COMMON +++ b/configure/CONFIG_COMMON @@ -1,10 +1,9 @@ #************************************************************************* -# Copyright (c) 2002 The University of Chicago, as Operator of Argonne +# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne # National Laboratory. # Copyright (c) 2002 The Regents of the University of California, as # Operator of Los Alamos National Laboratory. -# EPICS BASE Versions 3.13.7 -# and higher are distributed subject to a Software License Agreement found +# EPICS BASE is distributed subject to a Software License Agreement found # in file LICENSE that is included with this distribution. #************************************************************************* # diff --git a/src/RTEMS/base/Makefile b/src/RTEMS/base/Makefile index 98d24509f..e77beeeb7 100644 --- a/src/RTEMS/base/Makefile +++ b/src/RTEMS/base/Makefile @@ -12,15 +12,14 @@ include $(TOP)/configure/CONFIG INC += epicsRtemsInitHooks.h -SRCS += rtems_init.c -SRCS += rtems_config.c -SRCS += rtems_netconfig.c -SRCS += rtems_util.c -SRCS += setBootConfigFromNVRAM.c -SRCS += epicsRtemsInitHookPre.c -SRCS += epicsRtemsInitHookPost.c +rtemsCom_SRCS += rtems_init.c +rtemsCom_SRCS += rtems_config.c +rtemsCom_SRCS += rtems_netconfig.c +rtemsCom_SRCS += rtems_util.c +rtemsCom_SRCS += setBootConfigFromNVRAM.c +rtemsCom_SRCS += epicsRtemsInitHookPre.c +rtemsCom_SRCS += epicsRtemsInitHookPost.c LIBRARY_RTEMS = rtemsCom -LIBRARY_SRCS = $(SRCS) $(BUILD_ARCHS) include $(TOP)/configure/RULES diff --git a/src/bpt/Makefile b/src/bpt/Makefile index f78b13d98..231c1b105 100644 --- a/src/bpt/Makefile +++ b/src/bpt/Makefile @@ -22,7 +22,8 @@ DBD += bptTypeKdegF.dbd PROD_LIBS = Com PROD_HOST += makeBpt -makeBpt_SRCS=makeBpt + +makeBpt_SRCS = makeBpt include $(TOP)/configure/RULES diff --git a/src/cas/example/directoryService/Makefile b/src/cas/example/directoryService/Makefile index d6b4aefb7..af38f906a 100644 --- a/src/cas/example/directoryService/Makefile +++ b/src/cas/example/directoryService/Makefile @@ -23,8 +23,8 @@ PROD_LIBS := cas ca gdd Com # PROD_SYS_LIBS_WIN32 := ws2_32 advapi32 user32 -SRCS += main.cc -SRCS += directoryServer.cc +caDirServ_SRCS += main.cc +caDirServ_SRCS += directoryServer.cc PROD_HOST = caDirServ diff --git a/src/excas/Makefile b/src/excas/Makefile index 0d4d51638..aed68cd74 100644 --- a/src/excas/Makefile +++ b/src/excas/Makefile @@ -1,5 +1,5 @@ #************************************************************************* -# Copyright (c) 2002 The University of Chicago, as Operator of Argonne +# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne # National Laboratory. # Copyright (c) 2002 The Regents of the University of California, as # Operator of Los Alamos National Laboratory. @@ -19,7 +19,7 @@ SRC_DIRS += $(TOP)/src/makeBaseApp/top/caServerApp # # Added ws2_32 winmm user32 for the non-dll build # -SYS_PROD_LIBS_WIN32 += ws2_32 advapi32 user32 +PROD_SYS_LIBS_WIN32 += ws2_32 advapi32 user32 PROD_HOST = excas diff --git a/src/makeBaseApp/top/caServerApp/Makefile b/src/makeBaseApp/top/caServerApp/Makefile index 8584b8804..0195112ac 100644 --- a/src/makeBaseApp/top/caServerApp/Makefile +++ b/src/makeBaseApp/top/caServerApp/Makefile @@ -17,15 +17,15 @@ PROD_LIBS += $(EPICS_BASE_HOST_LIBS) # # Added ws2_32 winmm user32 for the non-dll build # -SYS_PROD_LIBS_WIN32 += ws2_32 advapi32 user32 +PROD_SYS_LIBS_WIN32 += ws2_32 advapi32 user32 -SRCS += main.cc -SRCS += exServer.cc -SRCS += exPV.cc -SRCS += exVectorPV.cc -SRCS += exScalarPV.cc -SRCS += exAsyncPV.cc -SRCS += exChannel.cc +casexample_SRCS += main.cc +casexample_SRCS += exServer.cc +casexample_SRCS += exPV.cc +casexample_SRCS += exVectorPV.cc +casexample_SRCS += exScalarPV.cc +casexample_SRCS += exAsyncPV.cc +casexample_SRCS += exChannel.cc PROD_HOST = casexample diff --git a/src/rec/Makefile b/src/rec/Makefile index 0d4b78aa8..325bc750b 100644 --- a/src/rec/Makefile +++ b/src/rec/Makefile @@ -1,10 +1,9 @@ #************************************************************************* -# Copyright (c) 2002 The University of Chicago, as Operator of Argonne +# Copyright (c) 2011 UChicago Argonne LLC, as Operator of Argonne # National Laboratory. # Copyright (c) 2002 The Regents of the University of California, as # Operator of Los Alamos National Laboratory. -# EPICS BASE Versions 3.13.7 -# and higher are distributed subject to a Software License Agreement found +# EPICS BASE is distributed subject to a Software License Agreement found # in file LICENSE that is included with this distribution. #************************************************************************* TOP=../..