mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-11 14:21:10 +02:00
Use libtool, and the thread configuration mechanism.
* Makefile.am (lib_LTLIBRARIES, EXTRA_LTLIBRARIES, libqthreads_la_SOURCES, libqthreads_la_LIBADD): These replace lib_LIBRARIES, EXTRA_LIBRARIES, libqthreads_a_SOURCES, libqthreads_a_LIBADD. Use the variables set by the new config system. (libqthreads_la_DEPENDENCIES): New var. (libqthreads_la_LDFLAGS): Add -rpath; automake claims it can't set it itself, but I don't completely understand why. (qtmds.o, qtmdc.o): Rules removed. Use implicit build rules. (qtmds.s, qtmdc.c, qtdmdb.s): Rules added, to make symlinks to the appropriate files in the source tree. * Makefile.in, md/Makefile.in, time/Makefile.in: Regenerated.
This commit is contained in:
parent
fc27e65d11
commit
e8f77e1a98
2 changed files with 18 additions and 12 deletions
|
@ -11,7 +11,7 @@
|
||||||
# PARTICULAR PURPOSE.
|
# PARTICULAR PURPOSE.
|
||||||
|
|
||||||
|
|
||||||
SHELL = /bin/sh
|
SHELL = @SHELL@
|
||||||
|
|
||||||
srcdir = @srcdir@
|
srcdir = @srcdir@
|
||||||
top_srcdir = @top_srcdir@
|
top_srcdir = @top_srcdir@
|
||||||
|
@ -59,9 +59,11 @@ PRE_UNINSTALL = :
|
||||||
POST_UNINSTALL = :
|
POST_UNINSTALL = :
|
||||||
host_alias = @host_alias@
|
host_alias = @host_alias@
|
||||||
host_triplet = @host@
|
host_triplet = @host@
|
||||||
|
AS = @AS@
|
||||||
AWK = @AWK@
|
AWK = @AWK@
|
||||||
CC = @CC@
|
CC = @CC@
|
||||||
CPP = @CPP@
|
CPP = @CPP@
|
||||||
|
DLLTOOL = @DLLTOOL@
|
||||||
GUILE_LIBS = @GUILE_LIBS@
|
GUILE_LIBS = @GUILE_LIBS@
|
||||||
GUILE_MAJOR_VERSION = @GUILE_MAJOR_VERSION@
|
GUILE_MAJOR_VERSION = @GUILE_MAJOR_VERSION@
|
||||||
GUILE_MINOR_VERSION = @GUILE_MINOR_VERSION@
|
GUILE_MINOR_VERSION = @GUILE_MINOR_VERSION@
|
||||||
|
@ -76,16 +78,17 @@ MAKEINFO = @MAKEINFO@
|
||||||
NM = @NM@
|
NM = @NM@
|
||||||
PACKAGE = @PACKAGE@
|
PACKAGE = @PACKAGE@
|
||||||
PROG_HOSTNAME = @PROG_HOSTNAME@
|
PROG_HOSTNAME = @PROG_HOSTNAME@
|
||||||
|
QTHREAD_LTLIBS = @QTHREAD_LTLIBS@
|
||||||
RANLIB = @RANLIB@
|
RANLIB = @RANLIB@
|
||||||
THREAD_LIBS = @THREAD_LIBS@
|
THREAD_CPPFLAGS = @THREAD_CPPFLAGS@
|
||||||
|
THREAD_LIBS_INSTALLED = @THREAD_LIBS_INSTALLED@
|
||||||
|
THREAD_LIBS_LOCAL = @THREAD_LIBS_LOCAL@
|
||||||
|
THREAD_PACKAGE = @THREAD_PACKAGE@
|
||||||
VERSION = @VERSION@
|
VERSION = @VERSION@
|
||||||
|
qtdmdb_s = @qtdmdb_s@
|
||||||
qtmd_h = @qtmd_h@
|
qtmd_h = @qtmd_h@
|
||||||
qtmdb_s = @qtmdb_s@
|
|
||||||
qtmdc_c = @qtmdc_c@
|
qtmdc_c = @qtmdc_c@
|
||||||
qtmdc_o = @qtmdc_o@
|
|
||||||
qtmds_o = @qtmds_o@
|
|
||||||
qtmds_s = @qtmds_s@
|
qtmds_s = @qtmds_s@
|
||||||
target_libs = @target_libs@
|
|
||||||
|
|
||||||
AUTOMAKE_OPTIONS = foreign
|
AUTOMAKE_OPTIONS = foreign
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
# PARTICULAR PURPOSE.
|
# PARTICULAR PURPOSE.
|
||||||
|
|
||||||
|
|
||||||
SHELL = /bin/sh
|
SHELL = @SHELL@
|
||||||
|
|
||||||
srcdir = @srcdir@
|
srcdir = @srcdir@
|
||||||
top_srcdir = @top_srcdir@
|
top_srcdir = @top_srcdir@
|
||||||
|
@ -59,9 +59,11 @@ PRE_UNINSTALL = :
|
||||||
POST_UNINSTALL = :
|
POST_UNINSTALL = :
|
||||||
host_alias = @host_alias@
|
host_alias = @host_alias@
|
||||||
host_triplet = @host@
|
host_triplet = @host@
|
||||||
|
AS = @AS@
|
||||||
AWK = @AWK@
|
AWK = @AWK@
|
||||||
CC = @CC@
|
CC = @CC@
|
||||||
CPP = @CPP@
|
CPP = @CPP@
|
||||||
|
DLLTOOL = @DLLTOOL@
|
||||||
GUILE_LIBS = @GUILE_LIBS@
|
GUILE_LIBS = @GUILE_LIBS@
|
||||||
GUILE_MAJOR_VERSION = @GUILE_MAJOR_VERSION@
|
GUILE_MAJOR_VERSION = @GUILE_MAJOR_VERSION@
|
||||||
GUILE_MINOR_VERSION = @GUILE_MINOR_VERSION@
|
GUILE_MINOR_VERSION = @GUILE_MINOR_VERSION@
|
||||||
|
@ -76,16 +78,17 @@ MAKEINFO = @MAKEINFO@
|
||||||
NM = @NM@
|
NM = @NM@
|
||||||
PACKAGE = @PACKAGE@
|
PACKAGE = @PACKAGE@
|
||||||
PROG_HOSTNAME = @PROG_HOSTNAME@
|
PROG_HOSTNAME = @PROG_HOSTNAME@
|
||||||
|
QTHREAD_LTLIBS = @QTHREAD_LTLIBS@
|
||||||
RANLIB = @RANLIB@
|
RANLIB = @RANLIB@
|
||||||
THREAD_LIBS = @THREAD_LIBS@
|
THREAD_CPPFLAGS = @THREAD_CPPFLAGS@
|
||||||
|
THREAD_LIBS_INSTALLED = @THREAD_LIBS_INSTALLED@
|
||||||
|
THREAD_LIBS_LOCAL = @THREAD_LIBS_LOCAL@
|
||||||
|
THREAD_PACKAGE = @THREAD_PACKAGE@
|
||||||
VERSION = @VERSION@
|
VERSION = @VERSION@
|
||||||
|
qtdmdb_s = @qtdmdb_s@
|
||||||
qtmd_h = @qtmd_h@
|
qtmd_h = @qtmd_h@
|
||||||
qtmdb_s = @qtmdb_s@
|
|
||||||
qtmdc_c = @qtmdc_c@
|
qtmdc_c = @qtmdc_c@
|
||||||
qtmdc_o = @qtmdc_o@
|
|
||||||
qtmds_o = @qtmds_o@
|
|
||||||
qtmds_s = @qtmds_s@
|
qtmds_s = @qtmds_s@
|
||||||
target_libs = @target_libs@
|
|
||||||
|
|
||||||
AUTOMAKE_OPTIONS = foreign
|
AUTOMAKE_OPTIONS = foreign
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue