fix standard EPICS build system
This commit is contained in:
19
Makefile
19
Makefile
@ -4,21 +4,24 @@ DIRS = src
|
|||||||
streamApp_DEPEND_DIRS = src
|
streamApp_DEPEND_DIRS = src
|
||||||
|
|
||||||
# Look if we have EPICS R3.13 or R3.14
|
# Look if we have EPICS R3.13 or R3.14
|
||||||
ifeq ($(wildcard $(TOP)/configure),)
|
ifneq ($(wildcard $(TOP)/configure),)
|
||||||
|
# EPICS R3.14
|
||||||
|
include $(TOP)/configure/CONFIG
|
||||||
|
else ifneq ($(wildcard $(TOP)/config),)
|
||||||
# EPICS R3.13
|
# EPICS R3.13
|
||||||
include $(TOP)/config/CONFIG_APP
|
include $(TOP)/config/CONFIG_APP
|
||||||
CONFIG = $(TOP)/config
|
CONFIG = $(TOP)/config
|
||||||
else
|
else
|
||||||
# EPICS R3.14
|
TOP = .
|
||||||
include $(TOP)/configure/CONFIG
|
include $(TOP)/configure/CONFIG
|
||||||
ifneq ($(words $(CALC) $(SYNAPPS)), 0)
|
|
||||||
# with synApps calc module (contains scalcout)
|
|
||||||
DIRS += srcSynApps
|
|
||||||
srcSynApps_DEPEND_DIRS = src
|
|
||||||
streamApp_DEPEND_DIRS += srcSynApps
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
DIRS += streamApp
|
DIRS += streamApp
|
||||||
|
ifneq ($(words $(CALC) $(SYNAPPS)), 0)
|
||||||
|
# with synApps calc module (contains scalcout)
|
||||||
|
DIRS += srcSynApps
|
||||||
|
srcSynApps_DEPEND_DIRS = src
|
||||||
|
streamApp_DEPEND_DIRS += srcSynApps
|
||||||
|
endif
|
||||||
|
|
||||||
include $(CONFIG)/RULES_DIRS
|
include $(CONFIG)/RULES_DIRS
|
||||||
|
@ -16,3 +16,4 @@ TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top
|
|||||||
|
|
||||||
# EPICS_BASE usually appears last so other apps can override stuff:
|
# EPICS_BASE usually appears last so other apps can override stuff:
|
||||||
EPICS_BASE=/usr/local/epics/base-3.14.12
|
EPICS_BASE=/usr/local/epics/base-3.14.12
|
||||||
|
CALC=~/top/SynApps/calc-2-8
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
# #
|
# #
|
||||||
################################################################
|
################################################################
|
||||||
|
|
||||||
TOP=../..
|
TOP:=../$(TOP)
|
||||||
|
|
||||||
# Look if we have EPICS R3.13 or R3.14
|
# Look if we have EPICS R3.13 or R3.14
|
||||||
ifeq ($(wildcard $(TOP)/configure),)
|
ifeq ($(wildcard $(TOP)/configure),)
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
TOP=../..
|
TOP:=../$(TOP)
|
||||||
|
|
||||||
include $(TOP)/configure/CONFIG
|
include $(TOP)/configure/CONFIG
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
TOP=../..
|
TOP:=../$(TOP)
|
||||||
|
|
||||||
# Look if we have EPICS R3.13 or R3.14
|
# Look if we have EPICS R3.13 or R3.14
|
||||||
ifeq ($(wildcard $(TOP)/configure),)
|
ifeq ($(wildcard $(TOP)/configure),)
|
||||||
|
Reference in New Issue
Block a user