X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fstepmake%2Fgeneric-targets.make;h=57c20901e640a8b8a730c492865847a65f27781e;hb=79d916d1fa2a921732f7432e87b25058693be370;hp=1d368b0a4b5386d04c03a7b152760d2c523abbaf;hpb=9efbad2d9487a05b04423e7e9f062968e8f8eaf4;p=lilypond.git

diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index 1d368b0a4b..57c20901e6 100644
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -1,20 +1,25 @@
 # title	   generic make targets
 # file	   make/Targets.make
 
-.PHONY : all clean config default dist doc doc++  exe help html lib TAGS\
+.PHONY : all clean config default diff dist doc exe help html lib TAGS\
 	 po
-# VPATH=$(outdir)/		#ugh?
-# target all:
-#
+
 all:	 default
 	$(LOOP)
 
+man:
+	$(LOOP)
 
 # be careful about deletion.
-clean: localclean
+clean: local-clean
 	-rm -f $(outdir)/*
 	$(LOOP)
 
+ifneq ($(strip $(depth)),.)
+dist:
+	make -C $(depth) dist
+endif
+
 distclean: clean 
 	$(LOOP)
 	$(MAKE) local-distclean
@@ -37,69 +42,39 @@ config:
 generic-help:
 	@echo -e "\
 Makefile for $(PACKAGE_NAME) $(TOPLEVEL_VERSION)\n\
-Usage: $(MAKE) ["VARIABLE=value"]... [TARGET]\n\
+Usage: make ["VARIABLE=value"]... [TARGET]\n\
 \n\
 Targets:\n"
 
 help: generic-help local-help
 	@echo -e "\
   all         update everything\n\
-  clean       remove all genated stuff in $(oudir)\n\
-  config      rerun configure\n\
-  deb         build Debian package\n\
+  clean       remove all genated stuff in $(outdir)\n\
   default     same as the empty target\n\
-  diff        generate patch: $(package)-$(TOPLEVEL_VERSION).diff.gz\n\
-  .           Options:\n\
-  .             from=0.1.74\n\
-  .             help==\n\
-  .             release==\n\
-  .             to=0.1.74.jcn2\n\
-  distclean   cleaner than clean (duh)\n\
-  doc         update all documentation\n\
-  doc++       make doc++ documentation\n\
   exe         update all executables\n\
   help        this help\n\
   install     install programs and data (prefix=$(prefix))\n\
   lib         update all libraries\n\
-  release     roll tarball and generate patch\n\
-  rpm         build RedHat package\n\
-  tar         same as dist\n\
   TAGS        genarate tagfiles\n\
-  zip         build binary doze distribution\n\
 \n\
 Make may be invoked from any subdirectory\n\
-Note that all commands recurse into SUBSDIRS\n\
+Note that all commands recurse into SUBDIRS;\n\
+prepend \`local-' to do only cwd, eg: local-clean\n\
 "\
 #
 
 local-help:
 
-doc:
-#UGH
-	true #	$(MAKE) -C $(depth)/Documentation all
-
-
-# Ugh.  C++ specific.
-doc++:
-	(cd $(outdir); sh ../$(step-bindir)/tar-docxx.sh $(package)-$(TOPLEVEL_VERSION).tar.gz)
-
-
-
 local-dist: $(DIST_FILES) $(OUT_DIST_FILES) $(NON_ESSENTIAL_DIST_FILES)
-#	echo topdir=$(topdir)
-#	echo distdir=$(distdir)
-#	echo locladir=$(localdir)
 	mkdir -p $(distdir)/$(localdir)
 	$(LN) $(DIST_FILES) $(distdir)/$(localdir)
 
-#UGH UGH . make ifdef doesn't mix with string substitution semantics (late expansion vs. early expansion)
-# 
 	case "$(NON_ESSENTIAL_DIST_FILES)x" in x) ;; *) \
 		$(LN) $(NON_ESSENTIAL_DIST_FILES) $(distdir)/$(localdir);; \
 	esac
 
 	case "$(OUT_DIST_FILES)x" in x) ;; *) \
-		mkdir $(distdir)/$(localdir)/out; \
+		mkdir -p $(distdir)/$(localdir)/out; \
 		$(LN) $(OUT_DIST_FILES) $(distdir)/$(localdir)/out;; \
 	esac
 #	$(foreach i, $(SUBDIRS), $(MAKE) distdir=../$(distdir) localdir=$(localdir)/$(i) -C $(i) local-dist &&) true
@@ -112,25 +87,28 @@ html: $(HTML_FILES)
 
 TAGS:
 	-if [ "$(TAGS_FILES)" != "" ]; then \
-		etags -CT $(TAGS_FILES) || \
-		ctags -h ".h.hh.tcc.icc" $(TAGS_FILES) $(ERROR_LOG); \
+		etags $(ETAGS_FLAGS) $(TAGS_FILES) || \
+		ctags $(CTAGS_FLAGS) ".h.hh.tcc.icc" $(TAGS_FILES) $(ERROR_LOG); \
 	fi
 
 	$(LOOP)
 
 # ugh . -> $(outdir)
 $(outdir)/VERSION: $(depth)/VERSION
-	cp $< $@
+	cp -p $< $@
 
 $(outdir)/version.hh: $(outdir)/VERSION
-	sh $(step-bindir)/make-version.sh $< > $@
+	$(PYTHON) $(step-bindir)/make-version.py $< > $@
+
+$(outdir)/config.h: $(config_h)
+	cp -p $< $@
 
 # should this be in Rules?
 configure: configure.in aclocal.m4
-	autoconf - < $<> $@
+	autoconf 
 	chmod +x configure
 
-localclean:
+local-clean:
 
 local-distclean:
 
@@ -139,32 +117,27 @@ local-maintainerclean:
 install-strip:
 	$(MAKE) INSTALL="$(INSTALL) -s" install
 
-install: localinstall
+install: local-install
 	$(LOOP)
 
-localinstall:
+local-install:
 
-uninstall: localuninstall
+uninstall: local-uninstall
 	$(LOOP)
 
-localuninstall:
+local-uninstall:
 
 installextradoc:
 	-$(INSTALL) -d $(prefix)/doc/$(package)
 	$(foreach i, $(EXTRA_DOC_FILES),\
 		cp -r $(i) $(prefix)/doc/$(package) &&) true
 
-WWW: local-WWW
-	$(LOOP)
-
-local-WWW:
-
 include $(stepdir)/package.make
 
 include $(outdir)/dummy.dep $(DEP_FILES)
 
 $(outdir)/dummy.dep:
-	-mkdir $(outdir)
+	-mkdir -p $(outdir)
 	touch $(outdir)/dummy.dep
 
 
@@ -175,8 +148,8 @@ local-check:
 
 # ugh.  ugh ugh ugh
 $(depth)/$(configuration).make: $(depth)/configure
-	@echo "**************************************"
+	@echo "************************************************************"
 	@echo "configure changed! You should probably reconfigure manually."
-	@echo "**************************************"
+	@echo "************************************************************"
 	(cd $(depth); ./config.status)
 	touch $@		# do something for multiple simultaneous configs.