partial: 0.0.38.hanjan

[lilypond.git] / Makefile

diff --git a/Makefile b/Makefile
index 10ad8c1642fd81fb2f7248f877002dc001955e5e..c990a7246c1356fc06293bb228f6c8deaa094539 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,6 @@
+# Makefile
+# top level makefile of LilyPond
+
 include Variables.make 
 
 .SUFFIXES:
@@ -6,41 +9,43 @@ include Variables.make
 
 $(exe): $(obs)
        $(STRIPDEBUG) $(STABLEOBS)
-       $(CXX) -o $@ $^ $(LOADLIBES)
+       $(LINKER) -o $@ $^ $(LOADLIBES)
 
+$(m2m):        $(m2mobs)
+       $(LINKER) -o $@ $^ $(LOADLIBES)
 
-.PHONY: clean
+.PHONY: clean docxx
 
 clean:
-       rm -f $(exe) $(DOCDIR)/* core $(obs) $(ALLDEPS)
+       rm -f $(allexe) $(DOCDIR)/* core $(allobs) 
        for SUBDIR in $(SUBDIRS); \
        do \
                $(MAKE) SUBDIR=$$SUBDIR -C $$SUBDIR clean;\
        done
 
 distclean: clean
-       rm -f  version.hh $(gencc) .GENERATE *~ $(ALLDEPS)
+       rm -f  version.hh $(gencc) .GENERATE *~ $(ALLDEPS) 
 
-all: kompijl doc
+all: $(exe) $(m2m) doc
 
-win32: # value of $(OSTYPE) on windhoos; "make $OSTYPE" if u use bash :-)
+# value of $(OSTYPE) on windhoos; "make $OSTYPE" if you use bash :-)
+win32: 
        $(MAKE) -C . CXX=g++ 
 
 doc:
        $(MAKE) -C Documentation doc
 
 # doc++ documentation of classes
-docpp: $(progdocs)
-       -mkdir $(DOCDIR)
-       doc++ -p -I -d $(DOCDIR) $^
+docxx: $(progdocs)     
+       doc++ -kp -d $(DOCDIR) $^
+
+
+include $(DEPDIR)/*.dep
 
 $(OBJECTDIR)/%.o: $(CCDIR)/%.cc
        $(DODEP)\
        $(CXX) -c $(CXXFLAGS) $(OUTPUT_OPTION) 
 
-
-include $(DEPDIR)/*.dep
-
 $(OBJECTDIR)/version.o: $(obs) $(HEADERDIR)/version.hh
 
 include Generate.make