Fix GCC 4.3.0 warnings about parentheses and braces

[lilypond.git] / lily / GNUmakefile

diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index 41692eb1b6113e6aff3676aa0ea9fbeac6340dbb..508020c039397071319436092fc0c93ef138e788 100644 (file)
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -19,12 +19,8 @@ OUT_DIST_FILES=$(addprefix $(outdir)/,parser.hh parser.cc)
 
 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
@@ -81,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