Libtool removed
Runtime library build removed git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@6019 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
3d9557f053
commit
4418547be5
3 changed files with 6 additions and 74 deletions
|
|
@ -15,20 +15,16 @@ SWIG_LIB = @swig_lib@
|
|||
BIN_DIR = @bindir@
|
||||
TARGET = swig@release_suffix@@EXEEXT@
|
||||
SOURCE = Source
|
||||
RUNTIME = Runtime
|
||||
|
||||
swig: source swig.spec
|
||||
|
||||
source:
|
||||
@cd $(SOURCE) && $(MAKE)
|
||||
|
||||
runtime:
|
||||
@cd $(RUNTIME) && $(MAKE)
|
||||
|
||||
swig.spec: $(srcdir)/swig.spec.in config.status
|
||||
@CONFIG_HEADERS= CONFIG_LINKS= CONFIG_FILES=swig.spec $(SHELL) ./config.status
|
||||
|
||||
.PHONY: source runtime
|
||||
.PHONY: source
|
||||
|
||||
#####################################################################
|
||||
# All the languages SWIG speaks (when it wants to)
|
||||
|
|
@ -56,10 +52,8 @@ skip-modula3 = test -n "@SKIP_MODULA3@"
|
|||
ACTION = check
|
||||
|
||||
chk-set-swiglib = SWIG_LIB=@ROOT_DIR@/Lib
|
||||
chk-set-runtimelib = RUNTIMEDIR=@ROOT_DIR@/$(RUNTIME)/.libs
|
||||
chk-set-swig = SWIG=@ROOT_DIR@/$(TARGET)
|
||||
|
||||
chk-set-env = $(chk-set-swiglib) $(chk-set-swig) $(chk-set-runtimelib)
|
||||
chk-set-env = $(chk-set-swiglib) $(chk-set-swig)
|
||||
|
||||
chk = $(MAKE) -k -s $(chk-set-env) $(ACTION)
|
||||
|
||||
|
|
@ -234,17 +228,13 @@ broken-%-test-suite:
|
|||
|
||||
clean: clean-objects clean-examples clean-gifplot clean-test-suite
|
||||
|
||||
clean-objects: clean-source clean-runtime
|
||||
clean-objects: clean-source
|
||||
|
||||
clean-source:
|
||||
@echo cleaning Source
|
||||
@cd $(SOURCE) && $(MAKE) -s clean
|
||||
@rm -f $(TARGET)
|
||||
|
||||
clean-runtime:
|
||||
@echo cleaning Runtime
|
||||
@cd $(RUNTIME) && $(MAKE) -s clean
|
||||
|
||||
clean-examples:
|
||||
@$(MAKE) -k -s check-examples ACTION=clean
|
||||
|
||||
|
|
@ -272,17 +262,13 @@ DISTCLEAN-DEAD = config.status config.log config.cache swig.spec Makefile mkmf.l
|
|||
|
||||
distclean: distclean-objects clean-examples clean-gifplot distclean-test-suite distclean-dead
|
||||
|
||||
distclean-objects: distclean-source distclean-runtime
|
||||
distclean-objects: distclean-source
|
||||
|
||||
distclean-source:
|
||||
@echo dist cleaning Source
|
||||
@cd $(SOURCE) && $(MAKE) -s distclean
|
||||
@rm -f $(TARGET)
|
||||
|
||||
distclean-runtime:
|
||||
@echo dist cleaning Runtime
|
||||
@cd $(RUNTIME) && $(MAKE) -s distclean
|
||||
|
||||
distclean-test-suite:
|
||||
@echo dist cleaning Examples/test-suite
|
||||
@$(MAKE) -k -s noskip-test-suite ACTION=distclean
|
||||
|
|
@ -366,10 +352,6 @@ install-lib:
|
|||
done
|
||||
|
||||
|
||||
install-runtime:
|
||||
@cd $(RUNTIME) && $(MAKE) install
|
||||
|
||||
|
||||
install-m4:
|
||||
@echo "Installing M4 macros"
|
||||
@$(MKINSTDIRS) $(DESTDIR)$(M4_INSTALL_DIR)
|
||||
|
|
@ -392,9 +374,6 @@ uninstall-lib:
|
|||
@echo "Uninstalling the SWIG library"
|
||||
rm -rf $(DESTDIR)$(SWIG_LIB)/
|
||||
|
||||
uninstall-runtime:
|
||||
@cd $(RUNTIME) && $(MAKE) uninstall
|
||||
|
||||
uninstall-m4:
|
||||
@echo "Uninstalling $(M4_INSTALL_DIR)/swig.m4"
|
||||
rm -f $(M4_INSTALL_DIR)/swig.m4
|
||||
|
|
|
|||
|
|
@ -10,14 +10,5 @@ set -x
|
|||
test -d Tools/config || mkdir Tools/config
|
||||
aclocal -I Tools/config
|
||||
autoheader
|
||||
|
||||
# Note: on Mac OS X there is a different program 'libtoolize' that is definitely not
|
||||
# what we want to run. Instead, we want to use 'glibtoolize'
|
||||
|
||||
if test -x /usr/bin/glibtoolize; then
|
||||
glibtoolize --force --copy
|
||||
else
|
||||
libtoolize --force --copy
|
||||
fi
|
||||
automake --add-missing --copy --force-missing
|
||||
autoconf
|
||||
|
|
|
|||
|
|
@ -14,18 +14,6 @@ dnl Some extra defines for the config file
|
|||
AH_BOTTOM([
|
||||
/* Default language */
|
||||
#define SWIG_LANG "-tcl"
|
||||
|
||||
/* Values returned by SWIG when invoked with the -ldflags option */
|
||||
#define SWIG_GUILE_RUNTIME "-L" LIBDIR " -lswigguile" RELEASE_SUFFIX
|
||||
#define SWIG_GUILESCM_RUNTIME "-L" LIBDIR " -lswigguilescm" RELEASE_SUFFIX
|
||||
#define SWIG_MZSCHEME_RUNTIME "-L" LIBDIR " -lswigmz" RELEASE_SUFFIX
|
||||
#define SWIG_PERL_RUNTIME "-L" LIBDIR " -lswigpl" RELEASE_SUFFIX
|
||||
#define SWIG_PIKE_RUNTIME "-L" LIBDIR " -lswigpike" RELEASE_SUFFIX
|
||||
#define SWIG_PHP_RUNTIME "-L" LIBDIR " -lswigphp4" RELEASE_SUFFIX
|
||||
#define SWIG_PYTHON_RUNTIME "-L" LIBDIR " -lswigpy" RELEASE_SUFFIX
|
||||
#define SWIG_RUBY_RUNTIME "-L" LIBDIR " -lswigrb" RELEASE_SUFFIX
|
||||
#define SWIG_TCL_RUNTIME "-L" LIBDIR " -lswigtcl" RELEASE_SUFFIX
|
||||
#define SWIG_CHICKEN_RUNTIME "-L" LIBDIR " -lswigchicken" RELEASE_SUFFIX
|
||||
])
|
||||
|
||||
dnl Checks for programs.
|
||||
|
|
@ -37,17 +25,7 @@ AC_OBJEXT
|
|||
AM_PROG_CC_C_O # Needed for subdir-objects in AUTOMAKE_OPTIONS
|
||||
AC_CHECK_PROGS(AR, ar aal, ar)
|
||||
AC_SUBST(AR)
|
||||
AC_LIBTOOL_WIN32_DLL
|
||||
|
||||
# On Mac OS-X, static runtime libraries don't seem to build (and are
|
||||
# probably a bad idea anyways). This turns this off in libtool.
|
||||
|
||||
case $host in
|
||||
*-*-darwin*) AC_DISABLE_STATIC;;
|
||||
*);;
|
||||
esac
|
||||
|
||||
AC_PROG_LIBTOOL
|
||||
AC_COMPILE_WARNINGS # Increase warning levels
|
||||
|
||||
AC_DEFINE_UNQUOTED(SWIG_CXX, ["$CXX"], [Compiler that built SWIG])
|
||||
|
|
@ -282,15 +260,6 @@ case $host in
|
|||
*) TCL_CXXSHARED=$TRYLINKINGWITHCXX;;
|
||||
esac
|
||||
|
||||
# On Mac OS-X, the -no-defined option to libtool doesn't seem to work.
|
||||
# This fixes it
|
||||
|
||||
AC_SUBST(LIBTOOL_NO_UNDEFINED)
|
||||
case $host in
|
||||
*-*-darwin*) LIBTOOL_NO_UNDEFINED="";;
|
||||
*) LIBTOOL_NO_UNDEFINED="-no-undefined";;
|
||||
esac
|
||||
|
||||
# Optional CFLAGS used to silence compiler warnings on some platforms.
|
||||
|
||||
AC_SUBST(PLATFLAGS)
|
||||
|
|
@ -1541,20 +1510,13 @@ AC_DEFINE_DIR(SWIG_LIB, swig_lib, [Directory for SWIG system-independent librari
|
|||
# Configure RELEASESUFFIX (for setups having both SWIG 1.1 and 1.3 on a system...)
|
||||
|
||||
AC_ARG_WITH(release-suffix,
|
||||
[ --with-release-suffix=SUFFIX Attach SUFFIX to the binary and the runtime libs. ],
|
||||
[ --with-release-suffix=SUFFIX Attach SUFFIX to the binary. ],
|
||||
[release_suffix="$withval"], [release_suffix=""])
|
||||
AC_SUBST(release_suffix)
|
||||
AC_DEFINE_UNQUOTED(RELEASE_SUFFIX, "$release_suffix", [Executable and runtime libraries release suffix for co-existence with older versions])
|
||||
|
||||
release_suffix_libtool=
|
||||
if test -n "$release_suffix"; then
|
||||
release_suffix_libtool="-release `echo $release_suffix | sed s/^-//`"
|
||||
fi
|
||||
AC_SUBST(release_suffix_libtool)
|
||||
AC_DEFINE_UNQUOTED(RELEASE_SUFFIX, "$release_suffix", [Executable release suffix for co-existence with older versions])
|
||||
|
||||
AC_CONFIG_FILES([ \
|
||||
Makefile \
|
||||
Runtime/Makefile \
|
||||
Source/Makefile \
|
||||
Examples/Makefile \
|
||||
Examples/guile/Makefile \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue