From: fred <fred>
Date: Tue, 26 Mar 2002 21:28:19 +0000 (+0000)
Subject: lilypond-1.1.0
X-Git-Tag: release/1.5.59~2817
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c745a054fe0cdd306f1981e0a4eab1ee82394ee8;p=lilypond.git

lilypond-1.1.0
---

diff --git a/init/paper20.ly b/init/paper20.ly
index a67683b655..cf6e0dbe95 100644
--- a/init/paper20.ly
+++ b/init/paper20.ly
@@ -23,7 +23,7 @@ paper_twenty = \paper {
 	-2 = \symboltables { \table_thirteen }	
 	-1 = \symboltables { \table_sixteen }
 	0 = \symboltables { \table_twenty }
-	
+
 	\include "params.ly";
 }
 
diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index cf4db4c84a..e8691e9ac2 100644
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -8,6 +8,9 @@ SUBDIRS = include
 
 MODULE_LIBS=$(depth)/lib $(depth)/flower
 
+EXTRA_LIBES=-lguile		#ugh
+BLA_LIBES=-lguile		#ugh
+
 STEPMAKE_TEMPLATES= c++ executable 
 
 include $(depth)/make/stepmake.make 
diff --git a/stepmake/stepmake/executable-vars.make b/stepmake/stepmake/executable-vars.make
index 1bb8bf6d7f..fb32b06344 100644
--- a/stepmake/stepmake/executable-vars.make
+++ b/stepmake/stepmake/executable-vars.make
@@ -1 +1,5 @@
 # empty
+LDFLAGS = $(ILDFLAGS) $(USER_LDFLAGS) $(EXTRA_LDFLAGS) $(MODULE_LDFLAGS) $($(PACKAGE)_LDFLAGS)
+
+MODULE_LIBES=$(addsuffix /$(outdir)/library.a, $(MODULE_LIBS))
+LOADLIBES = $(MODULE_LIBES) $($(PACKAGE)_LIBES) $(EXTRA_LIBES) $(BLA_LIBES)#u8gh
diff --git a/stepmake/stepmake/generic-vars.make b/stepmake/stepmake/generic-vars.make
index 223c59d093..811dd0d3a2 100644
--- a/stepmake/stepmake/generic-vars.make
+++ b/stepmake/stepmake/generic-vars.make
@@ -13,20 +13,21 @@
 # not eh, normally used
 DEPTH = $(depth)/$(package-depth)
 
+# topdir := $(shell cd $(depth); pwd)
+ifeq ($(topdir),)
 topdir := $(shell cd $(depth); pwd)
+endif
 pwd := $(shell pwd)
 
-
 # derived names
 ifeq ($(distdir),)
-  distdir = $(depth)/$(outdir)/$(DIST_NAME)
+#  distdir = $(depth)/$(outdir)/$(DIST_NAME)
+# must be absolute for 'make dist' with installed stepmake
+  distdir = $(topdir)/$(outdir)/$(DIST_NAME)
   DIST_NAME = $(package)-$(TOPLEVEL_VERSION)
 endif
 distname = $(package)-$(TOPLEVEL_VERSION)
 
-
-
-
 # obsolete?
 makeout = $(depth)/make/$(outdir)
 docout = $(depth)/Documentation/$(outdir)
@@ -38,8 +39,9 @@ po-dir = $(depth)/po
 # sort-out which of these are still needed
 #
 $(package)_bindir = $(depth)/bin
-step-bindir = $(depth)/$(stepmake)/bin
-abs-step-bindir = $(topdir)/$(stepmake)/bin
+step-bindir = $(stepmake)/bin
+# deprecated
+# abs-step-bindir = $(topdir)/$(stepmake)/bin
 #
 group-dir = $(shell cd $(DEPTH)/..; pwd)
 release-dir = $(group-dir)/releases
@@ -83,10 +85,7 @@ date := $(shell date +%x)	#duplicated?
 ARFLAGS = ru
 
 INCLUDES =  include $(outdir) $($(PACKAGE)_INCLUDES)
-LDFLAGS = $(ILDFLAGS) $(USER_LDFLAGS) $(EXTRA_LDFLAGS) $(MODULE_LDFLAGS) $($(PACKAGE)_LDFLAGS)
 
-MODULE_LIBES=$(addsuffix /$(outdir)/library.a, $(MODULE_LIBS))
-LOADLIBES = $(MODULE_LIBES) $($(PACKAGE)_LIBES) $(EXTRA_LIBES)
 # urg: for windows ?
 # LOADLIBES = $(MODULE_LIBES) $($(PACKAGE)_LIBES) $(EXTRA_LIBES) -lstdc++
 #
@@ -134,7 +133,7 @@ endif
 
 # substitute $(STRIP) in Site.make if you want stripping
 DO_STRIP=true
-LOOP=$(foreach i,  $(SUBDIRS),  $(MAKE) -C $(i) $@ &&) true
+LOOP=$(foreach i,  $(SUBDIRS), $(MAKE) PACKAGE=$(PACKAGE) -C $(i) $@ &&) true
 
 
 include $(stepdir)/files.make