[libgweather] Move pc files to data
- From: Giovanni Campagna <gcampagna src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgweather] Move pc files to data
- Date: Tue, 14 Apr 2015 06:46:13 +0000 (UTC)
commit a0168af271d860d59cf9f49fef657c997738e9d9
Author: Giovanni Campagna <gcampagna src gnome org>
Date: Mon Apr 13 22:29:22 2015 -0700
Move pc files to data
Get them out of the source folder
configure.ac | 12 ++++++------
data/Makefile.am | 5 +++++
.../gweather-3.0-uninstalled.pc.in | 0
{libgweather => data}/gweather-3.0.pc.in | 0
libgweather/Makefile.am | 5 +----
5 files changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ea409d6..204b219 100644
--- a/configure.ac
+++ b/configure.ac
@@ -208,16 +208,16 @@ dnl *** Output Makefiles et al ***
dnl ***************************************************************************
AC_CONFIG_FILES([
Makefile
+data/gweather-3.0.pc
+data/gweather-3.0-uninstalled.pc
+data/Makefile
+data/glade/Makefile
doc/Makefile
doc/version.xml
-po/Makefile.in
-po-locations/Makefile.in
libgweather/Makefile
-libgweather/gweather-3.0.pc
-libgweather/gweather-3.0-uninstalled.pc
libgweather/gweather-version.h
-data/Makefile
-data/glade/Makefile
+po/Makefile.in
+po-locations/Makefile.in
schemas/Makefile
])
AC_OUTPUT
diff --git a/data/Makefile.am b/data/Makefile.am
index 746910e..1ccf14a 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -24,7 +24,12 @@ check:
@INTLTOOL_XML_NOMERGE_RULE@
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = gweather-3.0.pc
+
EXTRA_DIST = \
+ gweather-3.0.pc.in \
+ gweather-3.0-uninstalled.pc.in \
Locations.xml.in \
$(libgweatherdtd_DATA) \
check-timezones.sh \
diff --git a/libgweather/gweather-3.0-uninstalled.pc.in b/data/gweather-3.0-uninstalled.pc.in
similarity index 100%
rename from libgweather/gweather-3.0-uninstalled.pc.in
rename to data/gweather-3.0-uninstalled.pc.in
diff --git a/libgweather/gweather-3.0.pc.in b/data/gweather-3.0.pc.in
similarity index 100%
rename from libgweather/gweather-3.0.pc.in
rename to data/gweather-3.0.pc.in
diff --git a/libgweather/Makefile.am b/libgweather/Makefile.am
index e6b4595..47f2309 100644
--- a/libgweather/Makefile.am
+++ b/libgweather/Makefile.am
@@ -75,10 +75,7 @@ gweather-enum-types.c: $(gweather_new_headers)
BUILT_SOURCES = gweather-enum-types.c gweather-enum-types.h
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gweather-3.0.pc
-
-EXTRA_DIST = gweather-3.0.pc.in gweather-3.0-uninstalled.pc.in gweather-version.h.in
+EXTRA_DIST = gweather-version.h.in
CLEANFILES = $(noinst_PROGRAMS) $(BUILT_SOURCES)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]