* scripts/mup2ly.py: Cut-n-paste include missing lilylib.

[lilypond.git] / stepmake / stepmake / generic-vars.make

diff --git a/stepmake/stepmake/generic-vars.make b/stepmake/stepmake/generic-vars.make
index 8ee0efd874c063bcd8d7a13429c436b150d653e6..5a0302d9a091bd0c6a5b753a339842851d8dc367 100644 (file)
--- a/stepmake/stepmake/generic-vars.make
+++ b/stepmake/stepmake/generic-vars.make
@@ -4,18 +4,23 @@
 # internal, not normally used
 DEPTH = $(depth)/$(package-depth)
 
-ifeq ($(topdir),)
-topdir := $(shell cd $(depth); pwd)
-endif
+#ifeq ($(topdir),)
+#abs-srcdir := $(shell cd $(depth); pwd)
+##deprecated
+#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
+
+ifeq ($(topdir),)
+abs-srcdir := $(shell cd $(src-depth); pwd)
+topdir := $(abs-srcdir)
+endif
 
 # derived names
 ifeq ($(distdir),)
@@ -24,11 +29,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
 
@@ -77,33 +77,9 @@ ERROR_LOG = 2> /dev/null
 SILENT_LOG = 2>&1 >  /dev/null
 date := $(shell date +%x)      #duplicated?
 
-# compile and link options:
-#
-ARFLAGS = ru
-
-#INCLUDES =  $(depth)/$(builddir) include $(outdir) $($(PACKAGE)_INCLUDES) $(MODULE_INCLUDES)
 INCLUDES = include $(outdir) $($(PACKAGE)_INCLUDES) $(MODULE_INCLUDES)
 
-# urg: for windows ?
-# LOADLIBES = $(MODULE_LIBES) $($(PACKAGE)_LIBES) $(EXTRA_LIBES) -lstdc++
-#
-
-# macro compiler:
-#
 M4 = m4
-# 
-
-#
-LD_COMMAND = $(LD) $(LDFLAGS) -o $@
-#
-
-# dependencies:
-#
-depfile = $(outdir)/$(subst .o,.dep,$(notdir $@))#
-DODEP=rm -f $(depfile); DEPENDENCIES_OUTPUT="$(depfile) $(outdir)/$(notdir $@)"
-#
-
-#
 
 #replace to do stripping of certain objects
 STRIPDEBUG=true 
@@ -111,11 +87,7 @@ STRIPDEBUG=true
 DIST_FILES=$(EXTRA_DIST_FILES) GNUmakefile $(ALL_SOURCES)
 DOCDIR=$(depth)/$(outdir)
 
-
 STRIP=strip --strip-debug
-ifdef stablecc
- STABLEOBS=$(addprefix $(outdir)/,$(stablecc:.cc=.o))
-endif
 
 # substitute $(STRIP) in Site.make if you want stripping
 DO_STRIP=true