* hashtab.h: Bugfix: use SCM_API (WAS: extern).
[bpt/guile.git] / libguile / Makefile.am
index 340d026..083129b 100644 (file)
@@ -1,6 +1,6 @@
 ## Process this file with Automake to create Makefile.in
 ##
-##     Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+##     Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##
@@ -16,8 +16,8 @@
 ##
 ##   You should have received a copy of the GNU General Public
 ##   License along with GUILE; see the file COPYING.  If not, write
-##   to the Free Software Foundation, Inc., 59 Temple Place, Suite
-##   330, Boston, MA 02111-1307 USA
+##   to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+##   Floor, Boston, MA 02110-1301 USA
 
 AUTOMAKE_OPTIONS = gnu
 
@@ -26,7 +26,7 @@ DEFS = @DEFS@
 ## Check for headers in $(srcdir)/.., so that #include
 ## <libguile/MUMBLE.h> will find MUMBLE.h in this dir when we're
 ## building.
-INCLUDES = -I.. -I$(top_srcdir) -I$(top_srcdir)/libguile-ltdl
+INCLUDES = -I.. -I$(top_srcdir)
 
 ETAGS_ARGS = --regex='/SCM_\(GLOBAL_\)?\(G?PROC\|G?PROC1\|SYMBOL\|VCELL\|CONST_LONG\).*\"\([^\"]\)*\"/\3/' \
    --regex='/[ \t]*SCM_[G]?DEFINE1?[ \t]*(\([^,]*\),[^,]*/\1/'
@@ -42,15 +42,24 @@ gen_scmconfig_SOURCES = gen-scmconfig.c
 ## For some reason, OBJEXT does not include the dot
 gen-scmconfig.$(OBJEXT): gen-scmconfig.c
        if [ "$(cross_compiling)" = "yes" ]; then \
-               $(CC_FOR_BUILD) -c -o $@ $<; \
+               $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) -c -o $@ $<; \
        else \
                $(COMPILE) -c -o $@ $<; \
        fi
 
-scmconfig.h: ${top_srcdir}/config.h gen-scmconfig
+## Override default rule; this should run on BUILD host.
+gen-scmconfig$(EXEEXT): $(gen_scmconfig_OBJECTS) $(gen_scmconfig_DEPENDENCIES) 
+       @rm -f gen-scmconfig$(EXEEXT)
+       if [ "$(cross_compiling)" = "yes" ]; then \
+               $(CCLD_FOR_BUILD) -o $@ $(gen_scmconfig_OBJECTS); \
+       else \
+               $(LINK) $(gen_scmconfig_OBJECTS) $(LDADD) $(LIBS); \
+       fi
+
+scmconfig.h: ${top_builddir}/config.h gen-scmconfig$(EXEEXT)
        rm -f scmconfig.h.tmp
        cat $(srcdir)/scmconfig.h.top > scmconfig.h.tmp
-       ./gen-scmconfig >> scmconfig.h.tmp
+       ./gen-scmconfig$(EXEEXT) >> scmconfig.h.tmp
        chmod 444 scmconfig.h.tmp
        rm -f scmconfig.h
        mv scmconfig.h.tmp scmconfig.h
@@ -61,7 +70,7 @@ guile_filter_doc_snarfage_SOURCES = c-tokenize.c
 ## For some reason, OBJEXT does not include the dot
 c-tokenize.$(OBJEXT): c-tokenize.c
        if [ "$(cross_compiling)" = "yes" ]; then \
-               $(CC_FOR_BUILD) -c -o $@ $<; \
+               $(CC_FOR_BUILD) $(DEFS) $(INCLUDES) -c -o $@ $<; \
        else \
                $(COMPILE) -c -o $@ $<; \
        fi
@@ -77,58 +86,62 @@ guile_filter_doc_snarfage$(EXEEXT): $(guile_filter_doc_snarfage_OBJECTS) $(guile
 
 
 guile_SOURCES = guile.c
+guile_CFLAGS = $(GUILE_CFLAGS)
 guile_LDADD = libguile.la
-guile_LDFLAGS = @DLPREOPEN@
-
-libguile_la_SOURCES = alist.c arbiters.c async.c backtrace.c boolean.c     \
-    chars.c continuations.c convert.c debug.c deprecation.c deprecated.c    \
-    dynwind.c environments.c eq.c error.c eval.c evalext.c extensions.c            \
-    feature.c fluids.c fports.c        futures.c                                   \
-    gc.c gc-mark.c gc-segment.c gc-malloc.c gc-card.c gc-freelist.c        \
-       gc_os_dep.c gdbint.c gh_data.c gh_eval.c gh_funcs.c gh_init.c       \
-    gh_io.c gh_list.c gh_predicates.c goops.c gsubr.c guardians.c hash.c    \
-    hashtab.c hooks.c init.c inline.c ioext.c keywords.c           \
-    lang.c list.c                                                          \
-    load.c macros.c mallocs.c modules.c numbers.c objects.c objprop.c      \
-    options.c pairs.c ports.c print.c procprop.c procs.c properties.c      \
-    random.c rdelim.c read.c root.c rw.c scmsigs.c script.c simpos.c smob.c \
-    sort.c srcprop.c stackchk.c stacks.c stime.c strings.c strop.c         \
-    strorder.c strports.c struct.c symbols.c threads.c throw.c values.c            \
-    variable.c vectors.c version.c vports.c weaks.c
-
-DOT_X_FILES = alist.x arbiters.x async.x backtrace.x boolean.x chars.x   \
-    continuations.x debug.x deprecation.x deprecated.x dynl.x dynwind.x   \
-    environments.x eq.x                                                          \
-    error.x eval.x evalext.x extensions.x feature.x fluids.x fports.x    \
-    futures.x                                                            \
-    gc.x  gc-mark.x gc-segment.x gc-malloc.x gc-card.x goops.x           \
-    gsubr.x guardians.x hash.x hashtab.x hooks.x init.x ioext.x           \
-    keywords.x lang.x list.x load.x macros.x mallocs.x modules.x         \
-    numbers.x objects.x objprop.x options.x pairs.x ports.x print.x      \
-    procprop.x procs.x properties.x random.x rdelim.x read.x root.x rw.x  \
-    scmsigs.x script.x simpos.x smob.x sort.x srcprop.x                          \
-    stackchk.x stacks.x stime.x strings.x strop.x strorder.x strports.x          \
-    struct.x symbols.x threads.x throw.x values.x variable.x vectors.x   \
-    version.x vports.x weaks.x
+guile_LDFLAGS = @DLPREOPEN@ $(GUILE_CFLAGS)
+
+libguile_la_CFLAGS = $(GUILE_CFLAGS)
+
+libguile_la_SOURCES = alist.c arbiters.c async.c backtrace.c boolean.c \
+    chars.c continuations.c convert.c debug.c deprecation.c            \
+    deprecated.c discouraged.c dynwind.c environments.c eq.c error.c   \
+    eval.c evalext.c extensions.c feature.c fluids.c fports.c          \
+    futures.c gc.c gc-mark.c gc-segment.c gc-malloc.c gc-card.c                \
+    gc-freelist.c gc_os_dep.c gdbint.c gh_data.c gh_eval.c gh_funcs.c  \
+    gh_init.c gh_io.c gh_list.c gh_predicates.c goops.c gsubr.c                \
+    guardians.c hash.c hashtab.c hooks.c i18n.c init.c inline.c                \
+    ioext.c keywords.c lang.c list.c load.c macros.c mallocs.c         \
+    modules.c numbers.c objects.c objprop.c options.c pairs.c ports.c  \
+    print.c procprop.c procs.c properties.c random.c rdelim.c read.c   \
+    root.c rw.c scmsigs.c script.c simpos.c smob.c sort.c srcprop.c    \
+    stackchk.c stacks.c stime.c strings.c srfi-4.c srfi-13.c srfi-14.c \
+    strorder.c strports.c struct.c symbols.c threads.c null-threads.c  \
+    throw.c values.c variable.c vectors.c version.c vports.c weaks.c   \
+    ramap.c unif.c
+
+DOT_X_FILES = alist.x arbiters.x async.x backtrace.x boolean.x chars.x \
+    continuations.x debug.x deprecation.x deprecated.x discouraged.x   \
+    dynl.x dynwind.x environments.x eq.x error.x eval.x evalext.x      \
+    extensions.x feature.x fluids.x fports.x futures.x gc.x gc-mark.x  \
+    gc-segment.x gc-malloc.x gc-card.x goops.x gsubr.x guardians.x     \
+    hash.x hashtab.x hooks.x i18n.x init.x ioext.x keywords.x lang.x   \
+    list.x load.x macros.x mallocs.x modules.x numbers.x objects.x     \
+    objprop.x options.x pairs.x ports.x print.x procprop.x procs.x     \
+    properties.x random.x rdelim.x read.x root.x rw.x scmsigs.x                \
+    script.x simpos.x smob.x sort.x srcprop.x stackchk.x stacks.x      \
+    stime.x strings.x srfi-4.x srfi-13.x srfi-14.x strorder.x          \
+    strports.x struct.x symbols.x threads.x throw.x values.x           \
+    variable.x vectors.x version.x vports.x weaks.x ramap.x unif.x
 
 EXTRA_DOT_X_FILES = @EXTRA_DOT_X_FILES@
 
-DOT_DOC_FILES = alist.doc arbiters.doc async.doc backtrace.doc             \
-    boolean.doc chars.doc continuations.doc debug.doc deprecation.doc      \
-    deprecated.doc dynl.doc dynwind.doc environments.doc eq.doc                    \
-    error.doc eval.doc evalext.doc                                         \
-    extensions.doc feature.doc fluids.doc fports.doc futures.doc           \
-    gc.doc goops.doc                                                       \
-    gsubr.doc gc-mark.doc gc-segment.doc gc-malloc.doc gc-card.doc         \
-    guardians.doc hash.doc hashtab.doc hooks.doc init.doc ioext.doc        \
-    keywords.doc lang.doc list.doc load.doc macros.doc     \
-    mallocs.doc modules.doc numbers.doc objects.doc objprop.doc                    \
-    options.doc pairs.doc ports.doc print.doc procprop.doc                 \
-    procs.doc properties.doc random.doc rdelim.doc read.doc root.doc rw.doc \
-    scmsigs.doc script.doc simpos.doc smob.doc sort.doc                            \
-    srcprop.doc stackchk.doc stacks.doc stime.doc strings.doc strop.doc            \
-    strorder.doc strports.doc struct.doc symbols.doc threads.doc throw.doc  \
-    values.doc variable.doc vectors.doc version.doc vports.doc weaks.doc
+DOT_DOC_FILES = alist.doc arbiters.doc async.doc backtrace.doc         \
+    boolean.doc chars.doc continuations.doc debug.doc deprecation.doc  \
+    deprecated.doc discouraged.doc dynl.doc dynwind.doc                        \
+    environments.doc eq.doc error.doc eval.doc evalext.doc             \
+    extensions.doc feature.doc fluids.doc fports.doc futures.doc       \
+    gc.doc goops.doc gsubr.doc gc-mark.doc gc-segment.doc              \
+    gc-malloc.doc gc-card.doc guardians.doc hash.doc hashtab.doc       \
+    hooks.doc i18n.doc init.doc ioext.doc keywords.doc lang.doc                \
+    list.doc load.doc macros.doc mallocs.doc modules.doc numbers.doc   \
+    objects.doc objprop.doc options.doc pairs.doc ports.doc print.doc  \
+    procprop.doc procs.doc properties.doc random.doc rdelim.doc                \
+    read.doc root.doc rw.doc scmsigs.doc script.doc simpos.doc         \
+    smob.doc sort.doc srcprop.doc stackchk.doc stacks.doc stime.doc    \
+    strings.doc srfi-4.doc srfi-13.doc srfi-14.doc strorder.doc                \
+    strports.doc struct.doc symbols.doc threads.doc throw.doc          \
+    values.doc variable.doc vectors.doc version.doc vports.doc         \
+    weaks.doc ramap.doc unif.doc
 
 EXTRA_DOT_DOC_FILES = @EXTRA_DOT_DOC_FILES@
 
@@ -136,11 +149,11 @@ BUILT_SOURCES = cpp_err_symbols.c cpp_sig_symbols.c libpath.h \
     version.h scmconfig.h \
     $(DOT_X_FILES) $(EXTRA_DOT_X_FILES) guile.texi
 
-EXTRA_libguile_la_SOURCES = _scm.h                     \
-    alloca.c inet_aton.c memmove.c putenv.c strerror.c \
-    dynl.c regex-posix.c                               \
-    filesys.c posix.c net_db.c socket.c                        \
-    ramap.c unif.c debug-malloc.c mkstemp.c            \
+EXTRA_libguile_la_SOURCES = _scm.h             \
+    inet_aton.c memmove.c putenv.c strerror.c  \
+    dynl.c regex-posix.c                       \
+    filesys.c posix.c net_db.c socket.c                \
+    debug-malloc.c mkstemp.c   \
     win32-uname.c win32-dirent.c win32-socket.c
 
 ## delete guile-snarf.awk from the installation bindir, in case it's
@@ -153,35 +166,38 @@ install-exec-hook:
 ## compile, since they are #included.  So instead we list them here.
 ## Perhaps we can deal with them normally once the merge seems to be
 ## working.
-noinst_HEADERS = num2integral.i.c num2float.i.c convert.i.c    \
+noinst_HEADERS = convert.i.c                                   \
+                 conv-integer.i.c conv-uinteger.i.c            \
+                 srfi-4.i.c                                    \
+                 quicksort.i.c                                  \
                  win32-uname.h win32-dirent.h win32-socket.h   \
                 private-gc.h
 
 libguile_la_DEPENDENCIES = @LIBLOBJS@
-libguile_la_LIBADD = @LIBLOBJS@ ../libguile-ltdl/libguile-ltdl.la $(THREAD_LIBS_LOCAL)
-libguile_la_LDFLAGS = -version-info @LIBGUILE_INTERFACE_CURRENT@:@LIBGUILE_INTERFACE_REVISION@:@LIBGUILE_INTERFACE_AGE@ -export-dynamic -no-undefined
+libguile_la_LIBADD = @LIBLOBJS@
+libguile_la_LDFLAGS = @LTLIBINTL@ -version-info @LIBGUILE_INTERFACE_CURRENT@:@LIBGUILE_INTERFACE_REVISION@:@LIBGUILE_INTERFACE_AGE@ -export-dynamic -no-undefined
 
 # These are headers visible as <guile/mumble.h>
 pkginclude_HEADERS = gh.h
 
 # These are headers visible as <libguile/mumble.h>.
 modincludedir = $(includedir)/libguile
-modinclude_HEADERS = __scm.h alist.h arbiters.h async.h backtrace.h boolean.h \
-    chars.h continuations.h convert.h debug.h                                \
-    debug-malloc.h threads-plugin.h null-threads.h pthread-threads.h         \
-    deprecation.h deprecated.h dynl.h dynwind.h environments.h eq.h          \
-    error.h eval.h                                                           \
-    evalext.h extensions.h feature.h filesys.h fluids.h fports.h futures.h    \
-    gc.h gdb_interface.h gdbint.h                                            \
-    goops.h gsubr.h guardians.h hash.h hashtab.h hooks.h init.h                      \
-    inline.h ioext.h                                                         \
-    iselect.h keywords.h lang.h list.h load.h macros.h mallocs.h modules.h    \
-    net_db.h numbers.h objects.h objprop.h options.h pairs.h ports.h posix.h  \
-    regex-posix.h print.h procprop.h procs.h properties.h random.h ramap.h    \
-    rdelim.h read.h root.h rw.h scmsigs.h validate.h script.h simpos.h smob.h \
-    snarf.h socket.h sort.h srcprop.h stackchk.h stacks.h stime.h strings.h   \
-    strop.h strorder.h strports.h struct.h symbols.h tags.h threads.h        \
-    throw.h unif.h values.h variable.h vectors.h vports.h weaks.h
+modinclude_HEADERS = __scm.h alist.h arbiters.h async.h backtrace.h    \
+    boolean.h chars.h continuations.h convert.h debug.h debug-malloc.h \
+    deprecation.h deprecated.h discouraged.h dynl.h dynwind.h          \
+    environments.h eq.h error.h eval.h evalext.h extensions.h          \
+    feature.h filesys.h fluids.h fports.h futures.h gc.h               \
+    gdb_interface.h gdbint.h goops.h gsubr.h guardians.h hash.h                \
+    hashtab.h hooks.h i18n.h init.h inline.h ioext.h iselect.h         \
+    keywords.h lang.h list.h load.h macros.h mallocs.h modules.h       \
+    net_db.h numbers.h objects.h objprop.h options.h pairs.h ports.h   \
+    posix.h regex-posix.h print.h procprop.h procs.h properties.h      \
+    random.h ramap.h rdelim.h read.h root.h rw.h scmsigs.h validate.h  \
+    script.h simpos.h smob.h snarf.h socket.h sort.h srcprop.h         \
+    stackchk.h stacks.h stime.h strings.h srfi-4.h srfi-13.h srfi-14.h \
+    strorder.h strports.h struct.h symbols.h tags.h threads.h          \
+    pthread-threads.h null-threads.h throw.h unif.h values.h           \
+    variable.h vectors.h vports.h weaks.h
 
 nodist_modinclude_HEADERS = version.h scmconfig.h
 
@@ -195,8 +211,8 @@ EXTRA_DIST = ChangeLog-gh ChangeLog-scm ChangeLog-threads           \
     ChangeLog-1996-1999 ChangeLog-2000 cpp_signal.c                    \
     cpp_errno.c cpp_err_symbols.in cpp_err_symbols.c           \
     cpp_sig_symbols.c cpp_sig_symbols.in cpp_cnvt.awk  \
-    c-tokenize.lex threads-plugin.c version.h.in pthread-threads.c \
-    scmconfig.h.top
+    c-tokenize.lex version.h.in \
+    scmconfig.h.top gettext.h
 #    $(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES) \
 #    guile-procedures.txt guile.texi
 
@@ -242,6 +258,7 @@ libpath.h: $(srcdir)/Makefile.in  $(top_builddir)/config.status
        @echo ' { "libguileinterface", "@LIBGUILE_INTERFACE@" }, \' \
                >> libpath.tmp
        @echo ' { "LIBS",          "@GUILE_LIBS@" }, \' >> libpath.tmp
+       @echo ' { "CFLAGS",        "@GUILE_CFLAGS@" }, \' >> libpath.tmp
        @echo ' { "buildstamp",    "'"`date`"'" }, \' >> libpath.tmp
        @echo '}' >> libpath.tmp
        @mv libpath.tmp libpath.h
@@ -271,10 +288,10 @@ alldotdocfiles    = $(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES)
 snarf2checkedtexi = GUILE="$(GUILE_FOR_BUILD)" $(top_srcdir)/scripts/snarf-check-and-output-texi
 dotdoc2texi       = cat $(alldotdocfiles) | $(snarf2checkedtexi)
 
-guile.texi: $(alldotdocfiles) guile
+guile.texi: $(alldotdocfiles) guile$(EXEEXT)
        $(dotdoc2texi) --manual > $@ || { rm $@; false; }
 
-guile-procedures.texi: $(alldotdocfiles) guile
+guile-procedures.texi: $(alldotdocfiles) guile$(EXEEXT)
        $(dotdoc2texi)          > $@ || { rm $@; false; }
 
 if HAVE_MAKEINFO