Jan Nieuwenhuizen <[EMAIL PROTECTED]> writes:
> I've applied the patch, executed the split instructions and committed
> to my TLA archive, lilypond--lily-as-lib branch, with a few minor
> --srcdir build issues fixed.
Here is a patch that fixes the python-module rules. Also, GNUmakefile
is missing from parser/
`make all' has succeeded
`make web' is running and looks fine so far.
These are my last few free days, after that I will be overwhelmed by
other non-computer-related tasks. I would like to do the most I can
until then. What do you think should be done now?
nicolas
* looking for [EMAIL PROTECTED]/lilypond--lily-as-lib--0--patch-11 to compare with
* comparing to [EMAIL PROTECTED]/lilypond--lily-as-lib--0--patch-11
M stepmake/stepmake/python-module-rules.make
M stepmake/stepmake/python-module-vars.make
* modified files
--- orig/stepmake/stepmake/python-module-rules.make
+++ mod/stepmake/stepmake/python-module-rules.make
@@ -1,6 +1,7 @@
-$(outdir)/%$(SHARED_MODULE_SUFFIX): $(outdir)/%.o
- $(LD) $(SHARED_FLAGS) -o $@ $< $(ALL_LDFLAGS)
+$(outdir)/%$(SHARED_MODULE_SUFFIX): $(outdir)/%.lo
+ $(LIBTOOL_LINK) -o $(addprefix $(outdir)/lib, $(notdir $(@:$(SHARED_MODULE_SUFFIX)=$(LIB_SUFFIX)))) $< -rpath $(INSTALLATION_OUT_DIR)
+ cd $(outdir) && /bin/rm -f $(notdir $@) && $(LN_S) $(LIBTOOL_DIR)/$(addprefix lib, $(notdir $@)) $(notdir $@)
$(outdir)/%.pyc: $(outdir)/%.py
$(PYTHON) -c 'import py_compile; py_compile.compile ("$<")'
--- orig/stepmake/stepmake/python-module-vars.make
+++ mod/stepmake/stepmake/python-module-vars.make
@@ -6,6 +6,8 @@
else
SHARED_MODULE_SUFFIX = .so
endif
+LIB_SUFFIX = .la
+LIBTOOL_DIR=.libs
OUT_SO_MODULES = $(addprefix $(outdir)/, $(C_FILES:.c=$(SHARED_MODULE_SUFFIX)))
EXTRA_DIST_FILES += $(PY_MODULES_IN)
depth = ..
NAME = lyparser
SUBDIRS = include
MODULE_LIBS=$(depth)/flower/flower $(depth)/lily/lily
MODULE_INCLUDES= $(depth)/flower/include $(depth)/lily/include
MODULE_CXXFLAGS=
STEPMAKE_TEMPLATES= c++ library po
include $(depth)/make/stepmake.make
# for profiling, link guile statically:
#
# USER_LDFLAGS += -static -lltdl -ldl
#
ETAGS_FLAGS += --regex='{c++}/^LY_DEFINE *(\([^,]+\)/\1/'
ETAGS_FLAGS += --regex='{c++}/^LY_DEFINE *([^"]*"\([^"]+\)"/\1/'
default:
# force these: Make can't know these have to be generated in advance
$(outdir)/my-lily-parser.o: $(outdir)/parser.hh
$(outdir)/my-lily-lexer.o: $(outdir)/parser.hh
$(outdir)/lexer.o: $(outdir)/parser.hh $(outdir)/version.hh
$(outdir)/my-lily-parser.lo: $(outdir)/parser.hh
$(outdir)/my-lily-lexer.lo: $(outdir)/parser.hh
$(outdir)/lexer.lo: $(outdir)/parser.hh $(outdir)/version.hh
# ugh. For --srcdir builds, these must exist to satisfy their broken
# lexer.dep and parser.dep file entries.
ifneq ($(srcdir), .)
.PRECIOUS: $(outdir)/lexer.cc $(outdir)/parser.cc
endif
_______________________________________________
lilypond-devel mailing list
[EMAIL PROTECTED]
http://lists.gnu.org/mailman/listinfo/lilypond-devel
