X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2FTargets.make;h=ce3ecb34e8df283b27cf5ce585a1185a90b91345;hb=633bc1bf0b705e17df83311e3c90b289f087d726;hp=c696163f145b32bc013165fc5e166dc9e47fc1c0;hpb=225485917d3e66bd7eb907d6462e981ae1bd1654;p=lilypond.git

diff --git a/make/Targets.make b/make/Targets.make
index c696163f14..ce3ecb34e8 100644
--- 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:
 #
@@ -33,6 +33,7 @@ exe: $(EXECUTABLE)
 #
 $(LIBRARY): $(configheader) $(OFILES)
 	$(AR_COMMAND) $(OFILES)
+	$(AR) ts $@		#silly irix
 	$(RANLIB_COMMAND)
 
 $(SHAREDLIBRARY):  $(configheader) $(OFILES) $(MODULE_LIBDEPS)
@@ -45,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
@@ -110,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:
@@ -128,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)/
 
@@ -208,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
 
@@ -230,7 +238,8 @@ check-mf-deps:
 $(configheader): $(depth)/$(configuration).hh
 	cp $< $@
 
-
+WWW: local-WWW
+	$(LOOP)
 
 ifneq ($(DEPFILES),)
 include $(DEPFILES)