lilypond-0.0.40

diff --git a/make/Targets.make b/make/Targets.make
index 884eef7846ed1dfd2c5c8089344f142803450c71..1b894002bcef305ed109a1306ad385158b7f12be 100644 (file)
--- a/make/Targets.make
+++ b/make/Targets.make
@@ -1,13 +1,13 @@
 #
 # project  LilyPond -- the musical typesetter
-# title           generic make rules
-# file    make/Rules.make
+# title           generic make targets
+# file    make/Targets.make
 #
 # Copyright (c) 1997 by    
 #      Jan Nieuwenhuizen <jan@digicash.com>
 #      Han-Wen Nienhuys <hanwen@stack.nl>
 
-.PHONY : all clean default dist doc doc++ dummy exe help lib tags
+.PHONY : all clean config default dist doc doc++ dummy exe help lib TAGS
 
 # target all:
 #
@@ -15,6 +15,24 @@ all:  default
        for i in $(SUBDIRS); do $(MAKE) -C $$i all; done
 #
 
+# platform specific variables,
+#
+include ./$(depth)/make/out/Site.make
+#
+
+# where to do this ?
+.PRECIOUS:  $(makeout)/Site.make
+
+# ... and configure bootstrap :-)
+#
+$(makeout)/Site.make: $(make-dir)/$(genout) $(flower-config) $(lily-config)
+# this is handy, but runs on second "make distclean" too. ah well...
+#      if [ \! -d $(makeout) ]; then mkdir $(makeout); fi
+       touch $@
+       @echo "oeps, sources were not configured!"
+       (cd $(depth); ./configure)
+#
+
 # dependency list of executable:
 #
 EXECUTABLE = $(bindir)/$(NAME)
@@ -22,7 +40,7 @@ $(EXECUTABLE): $(OFILES) $(CUSTOMLIBES)
 #      $(STRIPDEBUG) $(STABLEOBS)
 #      $(LD_COMMAND) -o $@ $^ $(LOADLIBES)
        $(LD_COMMAND) $(OFILES) $(LOADLIBES)
-       touch $(VERSION_DEPENDENCY)
+       -@touch $(VERSION_DEPENDENCY) $(ERROR_LOG)
        $(INCREASE_BUILD)
        touch $(build) #waai necessary?
 #
@@ -34,7 +52,7 @@ exe: $(EXECUTABLE)
 LIBRARY = $(libdir)/$(LIB_PREFIX)$(NAME)$(LIB_SUFFIX)
 $(LIBRARY): $(OFILES) $(CUSTOMLIBES)
        $(AR_COMMAND) $(OFILES)
-       touch $(VERSION_DEPENDENCY)
+       -@touch $(VERSION_DEPENDENCY) $(ERROR_LOG)
        $(INCREASE_BUILD)
        touch $(build) #waai necessary?
 #
@@ -42,17 +60,22 @@ lib: $(LIBRARY)
 #
 
 clean:
-       rm -f $(allexe) core $(allobs) 
+       rm -f $(allexe) core $(allobs) $(alldeps)
        for i in $(SUBDIRS); do $(MAKE) -C $$i clean; done
 
 distclean: clean
-       rm -rf  $(lily-version) $(flower-version) .b $(build) .GENERATE *~ $(allout)
+       rm -rf  $(lily-version) $(flower-version) $(mi2mu-version) .b $(build) *~ $(allout) $(allgen)
 
 
 # configure:
 #
 config:
-       $(bindir)/configure
+       ./$(depth)/configure
+#
+
+# dummydeps:
+#
+dummydep: $(flower-dir)/$(genout) $(lib-dir)/$(genout) $(lily-dir)/$(genout) $(mi2mu-dir)/$(genout) $(DUMMYDEPS)
 #
 
 # value of $(OSTYPE) on windhoos; "make $OSTYPE" if you use bash :-)
@@ -76,7 +99,7 @@ help:
        @echo
        @echo "targets:"
        @echo " all clean config dist distclean doc doc++"
-       @echo " exe help lib moduledist tags"
+       @echo " exe help lib moduledist TAGS"
        @echo " dos:    xcomplile to dos"
        @echo " win32:  native cygnus-win32 compile" 
 #
@@ -110,17 +133,24 @@ localmoduledist:
        for i in $(SUBDIRS); do mkdir $(module-distdir)/$(localdir)/$$i; done
        for i in $(SUBDIRS); do $(MAKE) localdir=$(localdir)/$$i -C $$i localmoduledist; done
 
-all-tags: tags
+all-tags: TAGS
        for i in $(SUBDIRS); do $(MAKE) -C $$i all-tags; done
 
-tags:
+TAGS: $(allcc)
        etags -CT $(allcc) 
 
+# to some outdir?
+autoconf:
+       autoconf -  < configure.in > ac_configure  
+
+
 # version stuff:
 #
 check-flower-version:
        $(MAKE) flower-version -C ./$(depth)/flower
-$(lily-version): ./$(depth)/.version ./$(bindir)/make_version $(build)
+$(lily-version): $(lily-dir)/$(genout) ./$(depth)/.version ./$(bindir)/make_version $(build)
        ./$(bindir)/make_version "$(MAJOR_VERSION)" "$(MINOR_VERSION)" "$(PATCH_LEVEL)" "$(MY_PATCH_LEVEL)" "$(BUILD)" "$(CXX) $(CXXVER)" > $@
+check-mi2mu-version:
+       $(MAKE) mi2mu-version -C ./$(depth)/mi2mu
 #