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

diff --git a/build/clean.tpl b/build/clean.tpl
new file mode 100644 (file)
index 0000000..85d6f09
--- /dev/null
+++ b/build/clean.tpl
@@ -0,0 +1,8 @@
+
+#  Clean option for the whole module
+clean-@MODULE@:
+               @echo "***** Cleaning @MODULE@ *****"
+               rm @MODULE@/module.mk
+               rm -rf @MODULE@/tgt_$(ALICE_TARGET) 
+               rm -f $(@MODULE@LIBS)
+               rm -f $(@MODULE@BINS)

diff --git a/build/module.tpl b/build/module.tpl
index af8fa2b48a67ece32f1c13b8317cf330e40842b5..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
 
@@ -171,7 +177,7 @@ $(@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 
+$(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)  $<" > $@
@@ -187,21 +193,3 @@ $(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 $@
-   
-
-
-
-
-
-
-
-
-
-

diff --git a/share/alibtool b/share/alibtool
index 688c0f4525fc537585ed423219e4f25a154822f1..4102d1ba66a2d4605ef659a853ff73df93ad6a85 100755 (executable)
--- a/share/alibtool
+++ b/share/alibtool
@@ -5,6 +5,9 @@
 #
 # modification history
 # $Log$
+# Revision 1.1  2001/10/09 13:45:57  hristov
+# alibtool is added
+#
 #
 # SYNOPSIS
 # alirun <command> <commandparameters>
@@ -75,7 +78,7 @@ echo "#*************************************************************************
 echo "#**** This file is automatically generated from the mkmodules script  *****";
 echo "#****          DO NOT EDIT!!                                          *****";
 echo "#**************************************************************************";
-echo
+
 for i in $tempo; do
     package=$i;
     type=lib;
@@ -91,6 +94,8 @@ for i in $tempo; do
     MkModuleLib $package 
 done;
 
+#Now make general bottom for every module (Clean and so on)
+    cat build/clean.tpl | sed -e "sQ\@MODULE@Q${module}Qg"
 }
 
 MkModuleLib()
@@ -104,6 +109,11 @@ MkModuleLib()
 
 }
 
+TestExport()
+{
+    echo "Test"
+}
+
 case $1 in
 depend)
     MkDepend $2