From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Fri, 9 Aug 2002 12:39:27 +0000 (+0000)
Subject: * stepmake/stepmake/python-module-rules.make:
X-Git-Tag: release/1.5.72~22
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=46a3972bc05b0fbe77e1dcda58f5e2a83e71a79a;p=lilypond.git

* stepmake/stepmake/python-module-rules.make:
* stepmake/stepmake/python-module-vars.make:
* stepmake/stepmake/shared-library-vars.make: Add Cygwin support.

* stepmake/stepmake/generic-vars.make:
* cygwin/GNUmakefile: Fix Cygwin build detection.

* stepmake/stepmake/shared-library-rules.make: Remove version juggling.

* stepmake/stepmake/shared-library-targets.make: Default target
includes version, add target libFOO.

* lily/main.cc: Temporary fix for access to scm_read_opts array
from shared Cygwin library.
---

diff --git a/ChangeLog b/ChangeLog
index 30dfd3ab07..0ed5bfaeca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2002-08-09  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* stepmake/stepmake/python-module-rules.make: 
+	* stepmake/stepmake/python-module-vars.make: 
+	* stepmake/stepmake/shared-library-vars.make: Add Cygwin support.
+
+	* stepmake/stepmake/generic-vars.make:
+	* cygwin/GNUmakefile: Fix Cygwin build detection.
+	
+	* stepmake/stepmake/shared-library-rules.make: Remove version juggling.
+
+	* stepmake/stepmake/shared-library-targets.make: Default target
+	includes version, add target libFOO.
+
+	* lily/main.cc: Temporary fix for access to scm_read_opts array
+	from shared Cygwin library.
+
 2002-08-08  Rune Zedeler <rune@zedeler.dk>
 	
 	* ly/property-init.ly: Added phrasingSlurUp, phrasingSlurDown and
diff --git a/VERSION b/VERSION
index ff1c00ed26..56c3ab2e1c 100644
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=71
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # Use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
diff --git a/cygwin/GNUmakefile b/cygwin/GNUmakefile
index 314310b3ec..e5610e3777 100644
--- a/cygwin/GNUmakefile
+++ b/cygwin/GNUmakefile
@@ -6,11 +6,10 @@ EXTRA_DIST_FILES = README changelog mknetrel $(wildcard *.sh *.hint)
 
 STEPMAKE_TEMPLATES = install install-out
 
-include $(depth)/make/stepmake.make 
+include $(depth)/make/stepmake.make
 
 # For cygwin builds only
-target=$(shell gcc -dumpmachine)
-ifeq ($(target),i686-pc-cygwin)
+ifneq ($(CYGWIN_BUILD),)
 
 POST_INSTALLS=$(wildcard post-*.sh)
 OUT_POST_INSTALLS=$(POST_INSTALLS:%=$(outdir)/%)
diff --git a/cygwin/changelog b/cygwin/changelog
index c6c1d500d5..49726d7420 100644
--- a/cygwin/changelog
+++ b/cygwin/changelog
@@ -1,3 +1,12 @@
+lilypond (1.5.71-1) unstable; urgency=low
+
+  * Python module now named midi.dll.
+  * Fix detection of Cygwin build, which fixes installation of profile.d
+    scripts.
+  * Build fix.
+
+ -- Jan Nieuwenhuizen <janneke@gnu.org>  Fri,  9 Aug 2002 12:48:36 +0200
+
 lilypond (1.5.68.jcn1-1) unstable; urgency=low
 
   * First full mknetrel build.
diff --git a/cygwin/mknetrel b/cygwin/mknetrel
index 6dd829d46b..d29c76c294 100644
--- a/cygwin/mknetrel
+++ b/cygwin/mknetrel
@@ -10,7 +10,7 @@
 # To use this, do something like:
 cat >/dev/null <<EOC
 
-   wget -P/var/tmp ftp://lilypond.org/pub/LilyPond/v1.5/lilypond-1.5.68.tar.gz
+   wget -P/var/tmp ftp://lilypond.org/pub/LilyPond/v1.5/lilypond-1.5.71.tar.gz
    rm -rf /home/netrel/src/lilypond-*
    mkdir -p /home/netrel/src && cd /home/netrel/src
    ## TODO: look at pimport
@@ -152,7 +152,6 @@ lib_split () {
    
 devel_split () {
     mkdir -p ./$prefix/bin || exit 1
-    mv $inst/$prefix/bin/guile-* ./$prefix/bin
     mv $inst/$prefix/include ./$prefix/include
     mkdir -p ./$prefix/lib || exit 1
     mv $inst/$prefix/lib/*.a ./$prefix/lib
@@ -248,8 +247,7 @@ needdevoflags () {
     return 1
 }
 
-# do I have a broken setup, do the Guile developers not know how to
-# write configure.in and Makefile.am, or are automake/libtool broken?
+
 preconfig () { # aka libtool_woes ()
 
     # Add to mknetrel?
@@ -261,17 +259,18 @@ preconfig () { # aka libtool_woes ()
 
     GUILE=1.5.6
     cat > guile-config <<EOF
-#/bin/sh
+#!/bin/sh
 [ "\$1" == "--version" ] && echo "guile-config - Guile version $GUILE"
-[ "\$1" == "compile" ] && echo "-I$PREFIX/include"
-[ "\$1" == "link" ] && echo "-L$PREFIX/lib -lguile"
+[ "\$1" == "compile" ] && echo "-I$cygwin_prefix/include"
+[ "\$1" == "link" ] && echo "-L$cygwin_prefix/lib -lguile"
 exit 0
 EOF
 
     chmod 755 guile-config
     PATH=$(pwd):$PATH
-    
+
     ##opt='-O2 -g' LDFLAGS='"$cygwin_prefix/bin/libpython2.2.dll"
+    rm -f config.cache  
 }
 
 postconfig () {
diff --git a/lily/main.cc b/lily/main.cc
index d0c12ef46e..7961b9cc5a 100644
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -323,6 +323,17 @@ prepend_load_path (String dir)
   scm_c_eval_string (s.to_str0 ());
 }
 
+/* Move this to libguile/read.h 
+   Note: auto-export is assumed (no __declspec (dllexport)) */
+#if (defined(_WIN32) || defined(__CYGWIN__)) \
+  && !(defined(GUILE_BUILD_DLL) || defined(GUILE_STATIC))
+#define DLL_IMPORT __declspec (dllimport)
+#else
+#define DLL_IMPORT
+#endif
+extern DLL_IMPORT scm_t_option scm_read_opts[];
+
+
 void
 main_prog (void *, int, char **)
 {
@@ -337,7 +348,8 @@ main_prog (void *, int, char **)
       prepend_load_path (String (prefix_directory[i]) + "/scm");
     }
 
-  SCM_RECORD_POSITIONS_P = 1; 
+  SCM_RECORD_POSITIONS_P = 1;
+  
   if (verbose_global_b)
     dirinfo (stderr);
   
diff --git a/stepmake/configure.in b/stepmake/configure.in
index 1d1c3c8865..a1be8758f8 100644
--- a/stepmake/configure.in
+++ b/stepmake/configure.in
@@ -11,6 +11,8 @@ STEPMAKE_INIT
 # For all packages except the StepMake package itself
 # AC_CONFIG_SUBDIRS(stepmake)
 
+CC=echo
+AC_SUBST(CC)
 # Uncomment the configuration options your package needs.
 # STEPMAKE_COMPILE
 # AC_HAVE_HEADERS(limits.h malloc.h string.h unistd.h values.h)
diff --git a/stepmake/stepmake/generic-vars.make b/stepmake/stepmake/generic-vars.make
index 5a0302d9a0..2c81310461 100644
--- a/stepmake/stepmake/generic-vars.make
+++ b/stepmake/stepmake/generic-vars.make
@@ -109,4 +109,7 @@ OUTIN_FILES = $(addprefix $(outdir)/, $(IN_FILES:%.in=%))
 
 ALL_SOURCES = $(SOURCE_FILES)
 
-
+HOST_ARCH=$(shell $(CC) -dumpmachine)
+ifeq ($(HOST_ARCH),i686-pc-cygwin)
+CYGWIN_BUILD = yes
+endif
diff --git a/stepmake/stepmake/python-module-rules.make b/stepmake/stepmake/python-module-rules.make
index 9a3c26bc04..35a25ec97c 100644
--- a/stepmake/stepmake/python-module-rules.make
+++ b/stepmake/stepmake/python-module-rules.make
@@ -1,3 +1,3 @@
 
-$(outdir)/%$(SHARED_LIB_SUFFIX): $(outdir)/%.lo
+$(outdir)/%$(SHARED_MODULE_SUFFIX): $(outdir)/%.lo
 	$(LD) $(SHARED_FLAGS) -o $@ $< $(ALL_LDFLAGS)
diff --git a/stepmake/stepmake/python-module-vars.make b/stepmake/stepmake/python-module-vars.make
index 59eb76153d..e727b54abc 100644
--- a/stepmake/stepmake/python-module-vars.make
+++ b/stepmake/stepmake/python-module-vars.make
@@ -1,6 +1,10 @@
 PY_MODULES = $(wildcard *.py)
 PY_IN_FILES = $(wildcard *.py.in)
 OUT_PY_MODULES = $($(addprefix $(outdir)/, $(PY_IN_FILES:.in=)
-SHARED_LIB_SUFFIX = .so
-OUT_SO_MODULES = $(addprefix $(outdir)/, $(C_FILES:.c=$(SHARED_LIB_SUFFIX)))
+ifneq ($(CYGWIN_BUILD),)
+SHARED_MODULE_SUFFIX = .dll
+else
+SHARED_MODULE_SUFFIX = .so
+endif
+OUT_SO_MODULES = $(addprefix $(outdir)/, $(C_FILES:.c=$(SHARED_MODULE_SUFFIX)))
 
diff --git a/stepmake/stepmake/shared-library-rules.make b/stepmake/stepmake/shared-library-rules.make
index bb68473be9..7a1a3e5c49 100644
--- a/stepmake/stepmake/shared-library-rules.make
+++ b/stepmake/stepmake/shared-library-rules.make
@@ -1,8 +1,4 @@
 
-$(SHARED_LIBRARY): $(outdir)/config.h $(LO_FILES)
-	$(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 $@
-	ln -sf $(LIB_PREFIX)$(NAME).so.$(VERSION) $@
 
+$(SHARED_LIBRARY): $(outdir)/config.h $(LO_FILES)
+	$(LD) $(SHARED_FLAGS) -o $@ $(LO_FILES) $(ALL_LDFLAGS)
diff --git a/stepmake/stepmake/shared-library-targets.make b/stepmake/stepmake/shared-library-targets.make
index 87602324dd..4f8dbe8d2b 100644
--- a/stepmake/stepmake/shared-library-targets.make
+++ b/stepmake/stepmake/shared-library-targets.make
@@ -1,3 +1,4 @@
 
 default: $(SHARED_LIBRARY)
 
+$(SHARED_LIB_PREFIX)$(NAME): default
\ No newline at end of file
diff --git a/stepmake/stepmake/shared-library-vars.make b/stepmake/stepmake/shared-library-vars.make
index b4650f5418..a8ea9a9935 100644
--- a/stepmake/stepmake/shared-library-vars.make
+++ b/stepmake/stepmake/shared-library-vars.make
@@ -1,8 +1,20 @@
-SHARED_LIB_PREFIX = lib
-SHARED_LIB_SUFFIX = .so
 
-SHARED_LIBRARY = $(outdir)/$(SHARED_LIB_PREFIX)$(NAME)$(SHARED_LIB_SUFFIX)
-INSTALL_SHARED_LIBRARY = $(SHARED_LIB_PREFIX)$(NAME)$(SHARED_LIB_SUFFIX)
+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
+  SHARED_LIB_PREFIX = lib
+  SHARED_LIB_SUFFIX = .so
+  SHARED_LIB_VERSION = $(VERSION)
+  SHARED_LIB_VERSION_SUFFIX =
+endif
+
+INSTALL_SHARED_LIBRARY = $(SHARED_LIB_PREFIX)$(NAME)$(SHARED_LIB_SUFFIX)$(SHARED_LIB_VERSION)$(SHARED_LIB_VERSION_SUFFIX)
+SHARED_LIBRARY = $(outdir)/$(INSTALL_SHARED_LIBRARY)
+
 
 lo-dep-out = $(outdir)/$(subst .lo,.dep,$(notdir $@))#
 DO_LO_DEP = rm -f $(lo-dep-out); DEPENDENCIES_OUTPUT="$(lo-dep-out) $(outdir)/$(notdir $@)"