* stepmake/stepmake/compile-vars.make:

* stepmake/stepmake/executable-rules.make:
* stepmake/stepmake/python-module-rules.make:
* stepmake/stepmake/shared-library-rules.make: Use ALL_LDFLAGS, to
guard agains user override of LDFLAGS.

diff --git a/ChangeLog b/ChangeLog
index 5236dd34d9b525ee1cbdff869abb0348e58ace6c..516d56e8fc7fbd3860e4637b2e07ff9c879504ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2002-07-18  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * stepmake/stepmake/compile-vars.make: 
+       * stepmake/stepmake/executable-rules.make: 
+       * stepmake/stepmake/python-module-rules.make:
+       * stepmake/stepmake/shared-library-rules.make: Use ALL_LDFLAGS, to
+       guard agains user override of LDFLAGS.
+
        * Documentation/user/refman.itely: Compile fix for \mark #'(music ...).
 
        * Documentation/user/internals.itely: Use ly-set-mus-property!.

diff --git a/buildscripts/walk.sh b/buildscripts/walk.sh
deleted file mode 100644 (file)
index a1ffd5c..0000000
--- a/buildscripts/walk.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!@SHELL@
-# walk.sh
-# ugh
-# print reversed relative path to $1
-
-function base ()
-{
-    expr "$1" : "\(/[^/]*\)"
-}
-
-function unbase ()
-{
-    expr "$1" : "/[^/]*\(.*\)"
-}
-
-function walk ()
-{
-    if expr "$1" : '/' > /dev/null 2>&1; then
-       c=../
-    fi
-    from=`(cd "$1" && pwd) | sed 's://*:/:g'`
-    to=`pwd | sed 's://*:/:g'`
-    t=`base "$to"`
-    f=`base "$from"`
-    while [ -n "$t" -a "$t" = "$f" ]; do
-       to=`unbase "$to"`
-       from=`unbase "$from"`
-       t=`base "$to"`
-       f=`base "$from"`
-    done
-    i=`echo $from | sed -e 's:[^/]\+:..:g'`
-    i=`echo $i | sed -e 's:/[.][.]:..:'`
-    echo $c$i$to
-}
-
-walk $1
-

diff --git a/make/generic-vars.make b/make/generic-vars.make
index f3406eaf0fcc88fc96cd593e63520bc161853d55..d809ef632e6e6c70100f6a9a2455fb3b77ca8973 100644 (file)
--- a/make/generic-vars.make
+++ b/make/generic-vars.make
@@ -8,9 +8,6 @@
 # you do make dist 
 #
 
-
-# using src-depth iso depth is only necessary for broken rules that do
-#     cd $(outdir) && foo $(depth) ...
 buildscript-dir = $(src-depth)/buildscripts
 script-dir = $(src-depth)/scripts
 input-dir = $(src-depth)/input

diff --git a/stepmake/stepmake/compile-vars.make b/stepmake/stepmake/compile-vars.make
index 04725547b8320807eb8f0556cfc11c1a99b24f90..085a4363e629c264c374f5f2329ebb86aa0e1d8e 100644 (file)
--- a/stepmake/stepmake/compile-vars.make
+++ b/stepmake/stepmake/compile-vars.make
@@ -1,6 +1,6 @@
 ARFLAGS = ru
 
-LDFLAGS = $(ILDFLAGS) $(EXTRA_LDFLAGS) $($(PACKAGE)_LDFLAGS) $(MODULE_LDFLAGS) $(USER_LDFLAGS)
+ALL_LDFLAGS = $(LDFLAGS) $(ILDFLAGS) $(EXTRA_LDFLAGS) $($(PACKAGE)_LDFLAGS) $(MODULE_LDFLAGS) $(USER_LDFLAGS)
 
 PIC_FLAGS = -fpic -fPIC
 SHARED_FLAGS = -shared

diff --git a/stepmake/stepmake/executable-rules.make b/stepmake/stepmake/executable-rules.make
index 7f0b076dc83f5976a35bf217ac5db3b3d7b8f0c0..5d25e923f5602aa9069559a3fa95f61b7a321a51 100644 (file)
--- a/stepmake/stepmake/executable-rules.make
+++ b/stepmake/stepmake/executable-rules.make
@@ -1,4 +1,4 @@
 
 $(EXECUTABLE): $(outdir)/config.h $(O_FILES) $(outdir)/version.hh
        $(foreach a, $(MODULE_LIBS), $(MAKE) -C $(a) && ) true
-       $(LD) -o $@ $(O_FILES) $(LOADLIBES) $(LDFLAGS)
+       $(LD) -o $@ $(O_FILES) $(LOADLIBES) $(ALL_LDFLAGS)

diff --git a/stepmake/stepmake/generic-vars.make b/stepmake/stepmake/generic-vars.make
index 7b457f3c5a838ec94d8aa0775ada4a97c84dab85..c47a444f336735aeb45679b48b62f8a2abf9bdc5 100644 (file)
--- a/stepmake/stepmake/generic-vars.make
+++ b/stepmake/stepmake/generic-vars.make
@@ -11,13 +11,11 @@ topdir := $(abs-srcdir)
 endif
 pwd := $(shell pwd)
 
-# $(depth) is deprecated, for most cases you'll want $(src-depth)
-#
-# Well, on second thought.
-# It can do no harm, but using src-depth iso depth is only necessary
-# for broken rules that do
-#    cd $(outdir) && foo  $(depth) ...
-src-depth = $(depth)/$(srcdir)
+ifeq ($(srcdir),.)
+src-depth = $(depth)
+else
+src-depth = $(srcdir)
+endif
 
 # derived names
 ifeq ($(distdir),)
@@ -26,11 +24,6 @@ ifeq ($(distdir),)
 endif
 distname = $(package)-$(TOPLEVEL_VERSION)
 
-# obsolete?
-#makeout = $(depth)/make/$(outdir)
-#docout = $(depth)/Documentation/$(outdir)
-#binout = $(depth)/bin/$(outdir)
-
 doc-dir = $(src-depth)/Documentation
 po-dir = $(src-depth)/po
 

diff --git a/stepmake/stepmake/python-module-rules.make b/stepmake/stepmake/python-module-rules.make
index e8087596ebdb091e6cd7771c7fd6a96beb3c3a54..9a3c26bc04277d72261a522b66a06d422f62e435 100644 (file)
--- a/stepmake/stepmake/python-module-rules.make
+++ b/stepmake/stepmake/python-module-rules.make
@@ -1,3 +1,3 @@
 
 $(outdir)/%$(SHARED_LIB_SUFFIX): $(outdir)/%.lo
-       $(LD) $(SHARED_FLAGS) -o $@ $< $(LDFLAGS)
+       $(LD) $(SHARED_FLAGS) -o $@ $< $(ALL_LDFLAGS)

diff --git a/stepmake/stepmake/shared-library-rules.make b/stepmake/stepmake/shared-library-rules.make
index d4256de5a7f58e2ea437387bef119bb951f7e2c0..bb68473be9aad15046180b2c336271e00ab446ad 100644 (file)
--- a/stepmake/stepmake/shared-library-rules.make
+++ b/stepmake/stepmake/shared-library-rules.make
@@ -1,6 +1,6 @@
 
 $(SHARED_LIBRARY): $(outdir)/config.h $(LO_FILES)
-       $(LD) $(SHARED_FLAGS) -o $@.$(VERSION) $(LO_FILES) $(LDFLAGS)
+       $(LD) $(SHARED_FLAGS) -o $@.$(VERSION) $(LO_FILES) $(ALL_LDFLAGS)
        rm -f $@.$(MAJOR_VERSION)
        ln -sf $(outdir)/$(LIB_PREFIX)$(NAME).so.$(VERSION) $@.$(MAJOR_VERSION)
        rm -f $@