include $(depth)/make/stepmake.make
-ifeq ($(HAVE_LIBKPATHSEA_SO),no)
-MODULE_LDFLAGS += $(KPATHSEA_LIBS)
-endif
ifeq ($(LINK_GXX_STATICALLY),yes)
-LD = $(CC) # GCC-4.0.x will never link statically to allow exceptions
-MODULE_LDFLAGS += -L$(outdir) -static-libgcc -lstdc++
+MODULE_LDFLAGS += -L$(outdir) -static-libgcc
endif
CXXFLAGS += -Woverloaded-virtual
$(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
+$(outdir)/lilypond.ico: $(top-build-dir)/Documentation/logo/$(outbase)/lilypond.ico
cp $< $@
-$(top-build-dir)/Documentation/pictures/$(outbase)/ly.ico:
- $(MAKE) -C $(top-build-dir)/Documentation/pictures
+$(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
+$(outdir)/ly.ico: $(top-build-dir)/Documentation/logo/$(outbase)/ly.ico
cp $< $@
endif
$(outdir)/libstdc++.a:
rm -f $@
- ln -s `$(CXX) -print-file-name=libstdc++.a` $(outdir)/
+ ln -s `$(CXX) -print-file-name=libstdc++.a` $(outdir)
ifeq ($(LINK_GXX_STATICALLY),yes)
$(outdir)/lilypond: $(outdir)/libstdc++.a
$(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