not absolute, make it absolute using PATH.
* python/midi.c (initmidi): Fix type for mingw.
* stepmake/stepmake/compile-vars.make (SHARED_FLAGS): Support mingw.
* stepmake/stepmake/generic-vars.make (MINGW_BUILD): Detect mingw
cross compiling.
* stepmake/aclocal.m4: Support python cross compiling.
* stepmake/stepmake/python-module-vars.make (SHARED_MODULE_SUFFIX):
Add mingw section.
+2005-11-01 Jan Nieuwenhuizen <janneke@gnu.org>
+
+ * lily/main.cc (setup_paths)[!__MINGW32__]: Bugfix: if argv0 is
+ not absolute, make it absolute using PATH.
+
+2005-10-28 Jan Nieuwenhuizen <janneke@gnu.org>
+
+ * python/midi.c (initmidi): Fix type for mingw.
+
+2005-10-27 Jan Nieuwenhuizen <janneke@gnu.org>
+
+ * stepmake/stepmake/compile-vars.make (SHARED_FLAGS): Support mingw.
+
+ * stepmake/stepmake/generic-vars.make (MINGW_BUILD): Detect mingw
+ cross compiling.
+
+ * stepmake/aclocal.m4: Support python cross compiling.
+
+ * stepmake/stepmake/python-module-vars.make (SHARED_MODULE_SUFFIX):
+ Add mingw section.
+
2005-11-02 Han-Wen Nienhuys <hanwen@xs4all.nl>
* scm/output-lib.scm (chain-grob-member-functions): replace
* lily/lily-guile.cc (procedure_arity): new function.
+>>>>>>> 1.4221
2005-10-28 Han-Wen Nienhuys <hanwen@xs4all.nl>
* Documentation/topdocs/INSTALL.texi (Top): add perl flex bison.
@echo ' rm $(config_h); ./autogen.sh'
@echo
@false
-
-
MAJOR_VERSION=2
MINOR_VERSION=7
PATCH_LEVEL=14
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=1
STEPMAKE_TEXMF_DIRS
STEPMAKE_GUILE_DEVEL(REQUIRED, 1.6.5)
STEPMAKE_MAKEINFO(REQUIRED)
-STEPMAKE_PYTHON_DEVEL(REQUIRED)
+STEPMAKE_PYTHON_DEVEL(OPTIONAL)
STEPMAKE_PATH_PROG(GHOSTSCRIPT, gs, OPTIONAL, 8.15)
if (getenv ("LILYPOND_VERBOSE"))
be_verbose_global = true;
+#ifndef __MINGW32__
+ File_path p;
+ p.parse_path (getenv ("PATH"));
+ String bindir = dir_name (p.find (argv0));
+#else /* __MINGW32__ */
String bindir = dir_name (argv0);
+#endif
String argv0_prefix = dir_name (bindir);
if (argv0_prefix != dir_name (dir_name (dir_name (prefix_directory))))
{
include $(depth)/make/stepmake.make
+CFLAGS += -DPy_BUILD_CORE
# unset al guile stuff from configure
CONFIG_LDFLAGS=
INSTALLATION_OUT_DIR1=$(local_lilypond_datadir)/python
INSTALLATION_OUT_FILES1=$(OUT_PY_MODULES) $(OUT_PYC_MODULES)
-
$(outdir)/midi.lo: $(outdir)/config.hh
{0, 0} /* Sentinel */
};
-void
-initmidi ()
+PyMODINIT_FUNC
+initmidi (void)
{
PyObject *m, *d;
m = Py_InitModule ("midi", MidiMethods);
])
AC_DEFUN(STEPMAKE_PYTHON_DEVEL, [
- unset PYTHON_HEADER PYTHON_INCLUDE
- if test -n "$PYTHON"; then
+ AC_ARG_WITH(python-include,
+ [ --with-python-include=DIR
+ location of the python include dir],[
+ if test "$withval" = "yes" -o "$withval" = "no"; then
+ AC_MSG_WARN(Usage: --with-python-include=includedir)
+ else
+ PYTHON_CFLAGS="-I${withval}"
+ fi
+ ])
+
+ AC_ARG_WITH(python-lib,
+ [ --with-python-lib=NAME name of the python lib],[
+ if test "$withval" = "yes" -o "$withval" = "no"; then
+ AC_MSG_WARN(Usage: --with-python-lib=name)
+ else
+ LDFLAGS="$LDFLAGS -l${withval}"
+ fi
+ ])
+
+ if test "$cross_compiling" = "no" -a -z "$PYTHON_CFLAGS"; then
changequote(<<, >>)#dnl
# alternatively, for python >= 2.0
# 'import sys, distutils.sysconfig; sys.stdout.write (distutils.sysconfig.get_python_inc ())'
PYTHON_INCLUDE=`$PYTHON -c 'import sys; sys.stdout.write ("%s/include/python%s" % (sys.prefix, sys.version[:3]))'`
+ PYTHON_CFLAGS="-I$PYTHON_INCLUDE"
changequote([, ])#dnl
fi
- ##AC_CHECK_HEADERS([Python.h],[PYTHON_HEADER=yes])
if test -z "$PYTHON_HEADER"; then
- #URG -- how to extend include path?
- ac_compile="$ac_compile -I$PYTHON_INCLUDE"
- ac_cpp="$ac_cpp -I$PYTHON_INCLUDE"
- CPPFLAGS="$CPPFLAGS -I$PYTHON_INCLUDE"
+ CPPFLAGS="$PYTHON_CFLAGS $CPPFLAGS"
AC_CHECK_HEADERS([Python.h],[PYTHON_HEADER=yes])
fi
if test -z "$PYTHON_HEADER"; then
- warn="$PYTHON_INCLUDE/Python.h (python-devel, python-dev or libpython-dev package)"
+ warn="Python.h (python-devel, python-dev or libpython-dev package)"
STEPMAKE_ADD_ENTRY($1, $warn)
fi
])
ALL_LDFLAGS = $(LDFLAGS) $(CONFIG_LDFLAGS) $($(PACKAGE)_LDFLAGS) $(MODULE_LDFLAGS) $(CONFIG_LDFLAGS)
PIC_FLAGS = -fpic -fPIC
+ifeq ($(MINGW_BUILD),)
SHARED_FLAGS = -shared
+else
+SHARED_FLAGS = -mdll
+endif
o-dep-out = $(outdir)/$(subst .o,.dep,$(notdir $@))#
DO_O_DEP = rm -f $(o-dep-out); DEPENDENCIES_OUTPUT="$(o-dep-out) $(outdir)/$(notdir $@)"
ifeq ($(HOST_ARCH),i686-cygwin)
CYGWIN_BUILD = yes
endif
+
+ifeq ($(HOST_ARCH),i586-mingw32msvc)
+MINGW_BUILD = yes
+endif
+ifeq ($(HOST_ARCH),i386-mingw32)
+MINGW_BUILD = yes
+endif
+ALL_LDFLAGS = $(LDFLAGS)
PY_MODULES_IN = $(call src-wildcard,*.py)
OUT_PY_MODULES = $(PY_MODULES_IN:%=$(outdir)/%)
OUT_PYC_MODULES = $(OUT_PY_MODULES:%.py=%.pyc)
+ifeq ($(MINGW_BUILD)$(CYGWIN_BUILD),)
+SHARED_MODULE_SUFFIX = .so
+else
ifneq ($(CYGWIN_BUILD),)
SHARED_MODULE_SUFFIX = .dll
-else
-SHARED_MODULE_SUFFIX = .so
+endif
+ifneq ($(MINGW_BUILD),)
+SHARED_MODULE_SUFFIX = .dll
+endif
endif
OUT_SO_MODULES = $(addprefix $(outdir)/, $(C_FILES:.c=$(SHARED_MODULE_SUFFIX)))
EXTRA_DIST_FILES += $(PY_MODULES_IN)
+ifeq ($(CYGWIN_BUILD)$(MINGW_BUILD),)
+ SHARED_LIB_PREFIX = lib
+ SHARED_LIB_SUFFIX = .so
+ SHARED_LIB_VERSION = $(VERSION)
+ SHARED_LIB_VERSION_SUFFIX =
+else
ifneq ($(CYGWIN_BUILD),)
SHARED_LIB_PREFIX = cyg
SHARED_LIB_SUFFIX =
SHARED_LIB_VERSION = $(subst .,-,$(VERSION))
SHARED_LIB_VERSION_SUFFIX = .dll
- ALL_LDFLAGS += -Wl,--image-base=0x10000000 -Wl,--out-implib,lib$(NAME).a
-else
+# ALL_LDFLAGS += -Wl,--image-base=0x10000000 -Wl,--out-implib,lib$(NAME).a
+ ALL_LDFLAGS += -Wl,--enable-auto-image-base -Wl,--out-implib,lib$(NAME).a
+endif
+ifneq ($(MINGW_BUILD),)
SHARED_LIB_PREFIX = lib
- SHARED_LIB_SUFFIX = .so
- SHARED_LIB_VERSION = $(VERSION)
- SHARED_LIB_VERSION_SUFFIX =
+ SHARED_LIB_SUFFIX =
+ SHARED_LIB_VERSION = $(subst .,-,$(VERSION))
+ SHARED_LIB_VERSION_SUFFIX = .dll
+## ALL_LDFLAGS += -Wl,--image-base=0x10000000 -Wl,--out-implib,lib$(NAME).a
+ ALL_LDFLAGS += -Wl,--out-implib,lib$(NAME).a
+endif
endif
INSTALL_SHARED_LIBRARY = $(SHARED_LIB_PREFIX)$(NAME)$(SHARED_LIB_SUFFIX)$(SHARED_LIB_VERSION)$(SHARED_LIB_VERSION_SUFFIX)