← Back to branch summary

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

« back to all changes in this revision

Viewing changes to srfi/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:
srfi/Makefile.am
26
26
## Check for headers in $(srcdir)/.., so that #include
27
27
## <libguile/MUMBLE.h> will find MUMBLE.h in this dir when we're
28
28
## building.
29
 
INCLUDES = -I.. -I$(srcdir)/..
 
29
AM_CPPFLAGS = -I.. -I$(srcdir)/..
30
30
 
31
31
srfiincludedir = $(pkgincludedir)/srfi
32
32
 
81
81
            srfi-69.scm \
82
82
            srfi-88.scm
83
83
 
84
 
EXTRA_DIST = $(srfi_DATA) 
 
84
EXTRA_DIST = $(srfi_DATA) ChangeLog-2008
85
85
TAGS_FILES = $(srfi_DATA)
86
86
 
87
87
GUILE_SNARF = ../libguile/guile-snarf
88
88
 
89
 
MKDEP = gcc -M -MG $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 
89
MKDEP = gcc -M -MG $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS)
90
90
 
91
 
snarfcppopts = $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 
91
snarfcppopts = $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS)
92
92
 
93
93
SUFFIXES = .x
94
94
.c.x: