X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2FGNUmakefile;h=4056eefb938bf6de297735f2202a6d44f8802be2;hb=16e626a8524421eda692cb19be6d0ec5bff723b7;hp=508020c039397071319436092fc0c93ef138e788;hpb=e344ae579fa1d81fc6c6f3049494697872fd39f9;p=lilypond.git diff --git a/lily/GNUmakefile b/lily/GNUmakefile index 508020c039..4056eefb93 100644 --- a/lily/GNUmakefile +++ b/lily/GNUmakefile @@ -37,15 +37,15 @@ 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 +$(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 @@ -57,7 +57,7 @@ default: $(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