1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-28 16:00:22 +02:00

* Makefile.am (libguile_la_SOURCES): Remove backtrace.c, debug.c,

inet_aton.c, srcprop.c, stacks.c, and strerror.c from this list.
They should only be included in the library at configure.in's
discretion.
(libguile_la_LDADD): Include the appropriate .lo files here.
(libguile_la_DEPENDENCIES): List the corresponding .o files here,
so we know when to build them (and their .lo bretheren).
* configure.in (LIBLOBJS): New substituted variable.  We let
configure decide which .o files to include in LIBOBJS, and then
put the corresponding list of .lo files in LIBLOBJS.  The latter
is what we pass to libtool.
* Makefile.in, configure: regenerated.
This commit is contained in:
Jim Blandy 1997-02-11 23:25:55 +00:00
parent aaef0d2a45
commit 9dcf6a0294
4 changed files with 47 additions and 33 deletions

View file

@ -9,16 +9,18 @@ INCLUDES = -I.. -I$(srcdir)/..
lib_PROGRAMS = libguile.la
libguile_la_SOURCES = alist.c append.c appinit.c arbiters.c async.c \
backtrace.c boolean.c chars.c continuations.c debug.c dynl.c dynwind.c eq.c \
boolean.c chars.c continuations.c dynl.c dynwind.c eq.c \
error.c eval.c extchrs.c feature.c filesys.c fports.c gc.c \
gdbint.c genio.c gsubr.c hash.c hashtab.c inet_aton.c init.c ioext.c \
gdbint.c genio.c gsubr.c hash.c hashtab.c init.c ioext.c \
kw.c list.c load.c mallocs.c markers.c mbstrings.c net_db.c \
numbers.c objprop.c \
options.c pairs.c ports.c posix.c print.c procprop.c procs.c ramap.c \
read.c root.c scmsigs.c sequences.c simpos.c smob.c socket.c srcprop.c \
stackchk.c stacks.c stime.c strerror.c strings.c strop.c strorder.c \
read.c root.c scmsigs.c sequences.c simpos.c smob.c socket.c \
stackchk.c stime.c strings.c strop.c strorder.c \
strports.c struct.c symbols.c tag.c throw.c unif.c variable.c \
vectors.c version.c vports.c weaks.c _scm.h
libguile_la_DEPENDENCIES = @LIBOBJS@
libguile_la_LDADD = @LIBLOBJS@
libguile_la_LDFLAGS = -version-info 0:0 -rpath $(libdir)
include_HEADERS = libguile.h

View file

@ -41,6 +41,7 @@ host_triplet = @host@
host_alias = @host_alias@
ERRNO_EXTRACT = @ERRNO_EXTRACT@
FD_SETTER = @FD_SETTER@
LIBLOBJS = @LIBLOBJS@
AWK = @AWK@
LIBTOOL = @LIBTOOL@
VERSION = @VERSION@
@ -57,16 +58,18 @@ INCLUDES = -I.. -I$(srcdir)/..
lib_PROGRAMS = libguile.la
libguile_la_SOURCES = alist.c append.c appinit.c arbiters.c async.c \
backtrace.c boolean.c chars.c continuations.c debug.c dynl.c dynwind.c eq.c \
boolean.c chars.c continuations.c dynl.c dynwind.c eq.c \
error.c eval.c extchrs.c feature.c filesys.c fports.c gc.c \
gdbint.c genio.c gsubr.c hash.c hashtab.c inet_aton.c init.c ioext.c \
gdbint.c genio.c gsubr.c hash.c hashtab.c init.c ioext.c \
kw.c list.c load.c mallocs.c markers.c mbstrings.c net_db.c \
numbers.c objprop.c \
options.c pairs.c ports.c posix.c print.c procprop.c procs.c ramap.c \
read.c root.c scmsigs.c sequences.c simpos.c smob.c socket.c srcprop.c \
stackchk.c stacks.c stime.c strerror.c strings.c strop.c strorder.c \
read.c root.c scmsigs.c sequences.c simpos.c smob.c socket.c \
stackchk.c stime.c strings.c strop.c strorder.c \
strports.c struct.c symbols.c tag.c throw.c unif.c variable.c \
vectors.c version.c vports.c weaks.c _scm.h
libguile_la_DEPENDENCIES = @LIBOBJS@
libguile_la_LDADD = @LIBLOBJS@
libguile_la_LDFLAGS = -version-info 0:0 -rpath $(libdir)
include_HEADERS = libguile.h
@ -111,17 +114,15 @@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
libguile_la_OBJECTS = alist.lo append.lo appinit.lo arbiters.lo \
async.lo backtrace.lo boolean.lo chars.lo continuations.lo debug.lo \
dynl.lo dynwind.lo eq.lo error.lo eval.lo extchrs.lo feature.lo \
filesys.lo fports.lo gc.lo gdbint.lo genio.lo gsubr.lo hash.lo \
hashtab.lo inet_aton.lo init.lo ioext.lo kw.lo list.lo load.lo \
mallocs.lo markers.lo mbstrings.lo net_db.lo numbers.lo objprop.lo \
options.lo pairs.lo ports.lo posix.lo print.lo procprop.lo procs.lo \
ramap.lo read.lo root.lo scmsigs.lo sequences.lo simpos.lo smob.lo \
socket.lo srcprop.lo stackchk.lo stacks.lo stime.lo strerror.lo \
strings.lo strop.lo strorder.lo strports.lo struct.lo symbols.lo tag.lo \
throw.lo unif.lo variable.lo vectors.lo version.lo vports.lo weaks.lo
libguile_la_LDADD = $(LDADD)
async.lo boolean.lo chars.lo continuations.lo dynl.lo dynwind.lo eq.lo \
error.lo eval.lo extchrs.lo feature.lo filesys.lo fports.lo gc.lo \
gdbint.lo genio.lo gsubr.lo hash.lo hashtab.lo init.lo ioext.lo kw.lo \
list.lo load.lo mallocs.lo markers.lo mbstrings.lo net_db.lo numbers.lo \
objprop.lo options.lo pairs.lo ports.lo posix.lo print.lo procprop.lo \
procs.lo ramap.lo read.lo root.lo scmsigs.lo sequences.lo simpos.lo \
smob.lo socket.lo stackchk.lo stime.lo strings.lo strop.lo strorder.lo \
strports.lo struct.lo symbols.lo tag.lo throw.lo unif.lo variable.lo \
vectors.lo version.lo vports.lo weaks.lo
SCRIPTS = $(bin_SCRIPTS)
CFLAGS = @CFLAGS@
@ -141,22 +142,20 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \
TAR = tar
DEP_FILES = .deps/alist.P .deps/append.P .deps/appinit.P \
.deps/arbiters.P .deps/async.P .deps/backtrace.P .deps/boolean.P \
.deps/chars.P .deps/continuations.P .deps/debug.P .deps/dynl.P \
.deps/dynwind.P .deps/eq.P .deps/error.P .deps/eval.P .deps/extchrs.P \
.deps/feature.P .deps/filesys.P .deps/fports.P .deps/gc.P \
.deps/gdbint.P .deps/genio.P .deps/gsubr.P .deps/hash.P .deps/hashtab.P \
.deps/inet_aton.P .deps/init.P .deps/ioext.P .deps/kw.P .deps/list.P \
.deps/load.P .deps/mallocs.P .deps/markers.P .deps/mbstrings.P \
.deps/net_db.P .deps/numbers.P .deps/objprop.P .deps/options.P \
.deps/pairs.P .deps/ports.P .deps/posix.P .deps/print.P \
.deps/arbiters.P .deps/async.P .deps/boolean.P .deps/chars.P \
.deps/continuations.P .deps/dynl.P .deps/dynwind.P .deps/eq.P \
.deps/error.P .deps/eval.P .deps/extchrs.P .deps/feature.P \
.deps/filesys.P .deps/fports.P .deps/gc.P .deps/gdbint.P .deps/genio.P \
.deps/gsubr.P .deps/hash.P .deps/hashtab.P .deps/init.P .deps/ioext.P \
.deps/kw.P .deps/list.P .deps/load.P .deps/mallocs.P .deps/markers.P \
.deps/mbstrings.P .deps/net_db.P .deps/numbers.P .deps/objprop.P \
.deps/options.P .deps/pairs.P .deps/ports.P .deps/posix.P .deps/print.P \
.deps/procprop.P .deps/procs.P .deps/ramap.P .deps/read.P .deps/root.P \
.deps/scmsigs.P .deps/sequences.P .deps/simpos.P .deps/smob.P \
.deps/socket.P .deps/srcprop.P .deps/stackchk.P .deps/stacks.P \
.deps/stime.P .deps/strerror.P .deps/strings.P .deps/strop.P \
.deps/strorder.P .deps/strports.P .deps/struct.P .deps/symbols.P \
.deps/tag.P .deps/throw.P .deps/unif.P .deps/variable.P .deps/vectors.P \
.deps/version.P .deps/vports.P .deps/weaks.P
.deps/socket.P .deps/stackchk.P .deps/stime.P .deps/strings.P \
.deps/strop.P .deps/strorder.P .deps/strports.P .deps/struct.P \
.deps/symbols.P .deps/tag.P .deps/throw.P .deps/unif.P .deps/variable.P \
.deps/vectors.P .deps/version.P .deps/vports.P .deps/weaks.P
SOURCES = $(libguile_la_SOURCES)
OBJECTS = $(libguile_la_OBJECTS)

7
libguile/configure vendored
View file

@ -3028,6 +3028,11 @@ else
echo "$ac_t""no, using default" 1>&6
fi
## If we're creating a shared library (using libtool!), then we'll
## need to generate a list of .lo files corresponding to the .o files
## given in LIBOBJS. We'll call it LIBLOBJS.
LIBLOBJS="`echo ${LIBOBJS} | sed 's/\.o/.lo/g'`"
cat >> confdefs.h <<EOF
#define GUILE_MAJOR_VERSION "$GUILE_MAJOR_VERSION"
EOF
@ -3044,6 +3049,7 @@ EOF
trap '' 1 2 15
cat > confcache <<\EOF
# This file is a shell script that caches the results of configure
@ -3197,6 +3203,7 @@ s%@xtra_PLUGIN_guile_libs@%$xtra_PLUGIN_guile_libs%g
s%@AWK@%$AWK%g
s%@FD_SETTER@%$FD_SETTER%g
s%@ERRNO_EXTRACT@%$ERRNO_EXTRACT%g
s%@LIBLOBJS@%$LIBLOBJS%g
CEOF
EOF

View file

@ -234,6 +234,11 @@ else
AC_MSG_RESULT([no, using default])
fi
## If we're creating a shared library (using libtool!), then we'll
## need to generate a list of .lo files corresponding to the .o files
## given in LIBOBJS. We'll call it LIBLOBJS.
LIBLOBJS="`echo ${LIBOBJS} | sed 's/\.o/.lo/g'`"
AC_DEFINE_UNQUOTED(GUILE_MAJOR_VERSION, "$GUILE_MAJOR_VERSION")
AC_DEFINE_UNQUOTED(GUILE_MINOR_VERSION, "$GUILE_MINOR_VERSION")
AC_DEFINE_UNQUOTED(GUILE_VERSION, "$GUILE_VERSION")
@ -241,6 +246,7 @@ AC_DEFINE_UNQUOTED(GUILE_VERSION, "$GUILE_VERSION")
AC_SUBST(AWK)
AC_SUBST(FD_SETTER)
AC_SUBST(ERRNO_EXTRACT)
AC_SUBST(LIBLOBJS)
AC_OUTPUT([Makefile fd.h guile-snarf PLUGIN/guile.libs], [chmod +x guile-snarf])
dnl Local Variables: