some cleanup after manual merge

This commit is contained in:
2018-05-23 11:19:20 +02:00
parent 099585fa91
commit cbc549f355
4 changed files with 15 additions and 24 deletions

View File

@ -1,6 +1,6 @@
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),)
# EPICS R3.13
include $(TOP)/config/CONFIG_APP
@ -8,11 +8,9 @@ include $(TOP)/config/CONFIG_APP
include $(TOP)/config/RULES_ARCHS
else
# EPICS R3.14
# EPICS R3.14+
include $(TOP)/configure/CONFIG
#HOST_OPT = NO
PROD = streamApp
DBD = streamApp.dbd