mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-29 19:30:36 +02:00
Code Activity

parallel installability for libguile*.h

Browse source 
* Makefile.am:
* libguile/Makefile.am (modincludedir): Install into
  $pkgincludedir/$GUILE_EFFECTIVE_VERSION. This allows multiple Guile
  development packages to be installed at once.

* guile-readline/Makefile.am (modincludedir):
* srfi/Makefile.am (srfiincludedir): Likewise.

* meta/guile-2.0.pc.in (Cflags): Add the appropriate -I line so that
  user code picks up the new location transparently.
This commit is contained in:
Andy Wingo 2010-03-16 21:37:12 +01:00
parent 44602b0868
commit 718815d761
5 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Makefile.am
View file

@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in.
##
## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
##
## This file is part of GUILE.
##
@ -28,7 +28,8 @@ SUBDIRS = lib meta libguile guile-readline emacs \
srfi examples test-suite benchmark-suite am \
module doc testsuite
include_HEADERS = libguile.h
libguileincludedir = $(pkgincludedir)/$(GUILE_EFFECTIVE_VERSION)
libguileinclude_HEADERS = libguile.h
EXTRA_DIST = LICENSE HACKING GUILE-VERSION \
m4/ChangeLog-2008 \

3
guile-readline/Makefile.am
View file

@ -54,7 +54,8 @@ libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_LDFLAGS = \
BUILT_SOURCES = readline.x
pkginclude_HEADERS = readline.h
modincludedir = $(pkgincludedir)/$(GUILE_EFFECTIVE_VERSION)
modinclude_HEADERS = readline.h
snarfcppopts = $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS)
SUFFIXES = .x

2
libguile/Makefile.am
View file

@ -462,7 +462,7 @@ endif HAVE_LD_VERSION_SCRIPT
pkginclude_HEADERS =
# These are headers visible as <libguile/mumble.h>.
modincludedir = $(includedir)/libguile
modincludedir = $(pkgincludedir)/$(GUILE_EFFECTIVE_VERSION)/libguile
modinclude_HEADERS = \
__scm.h \
alist.h \

3
meta/guile-2.0.pc.in
View file

@ -5,6 +5,7 @@ includedir=@includedir@
datarootdir=@datarootdir@
datadir=@datadir@
pkgdatadir=@datadir@/guile
pkgincludedir=@includedir@/guile
sitedir=@sitedir@
extensionsdir=@libdir@/guile/@GUILE_EFFECTIVE_VERSION@/extensions
@ -14,4 +15,4 @@ Name: GNU Guile
Description: GNU's Ubiquitous Intelligent Language for Extension
Version: @GUILE_VERSION@
Libs: -L${libdir} -lguile-@GUILE_EFFECTIVE_VERSION@ @GUILE_LIBS@
Cflags: -I${includedir} @GUILE_CFLAGS@ @BDW_GC_CFLAGS@
Cflags: -I${pkgincludedir}/@GUILE_EFFECTIVE_VERSION@ @GUILE_CFLAGS@ @BDW_GC_CFLAGS@

3
srfi/Makefile.am
View file

@ -32,7 +32,8 @@ AM_CPPFLAGS = -I.. -I$(srcdir)/.. \
AM_CFLAGS = $(GCC_CFLAGS)
AM_LDFLAGS = $(GNU_LD_FLAGS)
srfiincludedir = $(pkgincludedir)/srfi
# FIXME: should be libguile/srfi
srfiincludedir = $(pkgincludedir)/$(GUILE_EFFECTIVE_VERSION)/srfi
# These headers are visible as <guile/srfi/mumble.h>
srfiinclude_HEADERS = srfi-1.h srfi-4.h srfi-13.h srfi-14.h srfi-60.h