Update Guile makefiles to work with default -scm mode.
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@6652 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
6a0fbb5a2c
commit
eec55ff302
4 changed files with 18 additions and 23 deletions
|
|
@ -277,37 +277,32 @@ GUILE_LIB = @GUILELIB@
|
||||||
GUILE_SO = @GUILE_SO@
|
GUILE_SO = @GUILE_SO@
|
||||||
GUILE_LIBPREFIX = lib
|
GUILE_LIBPREFIX = lib
|
||||||
|
|
||||||
# ----------------------------------------------------------------
|
|
||||||
# Build a C dynamically loadable module
|
|
||||||
# ----------------------------------------------------------------
|
|
||||||
|
|
||||||
guile: $(SRCS)
|
|
||||||
$(SWIG) -guile -Linkage ltdlmod $(SWIGOPT) $(INTERFACE)
|
|
||||||
$(CC) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_INCLUDE) $(ISRCS) $(SRCS)
|
|
||||||
$(LDSHARED) $(OBJS) $(IOBJS) $(LIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO)
|
|
||||||
|
|
||||||
# -----------------------------------------------------------------
|
|
||||||
# Build a C++ dynamically loadable module
|
|
||||||
# -----------------------------------------------------------------
|
|
||||||
|
|
||||||
guile_cpp: $(SRCS)
|
|
||||||
$(SWIG) -c++ -guile -Linkage ltdlmod $(SWIGOPT) $(INTERFACE)
|
|
||||||
$(CXX) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_INCLUDE) $(ICXXSRCS) $(SRCS) $(CXXSRCS)
|
|
||||||
$(CXXSHARED) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO)
|
|
||||||
|
|
||||||
#------------------------------------------------------------------
|
#------------------------------------------------------------------
|
||||||
# Build a dynamically loaded module with passive linkage and the scm interface
|
# Build a dynamically loaded module with passive linkage and the scm interface
|
||||||
#------------------------------------------------------------------
|
#------------------------------------------------------------------
|
||||||
guile_scm: $(SRCS)
|
guile: $(SRCS)
|
||||||
$(SWIG) -guile -scm -Linkage passive $(SWIGOPT) $(INTERFACE)
|
$(SWIG) -guile -scm -Linkage passive $(SWIGOPT) $(INTERFACE)
|
||||||
$(CC) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_INCLUDE) $(ISRCS) $(SRCS)
|
$(CC) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_INCLUDE) $(ISRCS) $(SRCS)
|
||||||
$(LDSHARED) $(OBJS) $(IOBJS) $(LIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO)
|
$(LDSHARED) $(OBJS) $(IOBJS) $(LIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO)
|
||||||
|
|
||||||
guile_scm_cpp: $(SRCS)
|
guile_cpp: $(SRCS)
|
||||||
$(SWIG) -c++ -guile -scm -Linkage passive $(SWIGOPT) $(INTERFACE)
|
$(SWIG) -c++ -guile -scm -Linkage passive $(SWIGOPT) $(INTERFACE)
|
||||||
$(CXX) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_INCLUDE) $(ICXXSRCS) $(SRCS) $(CXXSRCS)
|
$(CXX) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_INCLUDE) $(ICXXSRCS) $(SRCS) $(CXXSRCS)
|
||||||
$(CXXSHARED) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO)
|
$(CXXSHARED) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO)
|
||||||
|
|
||||||
|
#------------------------------------------------------------------
|
||||||
|
# Build a dynamically loaded module with passive linkage and the gh interface
|
||||||
|
#------------------------------------------------------------------
|
||||||
|
guile_gh: $(SRCS)
|
||||||
|
$(SWIG) -guile -gh -Linkage passive $(SWIGOPT) $(INTERFACE)
|
||||||
|
$(CC) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_INCLUDE) $(ISRCS) $(SRCS)
|
||||||
|
$(LDSHARED) $(OBJS) $(IOBJS) $(LIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO)
|
||||||
|
|
||||||
|
guile_gh_cpp: $(SRCS)
|
||||||
|
$(SWIG) -c++ -guile -gh -Linkage passive $(SWIGOPT) $(INTERFACE)
|
||||||
|
$(CXX) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(GUILE_INCLUDE) $(ICXXSRCS) $(SRCS) $(CXXSRCS)
|
||||||
|
$(CXXSHARED) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(GUILE_LIBPREFIX)$(TARGET)$(GUILE_SO)
|
||||||
|
|
||||||
# -----------------------------------------------------------------
|
# -----------------------------------------------------------------
|
||||||
# Build a dynamically loadable module with passive linkage
|
# Build a dynamically loadable module with passive linkage
|
||||||
# -----------------------------------------------------------------
|
# -----------------------------------------------------------------
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
subdirs = simple matrix port constants multimap multivalue
|
subdirs = simple matrix port constants multimap multivalue
|
||||||
|
|
||||||
top_srcdir = @top_srcdir@
|
top_srcdir = @top_srcdir@
|
||||||
SWIG = ../$(top_srcdir)/swig@release_suffix@
|
SWIG = ../$(top_srcdir)/preinst-swig
|
||||||
CC = @CC@
|
CC = @CC@
|
||||||
CXX = @CXX@
|
CXX = @CXX@
|
||||||
CFLAGS = @CFLAGS@
|
CFLAGS = @CFLAGS@
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
#######################################################################
|
#######################################################################
|
||||||
|
|
||||||
LANGUAGE = guile
|
LANGUAGE = guile
|
||||||
VARIANT = _passive
|
VARIANT = _gh
|
||||||
SCRIPTSUFFIX = _runme.scm
|
SCRIPTSUFFIX = _runme.scm
|
||||||
srcdir = @srcdir@
|
srcdir = @srcdir@
|
||||||
top_srcdir = @top_srcdir@
|
top_srcdir = @top_srcdir@
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
include ../guile/Makefile
|
include ../guile/Makefile
|
||||||
|
|
||||||
VARIANT = _scm
|
VARIANT =
|
||||||
# Refer to the guile directory for the run scripts
|
# Refer to the guile directory for the run scripts
|
||||||
SCRIPTPREFIX = ../guile/
|
SCRIPTPREFIX = ../guile/
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue