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

fixed important hole in the Makefile. There were no dependency (.d) files

generated for the dictionary files (G__*). This caused dictionaries including
modified headers not to be rebuild.


git-svn-id: http://root.cern.ch/svn/root/trunk@410 27541ba8-7e3a-0410-8455-c3a389f83636
parent 78722f75
No related branches found
No related tags found
No related merge requests found
...@@ -27,7 +27,7 @@ BASEH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h)) ...@@ -27,7 +27,7 @@ BASEH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
BASES := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx)) BASES := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
BASEO := $(BASES:.cxx=.o) BASEO := $(BASES:.cxx=.o)
BASEDEP := $(BASEO:.o=.d) BASEDEP := $(BASEO:.o=.d) $(BASEDO:.o=.d)
# used in the main Makefile # used in the main Makefile
ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(BASEH)) ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(BASEH))
......
# Module.mk for rootx module # Module.mk for build module
# Copyright (c) 2000 Rene Brun and Fons Rademakers # Copyright (c) 2000 Rene Brun and Fons Rademakers
# #
# Author: Fons Rademakers, 29/2/2000 # Author: Fons Rademakers, 29/2/2000
......
...@@ -21,7 +21,7 @@ CLIBH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h)) ...@@ -21,7 +21,7 @@ CLIBH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
CLIBS := $(wildcard $(MODDIRS)/*.c) CLIBS := $(wildcard $(MODDIRS)/*.c)
CLIBO := $(CLIBS:.c=.o) CLIBO := $(CLIBS:.c=.o)
CLIBDEP := $(CLIBO:.o=.d) CLIBDEP := $(CLIBO:.o=.d) $(CLIBDO:.o=.d)
# used in the main Makefile # used in the main Makefile
ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(CLIBH)) ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(CLIBH))
......
...@@ -21,7 +21,7 @@ CONTH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h)) ...@@ -21,7 +21,7 @@ CONTH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
CONTS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx)) CONTS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
CONTO := $(CONTS:.cxx=.o) CONTO := $(CONTS:.cxx=.o)
CONTDEP := $(CONTO:.o=.d) CONTDEP := $(CONTO:.o=.d) $(CONTDO:.o=.d)
# used in the main Makefile # used in the main Makefile
ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(CONTH)) ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(CONTH))
......
...@@ -22,7 +22,7 @@ EGH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h)) ...@@ -22,7 +22,7 @@ EGH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
EGS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx)) EGS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
EGO := $(EGS:.cxx=.o) EGO := $(EGS:.cxx=.o)
EGDEP := $(EGO:.o=.d) EGDEP := $(EGO:.o=.d) $(EGDO:.o=.d)
EGLIB := $(LPATH)/libEG.$(SOEXT) EGLIB := $(LPATH)/libEG.$(SOEXT)
......
...@@ -25,7 +25,7 @@ G3DS1 := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx)) ...@@ -25,7 +25,7 @@ G3DS1 := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
G3DS2 := $(wildcard $(MODDIRS)/*.c) G3DS2 := $(wildcard $(MODDIRS)/*.c)
G3DO := $(G3DS1:.cxx=.o) $(G3DS2:.c=.o) G3DO := $(G3DS1:.cxx=.o) $(G3DS2:.c=.o)
G3DDEP := $(G3DO:.o=.d) G3DDEP := $(G3DO:.o=.d) $(G3DDO:.o=.d)
G3DLIB := $(LPATH)/libGraf3d.$(SOEXT) G3DLIB := $(LPATH)/libGraf3d.$(SOEXT)
......
...@@ -21,7 +21,7 @@ GPADH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h)) ...@@ -21,7 +21,7 @@ GPADH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
GPADS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx)) GPADS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
GPADO := $(GPADS:.cxx=.o) GPADO := $(GPADS:.cxx=.o)
GPADDEP := $(GPADO:.o=.d) GPADDEP := $(GPADO:.o=.d) $(GPADDO:.o=.d)
GPADLIB := $(LPATH)/libGpad.$(SOEXT) GPADLIB := $(LPATH)/libGpad.$(SOEXT)
......
...@@ -26,7 +26,7 @@ GRAFH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h)) ...@@ -26,7 +26,7 @@ GRAFH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
GRAFS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx)) GRAFS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
GRAFO := $(GRAFS:.cxx=.o) GRAFO := $(GRAFS:.cxx=.o)
GRAFDEP := $(GRAFO:.o=.d) GRAFDEP := $(GRAFO:.o=.d) $(GRAFDO:.o=.d)
GRAFLIB := $(LPATH)/libGraf.$(SOEXT) GRAFLIB := $(LPATH)/libGraf.$(SOEXT)
......
...@@ -46,7 +46,7 @@ GUIH := $(GUIH1) $(GUIH2) $(GUIH3) $(GUIH4) ...@@ -46,7 +46,7 @@ GUIH := $(GUIH1) $(GUIH2) $(GUIH3) $(GUIH4)
GUIS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx)) GUIS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
GUIO := $(GUIS:.cxx=.o) GUIO := $(GUIS:.cxx=.o)
GUIDEP := $(GUIO:.o=.d) GUIDEP := $(GUIO:.o=.d) $(GUIDO:.o=.d)
GUILIB := $(LPATH)/libGui.$(SOEXT) GUILIB := $(LPATH)/libGui.$(SOEXT)
......
...@@ -21,7 +21,7 @@ HISTH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h)) ...@@ -21,7 +21,7 @@ HISTH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
HISTS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx)) HISTS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
HISTO := $(HISTS:.cxx=.o) HISTO := $(HISTS:.cxx=.o)
HISTDEP := $(HISTO:.o=.d) HISTDEP := $(HISTO:.o=.d) $(HISTDO:.o=.d)
HISTLIB := $(LPATH)/libHist.$(SOEXT) HISTLIB := $(LPATH)/libHist.$(SOEXT)
......
...@@ -22,7 +22,7 @@ HISTPAINTERH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h)) ...@@ -22,7 +22,7 @@ HISTPAINTERH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
HISTPAINTERS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx)) HISTPAINTERS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
HISTPAINTERO := $(HISTPAINTERS:.cxx=.o) HISTPAINTERO := $(HISTPAINTERS:.cxx=.o)
HISTPAINTERDEP := $(HISTPAINTERO:.o=.d) HISTPAINTERDEP := $(HISTPAINTERO:.o=.d) $(HISTPAINTERDO:.o=.d)
HISTPAINTERLIB := $(LPATH)/libHistPainter.$(SOEXT) HISTPAINTERLIB := $(LPATH)/libHistPainter.$(SOEXT)
......
...@@ -21,7 +21,7 @@ HTMLH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h)) ...@@ -21,7 +21,7 @@ HTMLH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
HTMLS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx)) HTMLS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
HTMLO := $(HTMLS:.cxx=.o) HTMLO := $(HTMLS:.cxx=.o)
HTMLDEP := $(HTMLO:.o=.d) HTMLDEP := $(HTMLO:.o=.d) $(HTMLDO:.o=.d)
HTMLLIB := $(LPATH)/libHtml.$(SOEXT) HTMLLIB := $(LPATH)/libHtml.$(SOEXT)
......
...@@ -21,7 +21,7 @@ MATRIXH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h)) ...@@ -21,7 +21,7 @@ MATRIXH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
MATRIXS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx)) MATRIXS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
MATRIXO := $(MATRIXS:.cxx=.o) MATRIXO := $(MATRIXS:.cxx=.o)
MATRIXDEP := $(MATRIXO:.o=.d) MATRIXDEP := $(MATRIXO:.o=.d) $(MATRIXDO:.o=.d)
MATRIXLIB := $(LPATH)/libMatrix.$(SOEXT) MATRIXLIB := $(LPATH)/libMatrix.$(SOEXT)
......
...@@ -21,7 +21,7 @@ METAH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h)) ...@@ -21,7 +21,7 @@ METAH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
METAS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx)) METAS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
METAO := $(METAS:.cxx=.o) METAO := $(METAS:.cxx=.o)
METADEP := $(METAO:.o=.d) METADEP := $(METAO:.o=.d) $(METADO:.o=.d)
# used in the main Makefile # used in the main Makefile
ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(METAH)) ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(METAH))
......
...@@ -21,7 +21,7 @@ MINUITH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h)) ...@@ -21,7 +21,7 @@ MINUITH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
MINUITS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx)) MINUITS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
MINUITO := $(MINUITS:.cxx=.o) MINUITO := $(MINUITS:.cxx=.o)
MINUITDEP := $(MINUITO:.o=.d) MINUITDEP := $(MINUITO:.o=.d) $(MINUITDO:.o=.d)
MINUITLIB := $(LPATH)/libMinuit.$(SOEXT) MINUITLIB := $(LPATH)/libMinuit.$(SOEXT)
......
...@@ -21,7 +21,7 @@ MYSQLH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h)) ...@@ -21,7 +21,7 @@ MYSQLH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
MYSQLS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx)) MYSQLS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
MYSQLO := $(MYSQLS:.cxx=.o) MYSQLO := $(MYSQLS:.cxx=.o)
MYSQLDEP := $(MYSQLO:.o=.d) MYSQLDEP := $(MYSQLO:.o=.d) $(MYSQLDO:.o=.d)
MYSQLLIB := $(LPATH)/libMySQL.$(SOEXT) MYSQLLIB := $(LPATH)/libMySQL.$(SOEXT)
......
...@@ -21,7 +21,7 @@ NETH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h)) ...@@ -21,7 +21,7 @@ NETH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
NETS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx)) NETS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
NETO := $(NETS:.cxx=.o) NETO := $(NETS:.cxx=.o)
NETDEP := $(NETO:.o=.d) NETDEP := $(NETO:.o=.d) $(NETDO:.o=.d)
# used in the main Makefile # used in the main Makefile
ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(NETH)) ALLHDRS += $(patsubst $(MODDIRI)/%.h,include/%.h,$(NETH))
......
...@@ -21,7 +21,7 @@ PHYSICSH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h)) ...@@ -21,7 +21,7 @@ PHYSICSH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
PHYSICSS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx)) PHYSICSS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
PHYSICSO := $(PHYSICSS:.cxx=.o) PHYSICSO := $(PHYSICSS:.cxx=.o)
PHYSICSDEP := $(PHYSICSO:.o=.d) PHYSICSDEP := $(PHYSICSO:.o=.d) $(PHYSICSDO:.o=.d)
PHYSICSLIB := $(LPATH)/libPhysics.$(SOEXT) PHYSICSLIB := $(LPATH)/libPhysics.$(SOEXT)
......
...@@ -21,7 +21,7 @@ POSTSCRIPTH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h)) ...@@ -21,7 +21,7 @@ POSTSCRIPTH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
POSTSCRIPTS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx)) POSTSCRIPTS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
POSTSCRIPTO := $(POSTSCRIPTS:.cxx=.o) POSTSCRIPTO := $(POSTSCRIPTS:.cxx=.o)
POSTSCRIPTDEP := $(POSTSCRIPTO:.o=.d) POSTSCRIPTDEP := $(POSTSCRIPTO:.o=.d) $(POSTSCRIPTDO:.o=.d)
POSTSCRIPTLIB := $(LPATH)/libPostscript.$(SOEXT) POSTSCRIPTLIB := $(LPATH)/libPostscript.$(SOEXT)
......
...@@ -21,7 +21,7 @@ PROOFH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h)) ...@@ -21,7 +21,7 @@ PROOFH := $(filter-out $(MODDIRI)/LinkDef%,$(wildcard $(MODDIRI)/*.h))
PROOFS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx)) PROOFS := $(filter-out $(MODDIRS)/G__%,$(wildcard $(MODDIRS)/*.cxx))
PROOFO := $(PROOFS:.cxx=.o) PROOFO := $(PROOFS:.cxx=.o)
PROOFDEP := $(PROOFO:.o=.d) PROOFDEP := $(PROOFO:.o=.d) $(PROOFDO:.o=.d)
PROOFLIB := $(LPATH)/libProof.$(SOEXT) PROOFLIB := $(LPATH)/libProof.$(SOEXT)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment