Updated version of the flat makefiles (J.-E.Revsbech)

[u/mrichter/AliRoot.git] / build / module.tpl

diff --git a/build/module.tpl b/build/module.tpl
index 852603fc3fcc3e3fca27ca331e16eb38d69828b8..7f1b79f43749331a9c436dfb2c4b521640552120 100644 (file)
--- a/build/module.tpl
+++ b/build/module.tpl
@@ -31,7 +31,6 @@ endif
 
 
 #Extra include,libs etc.
-#@PACKAGE@INC:=$(patsubst %,-I@MODULE@/%,$(EINCLUDE)) -I@MODULE@
 
 @PACKAGE@INC:=$(patsubst %,-I%,$(EINCLUDE)) -I@MODULE@
 
@@ -73,6 +72,8 @@ TEMP:=$(FSRCS:.F=.o)
 @PACKAGE@FO:=$(patsubst %,$(MODDIRO)/%, $(TEMP:.f=.o))
 @PACKAGE@O:= $(patsubst %,$(MODDIRO)/%, $(SRCS:.cxx=.o)) $(@PACKAGE@FO) $(@PACKAGE@CO)
 
+
+
 ifdef WITHDICT
   @PACKAGE@DS:=$(MODDIRO)/G__@PACKAGE@.cxx
   @PACKAGE@DO:=$(MODDIRO)/G__@PACKAGE@.o
@@ -90,10 +91,15 @@ endif
 
 @PACKAGE@LIB:=$(LIBPATH)/lib@PACKAGE@.$(SOEXT)
 
+#Add this to the modules libs
+@MODULE@LIBS += $(@PACKAGE@LIB)
+
 #The actual binary file
 
 @PACKAGE@BIN:=$(BINPATH)/@PACKAGE@
 
+#Add to modules list of binaries
+@MODULE@BINS += $(@PACKAGE@BIN)
 
 # Use in the main Makefile
 
@@ -114,10 +120,12 @@ EXPORTFILES += $(@PACKAGE@EXPORTDEST)
 #The exportfiles only include if any!!
 
 ifdef @PACKAGE@EXPORT
-$(@PACKAGE@EXPORTDEST): $(patsubst %,@MODULE@/%,$(@PACKAGE@EXPORT))
-         @echo "***** Copying file @MODULE@/$(notdir $@) to $@ WRONG !!!*****"
+#$(@PACKAGE@EXPORTDEST): $(patsubst %,@MODULE@/%,$(@PACKAGE@EXPORT))
+
+$(@PACKAGE@EXPORTDEST): $(EXPORTDIR)/%.h: @MODULE@/%.h
+         @echo "***** Copying file @MODULE@/$(notdir $@) to $@ *****"
          @[ -d $(dir $@) ] || mkdir $(dir $@)
-         cp @MODULE@/$(notdir $@) $@   
+         @cp @MODULE@/$(notdir $@) $@  
 endif
 
 $(@PACKAGE@LIB):$(@PACKAGE@O) $(@PACKAGE@DO) @MODULE@/module.mk
@@ -141,7 +149,6 @@ $(@PACKAGE@DO): $(@PACKAGE@DS)
 
 all-@PACKAGE@: $(@PACKAGE@LIB)
 
-
 depend-@PACKAGE@: $(@PACKAGE@DEP)
 
 # determination of object files
@@ -170,37 +177,19 @@ $(@PACKAGE@DDEP): $(@PACKAGE@DS)
                @(if [ ! -d '$(dir $@)' ]; then echo "***** Making directory $(dir $@) *****"; mkdir -p $(dir $@); fi;)
                @share/alibtool depend "$(@PACKAGE@ELIBSDIR) $(@PACKAGE@INC) $(DEPINC)  $<" > $@
 
-$(MODDIRO)/%.d: $(MODDIRS)/%.cxx $(EXPORTFILES)
+$(MODDIRO)/%.d: $(MODDIRS)/%.cxx
                @echo "***** Making dependencies for $< *****";
                @(if [ ! -d '$(dir $@)' ]; then echo "***** Making directory $(dir $@) *****"; mkdir -p $(dir $@); fi;)
-               share/alibtool depend "$(@PACKAGE@ELIBSDIR) $(@PACKAGE@INC) $(DEPINC)  $<" > $@
-$(MODDIRO)/%.d: $(MODDIRS)/%.f $(EXPORTFILES)
+               @share/alibtool depend "$(@PACKAGE@ELIBSDIR) $(@PACKAGE@INC) $(DEPINC)  $<" > $@
+$(MODDIRO)/%.d: $(MODDIRS)/%.f
                @echo "***** Making dependencies for $< *****";
                @(if [ ! -d '$(dir $@)' ]; then echo "***** Making directory $(dir $@) *****"; mkdir -p $(dir $@); fi;)
-               share/alibtool dependF "$(@PACKAGE@ELIBSDIR) $(@PACKAGE@INC) $(DEPINC)  $<" > $@
-$(MODDIRO)/%.d: $(MODDIRS)/%.F  $(EXPORTFILES)
+               @share/alibtool dependF "$(@PACKAGE@ELIBSDIR) $(@PACKAGE@INC) $(DEPINC)  $<" > $@
+$(MODDIRO)/%.d: $(MODDIRS)/%.F
                @echo "***** Making dependencies for $< *****";
                @(if [ ! -d '$(dir $@)' ]; then echo "***** Making directory $(dir $@) *****"; mkdir -p $(dir $@); fi;)
                share/alibtool dependF "$(@PACKAGE@ELIBSDIR) $(@PACKAGE@INC) $(DEPINC)  $<" > $@
-$(MODDIRO)/%.d: $(MODDIRS)/%.c $(EXPORTFILES)
+$(MODDIRO)/%.d: $(MODDIRS)/%.c
                @echo "***** Making dependencies for $< *****";
                @(if [ ! -d '$(dir $@)' ]; then echo "***** Making directory $(dir $@) *****"; mkdir -p $(dir $@); fi;)
-               share/alibtool depend "$(@PACKAGE@ELIBSDIR) $(@PACKAGE@INC) $(DEPINC) $<" > $@
-
-
-#Directory creation
-
-#$(MODDIRO):
-#      @echo "***** Making $@ *****"
-#      mkdir -p $@
-   
-
-
-
-
-
-
-
-
-
-
+               @share/alibtool depend "$(@PACKAGE@ELIBSDIR) $(@PACKAGE@INC) $(DEPINC) $<" > $@