[json-glib] build: Move the pkg-config file under json-glib
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [json-glib] build: Move the pkg-config file under json-glib
- Date: Mon, 2 Dec 2013 11:13:16 +0000 (UTC)
commit 3c0ec689cdba1379791da3bcc1ad07c46416ac9a
Author: Emmanuele Bassi <ebassi gnome org>
Date: Mon Dec 2 10:46:57 2013 +0000
build: Move the pkg-config file under json-glib
The pkg-config file for a library is tied to the source, so it should
not be in the top-level of the project.
Makefile.am | 11 -----------
configure.ac | 3 +--
json-glib/Makefile.am | 10 ++++++++++
json-glib.pc.in => json-glib/json-glib.pc.in | 0
4 files changed, 11 insertions(+), 13 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index d4e636d..d2dbe69 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,17 +4,6 @@ EXTRA_DIST =
SUBDIRS = json-glib doc build po
-pcfiles = json-glib-1.0.pc
-
-json-glib-1.0.pc: json-glib.pc
- $(AM_V_GEN)cp -f $< $@
-
-pkgconfig_DATA = $(pcfiles)
-pkgconfigdir = $(libdir)/pkgconfig
-EXTRA_DIST += json-glib.pc.in
-
-CLEANFILES = $(pcfiles)
-
DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-man --enable-maintainer-flags --enable-introspection
dist-hook:
diff --git a/configure.ac b/configure.ac
index 3e464be..932120f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -346,6 +346,7 @@ AC_CONFIG_FILES([
build/win32/vs10/Makefile
json-glib/Makefile
+ json-glib/json-glib.pc
json-glib/json-version.h
json-glib/tests/Makefile
@@ -354,8 +355,6 @@ AC_CONFIG_FILES([
doc/reference/version.xml
po/Makefile.in
-
- json-glib.pc
])
AC_OUTPUT
diff --git a/json-glib/Makefile.am b/json-glib/Makefile.am
index 700310f..09786cc 100644
--- a/json-glib/Makefile.am
+++ b/json-glib/Makefile.am
@@ -98,6 +98,16 @@ jsoninclude_DATA = \
EXTRA_DIST += json-version.h.in json-glib.h json-version.h
+pcfiles = json-glib-1.0.pc
+
+json-glib-1.0.pc: json-glib.pc
+ $(AM_V_GEN)cp -f $< $@
+
+pkgconfig_DATA = $(pcfiles)
+pkgconfigdir = $(libdir)/pkgconfig
+CLEANFILES += $(pcfiles)
+EXTRA_DIST += json-glib.pc.in
+
TESTS_ENVIRONMENT = srcdir="$(srcdir)" json_all_c_sources="$(source_c)"
if OS_LINUX
diff --git a/json-glib.pc.in b/json-glib/json-glib.pc.in
similarity index 100%
rename from json-glib.pc.in
rename to json-glib/json-glib.pc.in
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]