lilypond-0.1.53

diff --git a/lib/Makefile.am.wild b/lib/Makefile.am.wild
index 3185791ed7d9b1bd433ffa013e300be3228bc659..8526bd5784e78e8aaaebc14439eaf009878eeb76 100644 (file)
--- a/lib/Makefile.am.wild
+++ b/lib/Makefile.am.wild
@@ -13,10 +13,10 @@ lib_LTLIBRARIES = liblily.la
 
 liblily_la_SOURCES = $(wildcard *.cc)
 
-INCLUDES = -Iinclude -I../flower/include
+INCLUDES = -I$(top_srcdir)/lib/include -I$(top_srcdir)/flower/include
 MODULE_CXXFLAGS += -D_REENTRANT
 
-EXTRA_DIST = Makefile.am.wild
+EXTRA_DIST = Makefile.am.wild GNUmakefile
 
 distclean-local:
        -rm -rf .deps

diff --git a/lily/Makefile.am.wild b/lily/Makefile.am.wild
index f5050d47d044557b31c34355970cf829a94e00de..35e6cd2e65a43d92c91c61a312451058b74bcd6e 100644 (file)
--- a/lily/Makefile.am.wild
+++ b/lily/Makefile.am.wild
@@ -11,8 +11,14 @@ SUBDIRS = include
 bin_PROGRAMS = lilypond
 
 nowildcard: lexer.cc parser.cc
- 
+
 lilypond_SOURCES = $(wildcard *.cc *.ll *.yy)
+
+# howto do this? info is not all that clear...
+# OMIT_DEPENDENCIES = lexer.cc parser.cc
+# lilypond_OMIT_DEPENDENCIES = lexer.cc parser.cc
+# lilypondOMIT_DEPENDENCIES = lexer.cc parser.cc
+
 noinst_HEADERS = parser.hh
 
 #lilypond_LDADD = -llily -lflower @LEXLIB@
@@ -20,7 +26,7 @@ lilypond_LDADD = $(top_builddir)/lib/liblily.la $(top_builddir)/flower/libflower
 
 lilypond_LDFLAGS = -L$(absolute_builddir)/lib/.libs -L$(absolute_builddir)/flower/.libs
 
-INCLUDES =  -I$(srcdir)/include -I$(srcdir)/../lib/include -I$(srcdir)/../flower/include 
+INCLUDES =  -I$(top_srcdir)/lily/include -I$(top_srcdir)/lib/include -I$(top_srcdir)/flower/include 
 
 EXTRA_DIST = Makefile.am.wild GNUmakefile Stable.make VERSION
 
@@ -38,11 +44,14 @@ parser.hh: parser.yy
        mv $<.tab.h $@
        mv $<.tab.c $(shell basename $@ .hh).cc
 
+distclean-local:
+       -rm -rf .deps
+
 # override default target for all-am: to get an extra dependency
 all-am: Makefile $(PROGRAMS) wild-check
 
 # dummy target for non-GNU makes; is overridden in GNUmakefile
 wild-check:
 
-distclean-local:
-       -rm -rf .deps
+# dummy target for non-GNU makes; is overridden in GNUmakefile
+make-in-build:

diff --git a/mi2mu/Makefile.am.wild b/mi2mu/Makefile.am.wild
index cced5f03007171bf7260bde03c39d46574a8587c..1330e7dfdb335e92ccc0fadc0022202576fcb660 100644 (file)
--- a/mi2mu/Makefile.am.wild
+++ b/mi2mu/Makefile.am.wild
@@ -18,16 +18,16 @@ mi2mu_SOURCES = $(wildcard *.cc)
 # mi2mu_LDFLAGS = -L$(absolute_builddir)/lib/.libs -L$(absolute_builddir)/flower/.libs
 mi2mu_LDADD = $(top_builddir)/lib/liblily.la $(top_builddir)/flower/libflower.la @LEXLIB@
  
-
-INCLUDES = -I$(srcdir)/include -I$(srcdir)/../lib/include -I$(srcdir)/../flower/include
+INCLUDES =  -I$(top_srcdir)/mi2mu/include -I$(top_srcdir)/lib/include -I$(top_srcdir)/flower/include 
 
 EXTRA_DIST = Makefile.am.wild GNUmakefile VERSION TODO
 
+distclean-local:
+       -rm -rf .deps
+
 # override default target for all-am: to get an extra dependency
 all-am: Makefile $(PROGRAMS) wild-check
 
 # dummy target for non-GNU makes; is overridden in GNUmakefile
 wild-check:
 
-distclean-local:
-       -rm -rf .deps