[Modules] Move rpdp headers to res/.

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

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

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

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%)

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.