simplify syntax, introduce dependency from module.tpl

diff --git a/Makefile.flat b/Makefile.flat
index ffe01890277c248e62e6e23844be3bd9def8deb4..8303dd09a74fafc625d2c04073d25ba9b51a3966 100644 (file)
--- a/Makefile.flat
+++ b/Makefile.flat
@@ -116,7 +116,7 @@ include build/module.dep
 #############################################################
 # 
 #        Check if module.mk is present for the library
-%.mk:
+%.mk: build/module.tpl
 ifndef ALIQUIET
        @echo "***** Creating $@ file *****";
 endif

diff --git a/build/module.tpl b/build/module.tpl
index 034c8ef7bd47624b32d479efc62130edbc61bc66..a5aa19a28f272d76d04f7a63e9a8e6459d8d508d 100644 (file)
--- a/build/module.tpl
+++ b/build/module.tpl
@@ -124,10 +124,10 @@ ifdef @PACKAGE@EXPORT
 
 $(@PACKAGE@EXPORTDEST): $(EXPORTDIR)/%.h: @MODULE@/%.h
 ifndef ALIQUIET
-         @echo "***** Copying file @MODULE@/$(notdir $@) to $@ *****"
+         @echo "***** Copying file $^ to $@ *****"
 endif
          @[ -d $(dir $@) ] || mkdir $(dir $@)
-         @cp @MODULE@/$(notdir $@) $@  
+         @cp $^ $@     
 endif
 
 $(@PACKAGE@LIB):$(@PACKAGE@O) $(@PACKAGE@DO) @MODULE@/module.mk
@@ -147,7 +147,7 @@ ifndef ALIQUIET
         @echo "***** Creating $@ *****";       
 endif
         @(if [ ! -d '$(dir $@)' ]; then echo "***** Making directory $(dir $@) *****"; mkdir -p $(dir $@); fi;)
-        $(MUTE)rootcint -f $@ -c $(CINTFLAGS) $(@PACKAGE@INC) $(shell echo $^ | sed -e 's/@MODULE@\/module\.mk//')
+        $(MUTE)rootcint -f $@ -c $(CINTFLAGS) $(@PACKAGE@INC) $(@PACKAGE@CINTHDRS) $(@PACKAGE@DH) 
 
 $(@PACKAGE@DO): $(@PACKAGE@DS)
 ifndef ALIQUIET