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

make compilation of libRXML dependent on the finding of the xml2 include

directory and the libxml2 library.


git-svn-id: http://root.cern.ch/svn/root/trunk@8894 27541ba8-7e3a-0410-8455-c3a389f83636
parent 073e4d9a
No related branches found
No related tags found
No related merge requests found
......@@ -32,6 +32,10 @@ endif
ifeq ($(EXPLICITLINK),yes)
include config/Makefile.depend
endif
ifneq ($(findstring map, $(MAKECMDGOALS)),)
#ifeq ($(MAKECMDGOALS), map-pythia)
include config/Makefile.depend
endif
##### Allow local macros #####
......@@ -42,7 +46,7 @@ endif
MODULES = build cint metautils utils base cont meta net zip clib matrix \
newdelete hist tree freetype graf g3d gpad gui minuit \
histpainter treeplayer treeviewer proof physics postscript \
rint html eg geom geompainter vmc fumili mlp gedold ged xml
rint html eg geom geompainter vmc fumili mlp gedold ged
ifeq ($(ARCH),win32)
MODULES += winnt win32 gl
......@@ -127,6 +131,11 @@ ifneq ($(PYTHONLIB),)
MODULES += pyroot
endif
endif
ifneq ($(XMLINCDIR),)
ifneq ($(XMLCLILIB),)
MODULES += xml
endif
endif
ifneq ($(TABLE),)
MODULES += table
endif
......@@ -293,8 +302,9 @@ endif
.PHONY: all fast config rootcint rootlibs rootexecs dist distsrc \
clean distclean maintainer-clean compiledata importcint \
version html changelog install uninstall showbuild cintdlls \
static debian redhat skip \
static map debian redhat skip \
$(patsubst %,all-%,$(MODULES)) \
$(patsubst %,map-%,$(MODULES)) \
$(patsubst %,clean-%,$(MODULES)) \
$(patsubst %,distclean-%,$(MODULES))
......@@ -492,9 +502,6 @@ html: $(ROOTEXE) changelog
@$(MAKELOGHTML)
@$(MAKEHTML)
map: $(RLIBMAP) rootlibs
$(RLIBMAP) -o $(ROOTMAP) $(ALLLIBS)
install: all map
@if [ -d $(BINDIR) ]; then \
inode1=`ls -id $(BINDIR) | awk '{ print $$1 }'`; \
......
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