epics/pva2pva
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Revert "Don't build P2P by default"

Browse Source 
This reverts commit 818cf1a846.
This commit is contained in:
Michael Davidsaver
2017-11-01 09:35:53 -05:00
parent 29ae2a8476
commit b30948249a
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -4,17 +4,11 @@ include $(TOP)/configure/CONFIG
# Directories to build, any order # Directories to build, any order
DIRS += configure DIRS += configure
DIRS += pdbApp DIRS += $(wildcard *App)
ifeq ($(BUILD_P2P),YES) DIRS += $(wildcard iocBoot)
DIRS += p2pApp
endif
DIRS += iocBoot
p2pApp_DEPEND_DIRS += configure
pdbApp_DEPEND_DIRS += configure
# iocBoot depends on all *App dirs
iocBoot_DEPEND_DIRS += $(filter %App,$(DIRS)) iocBoot_DEPEND_DIRS += $(filter %App,$(DIRS))
testApp_DEPEND_DIRS += p2pApp pdbApp testApp_DEPEND_DIRS += p2pApp pdbApp
# Add any additional dependency rules here: # Add any additional dependency rules here:

3
configure/CONFIG_SITE
View File

@ -38,8 +38,5 @@ CHECK_RELEASE = YES
# we don't actually use 'rset' explicitly, but quiet some warnings # we don't actually use 'rset' explicitly, but quiet some warnings
USR_CPPFLAGS += -DUSE_TYPED_RSET USR_CPPFLAGS += -DUSE_TYPED_RSET
# Whether to build the (incomplete) PVA gateway
#BUILD_P2P = NO
-include $(TOP)/../CONFIG_SITE.local -include $(TOP)/../CONFIG_SITE.local
-include $(TOP)/configure/CONFIG_SITE.local -include $(TOP)/configure/CONFIG_SITE.local