Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / stepmake / stepmake / generic-targets.make

diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index 7f7206695529d0cf3c3a42b714b06718fa623c06..7546bbd2b5565840b29e1e64bbc9ad8e9b77a38f 100644 (file)
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -7,21 +7,26 @@ all:   default
 man:
        $(LOOP)
 
-# be careful about deletion.
 clean: local-clean
-       -rm -f $(outdir)/*
+       -rm -rf "./$(outdir)"
        $(LOOP)
 
 ifneq ($(strip $(depth)),.)
 dist:
-       make -C $(depth) dist
+       $(MAKE) -C $(depth) dist
 endif
 
-distclean: clean 
+distclean: clean
        $(LOOP)
        $(MAKE) local-distclean
 
-maintainerclean: 
+cvs-clean:
+       $(MAKE) local-distclean
+       rm -rf out
+       rm -rf out-www
+       rm -f aclocal.m4 configure
+
+maintainerclean:
        $(LOOP)
        $(MAKE) local-maintainerclean
        $(MAKE) local-distclean
@@ -30,7 +35,7 @@ maintainerclean:
 # configure:
 #
 config:
-       ./$(depth)/configure
+       ./$(src-depth)/configure
 #
 
 
@@ -43,8 +48,6 @@ Usage: make ["VARIABLE=value"]... [TARGET]\n\
 \n\
 Targets:\n"
 
-# urg
-webdir = $(local_package_docdir)
 help: generic-help local-help
        @echo -e "\
   all         update everything\n\
@@ -65,23 +68,21 @@ Note that all commands recurse into subdirectories;\n\
 prepend \`local-' to restrict operation to the current directory.\n\
 Example: \`local-clean'.\n"
 
+# "
 local-help:
 
 local-dist: $(DIST_FILES) $(OUT_DIST_FILES) $(NON_ESSENTIAL_DIST_FILES)
        mkdir -p $(distdir)/$(localdir)
-       $(LN) $(DIST_FILES) $(distdir)/$(localdir)
+       $(LN) $(DIST_FILES:%=$(src-dir)/%) $(distdir)/$(localdir)
 
        case "$(NON_ESSENTIAL_DIST_FILES)x" in x) ;; *) \
-               $(LN) $(NON_ESSENTIAL_DIST_FILES) $(distdir)/$(localdir);; \
+               $(LN) $(NON_ESSENTIAL_DIST_FILES:%=$(src-dir)/%) $(distdir)/$(localdir);; \
        esac
-
        case "$(OUT_DIST_FILES)x" in x) ;; *) \
                mkdir -p $(distdir)/$(localdir)/$(outdir); \
                $(LN) $(OUT_DIST_FILES) $(distdir)/$(localdir)/$(outdir);; \
        esac
-#      $(foreach i, $(SUBDIRS), $(MAKE) distdir=../$(distdir) localdir=$(localdir)/$(i) -C $(i) local-dist &&) true
-# absolute for installed stepmake
-       $(foreach i, $(SUBDIRS), $(MAKE) topdir=$(topdir) distdir=$(distdir) localdir=$(localdir)/$(notdir $(i)) -C $(i) local-dist &&) true
+       $(foreach i, $(SUBDIRS), $(MAKE) top-src-dir=$(top-src-dir) distdir=$(distdir) localdir=$(localdir)/$(notdir $(i)) -C $(i) local-dist &&) true
 
 
 
@@ -107,7 +108,7 @@ $(outdir)/config.hh: $(config_h)
        cp -p $< $@
 
 configure: configure.in aclocal.m4
-       NOCONFIGURE=yes $(srcdir)/autogen.sh
+       NOCONFIGURE=yes $(src-depth)/autogen.sh
        chmod +x configure
 
 local-clean:
@@ -117,9 +118,11 @@ local-distclean:
 local-maintainerclean:
 
 install-strip:
-       $(MAKE) INSTALL="$(INSTALL) -s" install
+       $(MAKE) INSTALLPY="$(INSTALLPY) -s" install
 
-ifneq ($(strip $(depth)),.)
+ifeq ($(strip $(depth)),.)
+final-install:
+else
 final-install:
        $(LOOP)
 
@@ -135,9 +138,8 @@ uninstall: local-uninstall
 local-uninstall:
 
 installextradoc:
-       -$(INSTALL) -d $(DESTDIR)$(prefix)/doc/$(package)
-       $(foreach i, $(EXTRA_DOC_FILES),\
-               cp -r $(i) $(prefix)/doc/$(package) &&) true
+       -$(INSTALLPY) -d $(DESTDIR)$(prefix)/doc/$(package)
+       cp -r $(EXTRA_DOC_FILES) $(prefix)/doc/$(package)
 
 include $(outdir)/dummy.dep $(wildcard $(outdir)/*.dep) # expect a warning here
 
@@ -145,6 +147,7 @@ $(outdir)/dummy.dep:
        @echo please ignore innocent warning about dummy.dep
        -mkdir -p $(outdir)
        touch $(outdir)/dummy.dep
+       echo '*' > $(outdir)/.gitignore
 
 check: local-check
        $(LOOP)
@@ -152,11 +155,11 @@ check: local-check
 local-check:
 
 # ugh.  ugh ugh ugh
-$(config_make): $(topdir)/configure
+$(config_make): $(top-src-dir)/configure
        @echo "************************************************************"
        @echo "configure changed! You should probably reconfigure manually."
        @echo "************************************************************"
-       (cd $(builddir); ./config.status)
+       (cd $(top-build-dir); ./config.status)
        touch $@                # do something for multiple simultaneous configs.
 
 
@@ -165,11 +168,11 @@ deb:
        cd $(depth) && debuild
 
 diff:
-       $(PYTHON) $(step-bindir)/package-diff.py  --outdir=$(topdir)/$(outdir) --package=$(topdir) $(makeflags)
+       $(PYTHON) $(step-bindir)/package-diff.py  --outdir=$(top-src-dir)/$(outdir) --package=$(top-src-dir) $(makeflags)
        -ln -f $(depth)/$(outdir)/$(distname).diff.gz $(patch-dir)
 
-release: 
-       $(PYTHON) $(step-bindir)/release.py --outdir=$(topdir)/$(outdir) --package=$(topdir)
+release:
+       $(PYTHON) $(step-bindir)/release.py --outdir=$(top-src-dir)/$(outdir) --package=$(top-src-dir)
 
 
 ################ website.
@@ -184,6 +187,6 @@ WWW: local-WWW
 WWW-post: local-WWW-post
        $(LOOP)
 
-web: 
+web:
        $(MAKE) out=www WWW
        $(MAKE) out=www WWW-post