From 0ef6a7de07514aafaa8152499a5357a794bcb043 Mon Sep 17 00:00:00 2001 From: hadaq Date: Wed, 22 Feb 2012 12:55:34 +0000 Subject: [PATCH] added INSTALL and USR_INCLUDES instead of local copies of evt.build libs/header files --- ebctrl/ioc/ebctrlApp/src/Makefile | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/ebctrl/ioc/ebctrlApp/src/Makefile b/ebctrl/ioc/ebctrlApp/src/Makefile index a9d8431..ef9d6f4 100644 --- a/ebctrl/ioc/ebctrlApp/src/Makefile +++ b/ebctrl/ioc/ebctrlApp/src/Makefile @@ -35,7 +35,6 @@ DBD += ebctrl.dbd # ebctrl.dbd will be made up from these files: ebctrl_DBD += base.dbd -#ebctrl_DBD += xxxSupport.dbd ebctrl_DBD += genSubRecord.dbd ebctrl_DBD += evtbuild.dbd ebctrl_DBD += netmem.dbd @@ -93,31 +92,17 @@ ebctrl_SRCS += totalerrbitstat.c # The following adds support from base/src/vxWorks ebctrl_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary -#ebctrl_LIBS += xxxSupport ebctrl_LIBS += hadaq ebctrl_LIBS += compat -# NOTE: To build SNL programs, SNCSEQ must be defined -# in the /configure/RELEASE file - -ifneq ($(SNCSEQ),) - # This builds sncExample as a component of ebctrl - ebctrl_SNCFLAGS += +r - ebctrl_DBD += sncExample.dbd - ebctrl_SRCS += sncExample.stt - ebctrl_LIBS += seq pv - - # The following builds sncProgram as a standalone application - PROD_HOST += sncProgram - sncProgram_SNCFLAGS += +m - sncProgram_SRCS += sncProgram.st - sncProgram_LIBS += seq pv - sncProgram_LIBS += $(EPICS_BASE_HOST_LIBS) -endif - ebctrl_LIBS += $(EPICS_BASE_IOC_LIBS) #=========================== +LIB_INSTALLS += /home/hadaq/soft/evtbuild/lib/libhadaq.a +LIB_INSTALLS += /home/hadaq/soft/evtbuild/lib/libcompat.a +#=========================== + +USR_INCLUDES += -I/home/hadaq/soft/evtbuild/include include $(TOP)/configure/RULES #---------------------------------------- -- 2.43.0