← Back to branch summary

~peter-pearse/ubuntu/natty/guile-1.8/prop001

« back to all changes in this revision

Viewing changes to libguile/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Steve Langasek
  • Date: 2009-06-04 19:01:38 UTC
  • mfrom: (8.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20090604190138-1ao3t6sj31cqvcfe
Tags: 1.8.6+1-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - Build with -Wno-error.
  - Build with thread support. Some guile-using programs like autogen need it.
  - Add debian/guile-1.8-libs.shlibs: Thread support breaks ABI, bump the soname.
* Dropped changes:
  - libltdl3-dev -> libltdl7-dev: current libltdl-dev Provides: both.
  - debian/patches/libtool-ftbfs.diff: integrated upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libguile/Makefile.am
32
32
## Check for headers in $(srcdir)/.., so that #include
33
33
## <libguile/MUMBLE.h> will find MUMBLE.h in this dir when we're
34
34
## building.
35
 
INCLUDES = -I.. -I$(top_srcdir) -I$(top_builddir)
 
35
AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_builddir)
36
36
 
37
37
ETAGS_ARGS = --regex='/SCM_\(GLOBAL_\)?\(G?PROC\|G?PROC1\|SYMBOL\|VCELL\|CONST_LONG\).*\"\([^\"]\)*\"/\3/' \
38
38
   --regex='/[ \t]*SCM_[G]?DEFINE1?[ \t]*(\([^,]*\),[^,]*/\1/'
48
48
## For some reason, OBJEXT does not include the dot
49
49
gen-scmconfig.$(OBJEXT): gen-scmconfig.c
50
50
        if [ "$(cross_compiling)" = "yes" ]; then \
51
 
                $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) -c -o $@ $<; \
 
51
                $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) -c -o $@ $<; \
52
52
        else \
53
53
                $(COMPILE) -c -o $@ $<; \
54
54
        fi
76
76
## For some reason, OBJEXT does not include the dot
77
77
c-tokenize.$(OBJEXT): c-tokenize.c
78
78
        if [ "$(cross_compiling)" = "yes" ]; then \
79
 
                $(CC_FOR_BUILD) $(DEFS) $(INCLUDES) -c -o $@ $<; \
 
79
                $(CC_FOR_BUILD) $(DEFS) $(AM_CPPFLAGS) -c -o $@ $<; \
80
80
        else \
81
81
                $(COMPILE) -c -o $@ $<; \
82
82
        fi
94
94
guile_SOURCES = guile.c
95
95
guile_CFLAGS = $(GUILE_CFLAGS)
96
96
guile_LDADD = libguile.la
97
 
guile_LDFLAGS = @DLPREOPEN@ $(GUILE_CFLAGS)
 
97
guile_LDFLAGS = $(GUILE_CFLAGS)
98
98
 
99
99
libguile_la_CFLAGS = $(GUILE_CFLAGS)
100
100
 
214
214
noinst_SCRIPTS = guile-doc-snarf guile-snarf-docs guile-func-name-check
215
215
 
216
216
EXTRA_DIST = ChangeLog-gh ChangeLog-scm ChangeLog-threads               \
217
 
    ChangeLog-1996-1999 ChangeLog-2000 cpp_signal.c                     \
218
 
    cpp_errno.c cpp_err_symbols.in cpp_err_symbols.c            \
219
 
    cpp_sig_symbols.c cpp_sig_symbols.in cpp_cnvt.awk   \
220
 
    c-tokenize.lex version.h.in \
221
 
    scmconfig.h.top gettext.h
 
217
    ChangeLog-1996-1999 ChangeLog-2000 ChangeLog-2008 cpp_signal.c      \
 
218
    cpp_errno.c cpp_err_symbols.in cpp_err_symbols.c                    \
 
219
    cpp_sig_symbols.c cpp_sig_symbols.in cpp_cnvt.awk                   \
 
220
    c-tokenize.lex version.h.in                                         \
 
221
    scmconfig.h.top gettext.h measure-hwm.scm
222
222
#    $(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES) \
223
223
#    guile-procedures.txt guile.texi
224
224
 
270
270
        @mv libpath.tmp libpath.h
271
271
 
272
272
 
273
 
snarfcppopts = $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 
273
snarfcppopts = $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS)
274
274
 
275
275
SUFFIXES = .x .doc
276
276
.c.x:
313
313
 
314
314
endif
315
315
 
 
316
# Stack limit calibration for `make check'.  (For why we do this, see
 
317
# the comments in measure-hwm.scm.)  We're relying here on a couple of
 
318
# bits of Automake magic.
 
319
#
 
320
# 1. The fact that "libguile" comes before "test-suite" in SUBDIRS in
 
321
# our toplevel Makefile.am.  This ensures that the
 
322
# stack-limit-calibration.scm "test" will be run before any of the
 
323
# tests under test-suite.
 
324
#
 
325
# 2. The fact that each test is invoked as $TESTS_ENVIRONMENT $test.
 
326
# This allows us to ensure that the test will be considered to have
 
327
# passed, by using `true' as TESTS_ENVIRONMENT.
 
328
#
 
329
# Why don't we care about the test "actually passing"?  Because the
 
330
# important thing about stack-limit-calibration.scm is just that it is
 
331
# generated in the first place, so that other tests under test-suite
 
332
# can use it.
 
333
TESTS = stack-limit-calibration.scm
 
334
TESTS_ENVIRONMENT = true
 
335
 
 
336
stack-limit-calibration.scm: measure-hwm.scm guile$(EXEEXT)
 
337
        $(preinstguile) -s $(srcdir)/measure-hwm.scm > $@
 
338
 
316
339
c-tokenize.c: c-tokenize.lex
317
340
        flex -t $(srcdir)/c-tokenize.lex > $@ || { rm $@; false; }
318
341
 
320
343
schemelib_DATA = guile-procedures.txt
321
344
 
322
345
## Add -MG to make the .x magic work with auto-dep code.
323
 
MKDEP = gcc -M -MG $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 
346
MKDEP = gcc -M -MG $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS)
324
347
 
325
348
cpp_err_symbols.c: cpp_err_symbols.in cpp_cnvt.awk
326
349
        $(AWK) -f $(srcdir)/cpp_cnvt.awk < $(srcdir)/cpp_err_symbols.in > \
367
390
        cpp_err_symbols_here cpp_err_symbols_diff cpp_err_symbols_new \
368
391
        cpp_sig_symbols_here cpp_sig_symbols_diff cpp_sig_symbols_new \
369
392
        version.h version.h.tmp \
370
 
        scmconfig.h scmconfig.h.tmp
 
393
        scmconfig.h scmconfig.h.tmp stack-limit-calibration.scm
371
394
 
372
395
CLEANFILES = libpath.h *.x *.doc guile-procedures.txt guile-procedures.texi guile.texi
373
396