From 818cf1a84646d1c1bfc25c618c717f0575f82253 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Tue, 24 Oct 2017 12:03:29 -0500 Subject: [PATCH] Don't build P2P by default --- Makefile | 12 +++++++++--- configure/CONFIG_SITE | 3 +++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 5cf947c..b0500af 100644 --- a/Makefile +++ b/Makefile @@ -4,11 +4,17 @@ include $(TOP)/configure/CONFIG # Directories to build, any order DIRS += configure -DIRS += $(wildcard *App) -DIRS += $(wildcard iocBoot) +DIRS += pdbApp +ifeq ($(BUILD_P2P),YES) +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)) + testApp_DEPEND_DIRS += p2pApp pdbApp # Add any additional dependency rules here: diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE index 26e8c16..96d48ea 100644 --- a/configure/CONFIG_SITE +++ b/configure/CONFIG_SITE @@ -38,5 +38,8 @@ CHECK_RELEASE = YES # we don't actually use 'rset' explicitly, but quiet some warnings USR_CPPFLAGS += -DUSE_TYPED_RSET +# Whether to build the (incomplete) PVA gateway +#BUILD_P2P = NO + -include $(TOP)/../CONFIG_SITE.local -include $(TOP)/configure/CONFIG_SITE.local