[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] 01/01: build: Add missing substitutions for 'guile-2.0.p
|
From: |
Ludovic Courtès |
|
Subject: |
[Guile-commits] 01/01: build: Add missing substitutions for 'guile-2.0.pc'. |
|
Date: |
Wed, 03 Dec 2014 22:09:26 +0000 |
civodul pushed a commit to branch stable-2.0
in repository guile.
commit 7c433cbbce83bc9f2f9967afba00bbb68e312657
Author: Ludovic Courtès <address@hidden>
Date: Wed Dec 3 23:09:12 2014 +0100
build: Add missing substitutions for 'guile-2.0.pc'.
This is a followup to 5fac1a7.
* meta/Makefile.am (substitute): Add GUILE_* and LIBGUILE_* substitutions,
and $(dependency_substitutions).
(dependency_substitutions): New variable.
---
meta/Makefile.am | 60 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 42 insertions(+), 18 deletions(-)
diff --git a/meta/Makefile.am b/meta/Makefile.am
index 5f19db5..b48c8ec 100644
--- a/meta/Makefile.am
+++ b/meta/Makefile.am
@@ -47,26 +47,50 @@ aclocal_DATA = guile.m4
# Script to instantiate substitution variables found on the standard
# input. We do this from the Makefile because we need things like
# $(program_transform_name), which are not usable from 'configure.ac'.
-substitute = \
- guile="`echo guile | $(SED) -e '$(program_transform_name)'`" ; \
- guild="`echo guild | $(SED) -e '$(program_transform_name)'`" ; \
- installed_guile="@bindir@/$$guile" ; \
- $(SED) -e "s,address@hidden@],$(PACKAGE_NAME),g" \
- -e "s,address@hidden@],$(PACKAGE_BUGREPORT),g" \
- -e "s,address@hidden@],$(PKG_CONFIG),g" \
- -e "s,address@hidden@],$(pkgconfigdir),g" \
- -e "s,address@hidden@],$(prefix),g" \
- -e "s,address@hidden@],$(exec_prefix),g" \
- -e "s,address@hidden@],$(bindir),g" \
- -e "s,address@hidden@],$(libdir),g" \
- -e "s,address@hidden@],$(includedir),g" \
- -e "s,address@hidden@],$(datarootdir),g" \
- -e "s,address@hidden@],$(datadir),g" \
- -e "s,address@hidden@],$(sitedir),g" \
- -e "s,address@hidden@],$$guile,g"
\
- -e "s,address@hidden@],$$guild,g"
\
+substitute =
\
+ guile="`echo guile | $(SED) -e '$(program_transform_name)'`" ;
\
+ guild="`echo guild | $(SED) -e '$(program_transform_name)'`" ;
\
+ installed_guile="@bindir@/$$guile" ;
\
+ $(SED) -e "s,address@hidden@],$(PACKAGE_NAME),g"
\
+ -e "s,address@hidden@],$(PACKAGE_BUGREPORT),g" \
+ -e "s,address@hidden@],$(GUILE_EFFECTIVE_VERSION),g" \
+ -e "s,address@hidden@],$(GUILE_VERSION),g"
\
+ -e "s,address@hidden@],$(GUILE_CFLAGS),g"
\
+ -e "s,address@hidden@],$(GUILE_LIBS),g"
\
+ -e "s,address@hidden@],$(LIBGUILE_INTERFACE),g" \
+ $(dependency_substitutions)
\
+ -e "s,address@hidden@],$(PKG_CONFIG),g"
\
+ -e "s,address@hidden@],$(pkgconfigdir),g"
\
+ -e "s,address@hidden@],$(prefix),g"
\
+ -e "s,address@hidden@],$(exec_prefix),g"
\
+ -e "s,address@hidden@],$(bindir),g"
\
+ -e "s,address@hidden@],$(libdir),g"
\
+ -e "s,address@hidden@],$(includedir),g"
\
+ -e "s,address@hidden@],$(datarootdir),g"
\
+ -e "s,address@hidden@],$(datadir),g"
\
+ -e "s,address@hidden@],$(sitedir),g"
\
+ -e "s,address@hidden@],$$guile,g"
\
+ -e "s,address@hidden@],$$guild,g"
\
-e "s,address@hidden@],$$installed_guile,g"
+# Substitutions for dependencies that appear in 'guile-2.0.pc'.
+dependency_substitutions = \
+ -e "s,address@hidden@],$(BDW_GC_CFLAGS),g" \
+ -e "s,address@hidden@],$(BDW_GC_LIBS),g" \
+ -e "s,address@hidden@],$(LIB_CLOCK_GETTIME),g" \
+ -e "s,address@hidden@],$(LIBGMP),g" \
+ -e "s,address@hidden@],$(LIBLTDL),g" \
+ -e "s,address@hidden@],$(LIBFFI_LIBS),g" \
+ -e "s,address@hidden@],$(LIBUNISTRING),g" \
+ -e "s,address@hidden@],$(LIBICONV),g" \
+ -e "s,address@hidden@],$(LIBINTL),g" \
+ -e "s,address@hidden@],$(LIBSOCKET),g" \
+ -e "s,address@hidden@],$(SERVENT_LIB),g" \
+ -e "s,address@hidden@],$(HOSTENT_LIB),g" \
+ -e "s,address@hidden@],$(GETADDRINFO_LIB),g" \
+ -e "s,address@hidden@],$(INET_NTOP_LIB),g" \
+ -e "s,address@hidden@],$(INET_PTON_LIB),g"
+
guile-2.0.pc: guile-2.0.pc.in
$(substitute) < "$<" > "address@hidden"
mv "address@hidden" "$@"