release: 0.1.59

[lilypond.git] / make / Targets.make

diff --git a/make/Targets.make b/make/Targets.make
index c65d9f86199dd498dfefb5d5a3fb9e038196c6be..c696163f145b32bc013165fc5e166dc9e47fc1c0 100644 (file)
--- a/make/Targets.make
+++ b/make/Targets.make
@@ -13,25 +13,14 @@
 # target all:
 #
 all:    default
-ifdef SUBDIRS
-       set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i all; done
-endif
-
-#
-
-# platform specific variables,
-#
-#include ./$(depth)/make/out/Site.make
-#
-
-# where to do this ?
-.PRECIOUS:  $(makeout)/Site.make
-
+       $(LOOP)
 # dependency list of executable:
 #
 
-$(EXECUTABLE):  $(OFILES) $(outdir)/version.hh
-       $(MAKE) $(MODULE_LIBDEPS) 
+$(EXECUTABLE): $(configheader) $(OFILES) $(outdir)/version.hh
+ifdef MODULE_LIBDEPS
+       $(MAKE) $(MODULE_LIBDEPS)
+endif
 ifdef STABLEOBS
        $(DO_STRIP) $(STABLEOBS)
 endif
@@ -42,11 +31,11 @@ exe: $(EXECUTABLE)
 
 # dependency list of library:
 #
-$(LIBRARY):  $(OFILES)
+$(LIBRARY): $(configheader) $(OFILES)
        $(AR_COMMAND) $(OFILES)
        $(RANLIB_COMMAND)
 
-$(SHAREDLIBRARY):   $(OFILES) $(MODULE_LIBDEPS)
+$(SHAREDLIBRARY):  $(configheader) $(OFILES) $(MODULE_LIBDEPS)
        $(LD_COMMAND) $(OFILES) -o $@.$(VERSION)
        rm -f $@
        ln -sf $(outdir)/$(LIB_PREFIX)$(NAME).so.$(VERSION) $@.$(MAJOR_VERSION)
@@ -57,26 +46,28 @@ lib: $(LIBRARY)
 #
 
 
-make-all-outdirs: make-outdir
-       set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i make-all-outdirs; done
+outdirs: outdir
+       $(LOOP)
 
-make-outdir:
-       -mkdir $(OUTDIR_NAME)
+outdir:
+       -mkdir $(outdir)
 
 # be careful about deletion.
 clean: localclean
-       rm -f $(outdir)/*
+       -rm -f $(outdir)/*
        touch $(outdir)/dummy.dep
-ifdef SUBDIRS
-       set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i clean; done
-endif
+       $(LOOP)
+
+distclean: clean 
+       $(LOOP)
+       $(MAKE) local-distclean
+
+maintainerclean: 
+       $(LOOP)
+       $(MAKE) local-maintainerclean
+       $(MAKE) local-distclean
 
-distclean: subdir-distclean local-distclean
 
-subdir-distclean:
-ifdef SUBDIRS
-       set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i clean; done
-endif
 
 # configure:
 #
@@ -154,12 +145,11 @@ doosdist:
        rm -rf $(distdir)/
 
 
-localdist: $(DISTFILES)
-       if [ -d out ]; then \
-               mkdir $(distdir)/$(localdir)/out; \
-               touch $(distdir)/$(localdir)/out/dummy.dep; \
-       fi
+localdist: $(DISTFILES) $(OUT_DISTFILES)
+       touch $(outdir)/dummy.dep; \
+       mkdir $(distdir)/$(localdir)/out; \
        $(LN) $(DISTFILES) $(distdir)/$(localdir)
+       $(LN) $(outdir)/dummy.dep $(OUT_DISTFILES) $(distdir)/$(localdir)/out
 ifdef SUBDIRS
        set -e; for i in $(SUBDIRS); do mkdir $(distdir)/$(localdir)/$$i; \
                $(MAKE) localdir=$(localdir)/$$i -C $$i localdist; done
@@ -171,9 +161,7 @@ ifdef all-tag-sources
        -etags -CT $(all-tag-sources) $(ERROR_LOG)
        -ctags -CT $(all-tag-sources) $(ERROR_LOG)
 endif
-ifdef SUBDIRS
-       set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i TAGS ; done
-endif
+       $(LOOP)
 
 
 # version stuff:
@@ -192,20 +180,18 @@ localclean:
 
 local-distclean:
 
+local-maintainerclean:
+
 install-strip:
        $(MAKE) INSTALL="$(INSTALL) -s" install
 
 install: localinstall
-ifdef SUBDIRS
-       set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i install; done
-endif
+       $(LOOP)
 
 localinstall:
 
 uninstall: localuninstall
-ifdef SUBDIRS
-       set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i uninstall; done
-endif
+       $(LOOP)
 
 localuninstall:
 
@@ -241,6 +227,8 @@ check-rpm-doc-deps:
 check-mf-deps:
        $(MAKE) -C $(depth)/mf
 
+$(configheader): $(depth)/$(configuration).hh
+       cp $< $@