Merge branch 'lilypond/translation' of ssh://git.sv.gnu.org/srv/git/lilypond into...

[lilypond.git] / lily / GNUmakefile

diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index 2a51dc0474283d7cb52f469e9869a32492fde5bd..f3fb922b53f34184794e7d0e0ff84a909db83c03 100644 (file)
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -5,10 +5,10 @@ NAME = lilypond
 SUBDIRS = include
 
 MODULE_LIBS=$(depth)/flower
-MODULE_INCLUDES= $(depth)/flower/include 
+MODULE_INCLUDES= $(depth)/flower/include
 
 # need this to convert between function pointers and member function pointers.
-MODULE_CXXFLAGS= -Wno-pmf-conversions
+MODULE_CXXFLAGS= -Wno-pmf-conversions 
 
 
 HELP2MAN_EXECS = lilypond
@@ -17,11 +17,8 @@ STEPMAKE_TEMPLATES=c c++ executable po help2man
 # list parser.hh first: making parser.hh removes parser.cc
 OUT_DIST_FILES=$(addprefix $(outdir)/,parser.hh parser.cc)
 
-include $(depth)/make/stepmake.make 
+include $(depth)/make/stepmake.make
 
-ifeq ($(HAVE_LIBKPATHSEA_SO),no)
-MODULE_LDFLAGS += $(KPATHSEA_LIBS)
-endif
 ifeq ($(LINK_GXX_STATICALLY),yes)
 MODULE_LDFLAGS += -L$(outdir) -static-libgcc
 endif
@@ -40,16 +37,16 @@ O_FILES += $(outdir)/lilypond.rc.o
 $(outdir)/lilypond: $(outdir)/lilypond.rc.o
 
 $(outdir)/lilypond.rc.o: $(outdir)/lilypond.ico $(outdir)/ly.ico
-$(top-build-dir)/Documentation/pictures/$(outbase)/lilypond.ico:
-       $(MAKE) -C $(top-build-dir)/Documentation/pictures
+$(top-build-dir)/Documentation/logo/$(outbase)/lilypond.ico:
+       $(MAKE) -C $(top-build-dir)/Documentation/logo
 
-$(outdir)/lilypond.ico: $(top-build-dir)/Documentation/pictures/$(outbase)/lilypond.ico
-       cp $< $@ 
-$(top-build-dir)/Documentation/pictures/$(outbase)/ly.ico:
-       $(MAKE) -C $(top-build-dir)/Documentation/pictures
+$(outdir)/lilypond.ico: $(top-build-dir)/Documentation/logo/$(outbase)/lilypond.ico
+       cp $< $@
+$(top-build-dir)/Documentation/logo/$(outbase)/ly.ico:
+       $(MAKE) -C $(top-build-dir)/Documentation/logo
 
-$(outdir)/ly.ico: $(top-build-dir)/Documentation/pictures/$(outbase)/ly.ico
-       cp $< $@ 
+$(outdir)/ly.ico: $(top-build-dir)/Documentation/logo/$(outbase)/ly.ico
+       cp $< $@
 endif
 
 ETAGS_FLAGS += --regex='{c++}/^LY_DEFINE *(\([^,]+\)/\1/'
@@ -80,7 +77,6 @@ $(outdir)/lexer.cc: $(config_h)
 $(outdir)/parser.cc: $(config_h)
 
 $(outdir)/general-scheme.o: $(outdir)/version.hh
-$(outdir)/kpath.o: $(outdir)/version.hh
 $(outdir)/lily-guile.o: $(outdir)/version.hh
 $(outdir)/lily-version.o: $(outdir)/version.hh