From d06dc260e72b937093a5e84fa9887f8184899fed Mon Sep 17 00:00:00 2001 From: Axel Naumann Date: Tue, 11 Nov 2014 01:53:13 +0100 Subject: [PATCH] [Modules] Move rpdp headers to res/. rpdp headers are not part of the ROOT public API and thus should not be visible in include/. They were simply because multiple ROOT modules were including them, and we had no way to specify that other than publishing them. Now we have a new directory next to src/ and inc/: res/ (as in "reserved" or "restricted"), signalling that these headers are not public but used by other ROOT modules. Update the Moduke.mk-s accordingly. Move a few really private headers into their src/ directories. --- net/auth/Module.mk | 1 + net/rootd/Module.mk | 2 +- net/rootd/{inc => src}/rootdp.h | 0 net/rpdutils/Module.mk | 13 +++---------- net/rpdutils/{inc => res}/rpdconn.h | 0 net/rpdutils/{inc => res}/rpddefs.h | 0 net/rpdutils/{inc => res}/rpderr.h | 0 net/rpdutils/{inc => res}/rpdp.h | 0 net/rpdutils/{inc => res}/rpdpriv.h | 0 net/srputils/Module.mk | 2 +- proof/proofd/Module.mk | 4 ++-- proof/proofd/{inc => src}/proofdp.h | 0 12 files changed, 8 insertions(+), 14 deletions(-) rename net/rootd/{inc => src}/rootdp.h (100%) rename net/rpdutils/{inc => res}/rpdconn.h (100%) rename net/rpdutils/{inc => res}/rpddefs.h (100%) rename net/rpdutils/{inc => res}/rpderr.h (100%) rename net/rpdutils/{inc => res}/rpdp.h (100%) rename net/rpdutils/{inc => res}/rpdpriv.h (100%) rename proof/proofd/{inc => src}/proofdp.h (100%) diff --git a/net/auth/Module.mk b/net/auth/Module.mk index 86dc0bb75c2e8..ba016538be7e0 100644 --- a/net/auth/Module.mk +++ b/net/auth/Module.mk @@ -160,3 +160,4 @@ $(AFSAUTHO): CXXFLAGS += $(AFSINCDIR) $(AFSEXTRACFLAGS) ifeq ($(MACOSX_SSL_DEPRECATED),yes) $(call stripsrc,$(AUTHDIRS)/TAuthenticate.o): CXXFLAGS += -Wno-deprecated-declarations endif +$(DAEMONUTILSO): CXXFLAGS += -I$(ROOT_SRCDIR)/net/rpdutils/res diff --git a/net/rootd/Module.mk b/net/rootd/Module.mk index 20ac8b36c7e51..3f25274a289ac 100644 --- a/net/rootd/Module.mk +++ b/net/rootd/Module.mk @@ -53,4 +53,4 @@ distclean-$(MODNAME): clean-$(MODNAME) distclean:: distclean-$(MODNAME) ##### extra rules ###### -$(ROOTDO): CXXFLAGS += $(AUTHFLAGS) +$(ROOTDO): CXXFLAGS += $(AUTHFLAGS) -I$(ROOT_SRCDIR)/net/rpdutils/res diff --git a/net/rootd/inc/rootdp.h b/net/rootd/src/rootdp.h similarity index 100% rename from net/rootd/inc/rootdp.h rename to net/rootd/src/rootdp.h diff --git a/net/rpdutils/Module.mk b/net/rpdutils/Module.mk index f491f379457f3..e06c90a368dc9 100644 --- a/net/rpdutils/Module.mk +++ b/net/rpdutils/Module.mk @@ -7,27 +7,24 @@ MODNAME := rpdutils MODDIR := $(ROOT_SRCDIR)/net/$(MODNAME) MODDIRS := $(MODDIR)/src MODDIRI := $(MODDIR)/inc +MODDIRR := $(MODDIR)/res RPDUTILDIR := $(MODDIR) RPDUTILDIRS := $(RPDUTILDIR)/src -RPDUTILDIRI := $(RPDUTILDIR)/inc ##### $(RPDUTILO) ##### -RPDUTILH := $(filter-out $(MODDIRI)/rpdpriv.h, $(filter-out $(MODDIRI)/rpdconn.h, $(wildcard $(MODDIRI)/*.h))) RPDUTILS := $(filter-out $(MODDIRS)/rpdpriv.cxx, $(filter-out $(MODDIRS)/rpdconn.cxx, $(wildcard $(MODDIRS)/*.cxx))) RPDUTILO := $(call stripsrc,$(RPDUTILS:.cxx=.o)) RPDUTILDEP := $(RPDUTILO:.o=.d) ##### $(RPDCONNO) ##### -RPDCONNH := $(MODDIRI)/rpdconn.h RPDCONNS := $(MODDIRS)/rpdconn.cxx RPDCONNO := $(call stripsrc,$(RPDCONNS:.cxx=.o)) RPDCONNDEP := $(RPDCONNO:.o=.d) ##### $(RPDPRIVO) ##### -RPDPRIVH := $(MODDIRI)/rpdpriv.h RPDPRIVS := $(MODDIRS)/rpdpriv.cxx RPDPRIVO := $(call stripsrc,$(RPDPRIVS:.cxx=.o)) @@ -76,6 +73,7 @@ GLBSLIBS += $(SSLLIBDIR) $(SSLLIB) endif # Combined... +RPDALLO := $(RPDUTILO) $(RPDCONNO) $(RPDPRIVO) $(SRVAUTHO) AUTHFLAGS := $(EXTRA_AUTHFLAGS) $(SHADOWFLAGS) $(AFSFLAGS) $(SRPFLAGS) \ $(KRB5FLAGS) $(GLBSFLAGS) AUTHLIBS := $(SHADOWLIBS) $(AFSLIBS) \ @@ -87,9 +85,6 @@ AUTHLIBS += -lz endif # used in the main Makefile -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(RPDUTILH)) -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(RPDCONNH)) -ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(RPDPRIVH)) ALLLIBS += $(SRVAUTHLIB) # include all dependency files @@ -98,9 +93,6 @@ INCLUDEFILES += $(RPDUTILDEP) $(RPDCONNDEP) $(RPDPRIVDEP) ##### local rules ##### .PHONY: all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME) -include/%.h: $(RPDUTILDIRI)/%.h - cp $< $@ - $(SRVAUTHLIB): $(SRVAUTHO) $(RSAO) $(DAEMONUTILSO) $(STRLCPYO) $(ORDER_) $(MAINLIBS) $(SRVAUTHLIBDEP) @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \ "$(SOFLAGS)" libSrvAuth.$(SOEXT) $@ "$(SRVAUTHO) $(RSAO)" \ @@ -119,6 +111,7 @@ distclean-$(MODNAME): clean-$(MODNAME) distclean:: distclean-$(MODNAME) ##### extra rules ###### +$(RPDALLO): CXXFLAGS += -I$(MODDIRR) $(RPDUTILO): CXXFLAGS += $(AUTHFLAGS) ifeq ($(MACOSX_SSL_DEPRECATED),yes) $(call stripsrc,$(RPDUTILDIRS)/rpdutils.o): CXXFLAGS += -Wno-deprecated-declarations diff --git a/net/rpdutils/inc/rpdconn.h b/net/rpdutils/res/rpdconn.h similarity index 100% rename from net/rpdutils/inc/rpdconn.h rename to net/rpdutils/res/rpdconn.h diff --git a/net/rpdutils/inc/rpddefs.h b/net/rpdutils/res/rpddefs.h similarity index 100% rename from net/rpdutils/inc/rpddefs.h rename to net/rpdutils/res/rpddefs.h diff --git a/net/rpdutils/inc/rpderr.h b/net/rpdutils/res/rpderr.h similarity index 100% rename from net/rpdutils/inc/rpderr.h rename to net/rpdutils/res/rpderr.h diff --git a/net/rpdutils/inc/rpdp.h b/net/rpdutils/res/rpdp.h similarity index 100% rename from net/rpdutils/inc/rpdp.h rename to net/rpdutils/res/rpdp.h diff --git a/net/rpdutils/inc/rpdpriv.h b/net/rpdutils/res/rpdpriv.h similarity index 100% rename from net/rpdutils/inc/rpdpriv.h rename to net/rpdutils/res/rpdpriv.h diff --git a/net/srputils/Module.mk b/net/srputils/Module.mk index 77847d917d316..64002b706f127 100644 --- a/net/srputils/Module.mk +++ b/net/srputils/Module.mk @@ -76,5 +76,5 @@ distclean-$(MODNAME): clean-$(MODNAME) distclean:: distclean-$(MODNAME) ##### extra rules ###### -$(SRPUTILSO): CXXFLAGS += $(SRPINCDIR:%=-I%) +$(SRPUTILSO): CXXFLAGS += $(SRPINCDIR:%=-I%) -I$(ROOT_SRCDIR)/net/rpdutils/res $(RTCONFO): CFLAGS += $(SRPUTILINCDIR:%=-I%) $(SRPINCDIR:%=-I%) diff --git a/proof/proofd/Module.mk b/proof/proofd/Module.mk index 3352cb01a6f4f..632b77759854f 100644 --- a/proof/proofd/Module.mk +++ b/proof/proofd/Module.mk @@ -259,10 +259,10 @@ distclean-$(MODNAME): clean-$(MODNAME) distclean:: distclean-$(MODNAME) ##### extra rules ###### -$(PROOFDEXEO): CXXFLAGS += $(AUTHFLAGS) +$(PROOFDEXEO): CXXFLAGS += $(AUTHFLAGS) -I$(ROOT_SRCDIR)/net/rpdutils/res $(XPDO): $(XROOTDMAKE) $(XRDHDRS) -$(XPDO): CXXFLAGS += $(XPDINCEXTRA) $(EXTRA_XRDFLAGS) +$(XPDO): CXXFLAGS += $(XPDINCEXTRA) $(EXTRA_XRDFLAGS) $(BONJOURCPPFLAGS) -I$(ROOT_SRCDIR)/net/rpdutils/res ifneq ($(ICC_GE_9),) # remove when xrootd has moved from strstream.h -> sstream. diff --git a/proof/proofd/inc/proofdp.h b/proof/proofd/src/proofdp.h similarity index 100% rename from proof/proofd/inc/proofdp.h rename to proof/proofd/src/proofdp.h