release: 0.1.65

[lilypond.git] / make / Targets.make

diff --git a/make/Targets.make b/make/Targets.make
index 37135f0f460c426923f97636b94fef08e89813cf..945587c0ff50cb30f86962e4a0cef3a848788b06 100644 (file)
--- a/make/Targets.make
+++ b/make/Targets.make
@@ -7,8 +7,8 @@
 #      Jan Nieuwenhuizen <jan@digicash.com>
 #      Han-Wen Nienhuys <hanwen@stack.nl>
 
-.PHONY : all clean config default dist doc doc++ dummy exe help lib TAGS html\
-       check-flower-deps check-lib-deps check-doc-deps
+.PHONY : all clean config default dist doc doc++ dummy exe help html lib TAGS\
+       check-flower-deps check-lib-deps check-doc-deps check-html-deps
 
 # target all:
 #
@@ -46,12 +46,11 @@ $(SHAREDLIBRARY):  $(configheader) $(OFILES) $(MODULE_LIBDEPS)
 lib: $(LIBRARY)
 #
 
-
 outdirs: outdir
        $(LOOP)
 
 outdir:
-       -mkdir $(outdir)
+       -mkdir -p $(outdir)
 
 # be careful about deletion.
 clean: localclean
@@ -111,8 +110,10 @@ help:
 #
 
 doc:
-       $(MAKE) -C $(depth)/Documentation do-doc
+#      $(MAKE) -C $(depth)/Documentation do-doc
+       $(MAKE) -C $(depth)/Documentation all
 
+html: $(HTMLFILES)
 
 # ugh. should generate in out/
 dist:
@@ -129,19 +130,22 @@ dist:
 
 # ugh. should generate in out/
 dozedist: doosdist
-doosdist:
+doosdist: check-mf-deps
+       rm -rf $(distdir)
        -mkdir $(distdir)
-#      nogo, SUBDIRS is handed down to subdir...
-#      $(MAKE) SUBDIRS="Documentation init input tex" localdist
        $(MAKE) localdist
        chmod -Rf a+rX $(distdir)
 #      ugh, the ugly way, then
+       rm -f $(distdir)/mf/$(outdir)/*.log
+       # urg
+       (cd $(distdir)/init; ln -s ../../../mf/out/*.ly .)
+       (cd $(distdir)/tex; ln -s ../../../mf/out/*.tex .)
        (cd $(distdir); rm -rf $(NO_DOOS_DIST))
-       cp $(lilyout)/lilypond.exe $(distdir)
-       strip -s $(distdir)/lilypond.exe
-       cp $(mi2muout)/mi2mu.exe $(distdir)
-       strip -s $(distdir)/mi2mu.exe
-       (cd ./$(depth); $(ZIP) $(DIST_NAME).exe.zip $(distdir))
+       ln $(lilyout)/lilypond $(distdir)/bin/lilypond.exe
+       -strip -s $(distdir)/bin/lilypond.exe
+       ln $(mi2muout)/mi2mu $(distdir)/bin/mi2mu.exe
+       -strip -s $(distdir)/bin/mi2mu.exe
+       (cd ./$(depth)/$(outdir); $(ZIP) $(DIST_NAME).exe.zip $(DIST_NAME))
 # should be trapped
        rm -rf $(distdir)/
 
@@ -160,7 +164,7 @@ endif
 TAGS:$(all-tag-sources)
 ifdef all-tag-sources
        -etags -CT $(all-tag-sources) $(ERROR_LOG)
-       -ctags -CT $(all-tag-sources) $(ERROR_LOG)
+       -ctags -h ".h.hh.tcc.icc" $(all-tag-sources) $(ERROR_LOG)
 endif
        $(LOOP)
 
@@ -209,6 +213,9 @@ check-lib-deps: check-flower-deps
 check-doc-deps:
        $(MAKE) -C $(depth)/Documentation
 
+check-html-deps:
+       $(MAKE) -C $(depth)/Documentation html
+
 $(LIBLILY): dummy
        $(MAKE) ./$(outdir)/$(@F) -C $(depth)/lib
 
@@ -234,9 +241,6 @@ $(configheader): $(depth)/$(configuration).hh
 WWW: local-WWW
        $(LOOP)
 
-local-WWW:
-
-
 ifneq ($(DEPFILES),)
 include $(DEPFILES)
 endif