Skip to content
Snippets Groups Projects
Commit 49472fbc authored by Fons Rademakers's avatar Fons Rademakers
Browse files

remove stuff referencing xrootd.

git-svn-id: http://root.cern.ch/svn/root/trunk@16817 27541ba8-7e3a-0410-8455-c3a389f83636
parent 2ba15491
No related branches found
No related tags found
No related merge requests found
......@@ -32,42 +32,18 @@ ALLLIBS += $(GDMLLIB)
# include all dependency files
INCLUDEFILES += $(GDMLDEP)
# These are undefined if using an external XROOTD distribution
# The new XROOTD build system based on autotools installs the headers
# under <dir>/include/xrootd, while the old system under <dir>/src
ifneq ($(XROOTDDIR),)
ifeq ($(XROOTDDIRI),)
XROOTDDIRI := $(XROOTDDIR)/include/xrootd
ifeq ($(wildcard $(XROOTDDIRI)/*.hh),)
XROOTDDIRI := $(XROOTDDIR)/src
endif
XROOTDDIRL := $(XROOTDDIR)/lib
endif
endif
# Xrootd includes
GDMLINCEXTRA := $(XROOTDDIRI:%=-I%)
# Xrootd client libs
ifeq ($(PLATFORM),win32)
GDMLLIBEXTRA += $(XROOTDDIRL)/libXrdClient.lib
else
GDMLLIBEXTRA += $(XROOTDDIRL)/libXrdClient.a $(XROOTDDIRL)/libXrdOuc.a \
$(XROOTDDIRL)/libXrdNet.a
endif
##### local rules #####
include/%.h: $(GDMLDIRI)/%.h
cp $< $@
$(GDMLLIB): $(GDMLO) $(GDMLDO) $(XRDPLUGINS) $(ORDER_) $(MAINLIBS) $(GDMLLIBDEP)
$(GDMLLIB): $(GDMLO) $(GDMLDO) $(ORDER_) $(MAINLIBS) $(GDMLLIBDEP)
@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
"$(SOFLAGS)" libGdml.$(SOEXT) $@ "$(GDMLO) $(GDMLDO)" \
"$(GDMLLIBEXTRA)"
$(GDMLDS): $(GDMLH1) $(GDMLL) $(ROOTCINTTMPEXE) $(XROOTDETAG)
$(GDMLDS): $(GDMLH) $(GDMLL) $(ROOTCINTTMPEXE)
@echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(GDMLINCEXTRA) $(GDMLH) $(GDMLL)
$(ROOTCINTTMP) -f $@ -c $(GDMLH) $(GDMLL)
all-gdml: $(GDMLLIB)
......@@ -86,7 +62,3 @@ distclean-gdml: clean-gdml
@rm -f $(GDMLDEP) $(GDMLDS) $(GDMLDH) $(GDMLLIB)
distclean:: distclean-gdml
##### extra rules ######
$(GDMLO) $(GDMLDO): $(XROOTDETAG)
$(GDMLO) $(GDMLDO): CXXFLAGS += $(GDMLINCEXTRA)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment