From 05e34809d92b83f1ef59d755c7c0fcb8db8f2a4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20K=C3=B6ppe?= Date: Fri, 13 Feb 2004 15:50:21 +0000 Subject: [PATCH] [MzScheme]: Use the new command-line argument -noinit. [Guile]: Build the runtime library with passive linkage, so as to rename the SWIG_init function uniquely. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@5721 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- SWIG/Runtime/Makefile.am | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/SWIG/Runtime/Makefile.am b/SWIG/Runtime/Makefile.am index ce9916632..744c0b10c 100644 --- a/SWIG/Runtime/Makefile.am +++ b/SWIG/Runtime/Makefile.am @@ -103,14 +103,14 @@ libswigguile_la_LDFLAGS = @LIBTOOL_NO_UNDEFINED@ $(RELEASE_SUFFIX_LIBTOOL) $(GUI libswigguile_la_CFLAGS = -DSWIG_GLOBAL $(GUILE_INCLUDE) libguile_gh.c: $(GUILE_GH_RUNTIME) - ../preinst-swig -guile -gh -runtime -o libguile_gh.c swigrun.i + ../preinst-swig -guile -gh -Linkage passive -runtime -o libguile_gh.c swigrun.i libswigguilescm_la_SOURCES = libguile_scm.c libswigguilescm_la_LDFLAGS = @LIBTOOL_NO_UNDEFINED@ $(RELEASE_SUFFIX_LIBTOOL) $(GUILE_DLNK) libswigguilescm_la_CFLAGS = -DSWIG_GLOBAL $(GUILE_INCLUDE) libguile_scm.c: $(GUILE_SCM_PRECOMMON) $(SWIG_TYPECHECK) $(GUILE_SCM_RUNTIME) - ../preinst-swig -guile -scm -runtime -o libguile_scm.c swigrun.i + ../preinst-swig -guile -scm -Linkage passive -runtime -o libguile_scm.c swigrun.i # ---------------------------------------------------------------------- # Ruby run-time library @@ -199,8 +199,10 @@ else all-local: endif -.libs/libswigmz$(RELEASESUFFIX)$(SO): $(MZSCHEME_RUNTIME) - ../preinst-swig -mzscheme -runtime -o libmz.c swigrun.i +libmz.c: $(MZSCHEME_RUNTIME) + ../preinst-swig -mzscheme -runtime -noinit -o libmz.c swigrun.i + +.libs/libswigmz$(RELEASESUFFIX)$(SO): libmz.c $(MZC) ++ccf "-DSWIG_GLOBAL" --cc libmz.c if [ ! -d .libs ] ; then mkdir .libs; fi $(MZC) --ld .libs/libswigmz$(RELEASESUFFIX)$(SO) libmz.o