[cheese/libcheese] move the pkg-config files to data
- From: Daniel G. Siegel <dgsiegel src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cheese/libcheese] move the pkg-config files to data
- Date: Mon, 31 Jan 2011 21:33:14 +0000 (UTC)
commit c8346bdc5b9773cf2cdb57b0dbb2a38a7f67a0e9
Author: daniel g. siegel <dgsiegel gnome org>
Date: Mon Jan 31 22:32:14 2011 +0100
move the pkg-config files to data
all pkg-config files now live in data, as that is the place
of non code files
.gitignore | 3 ++-
Makefile.am | 5 -----
configure.ac | 4 ++--
data/Makefile.am | 10 ++++++++++
cheese-gtk.pc.in => data/cheese-gtk.pc.in | 0
cheese.pc.in => data/cheese.pc.in | 0
6 files changed, 14 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 31e9b32..7f1c712 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,7 +41,8 @@ help/*/cheese.xml
.waf-*
_build_
*.swp
-cheese-gtk.pc
+data/cheese-gtk.pc
+data/cheese.pc
tests/cheese-test-widget
tests/cheese-test-monitor
tests/cheese-test-chooser
diff --git a/Makefile.am b/Makefile.am
index c0f6f2e..c9ee1bf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,14 +5,9 @@ EXTRA_DIST = \
gnome-doc-utils.make\
ChangeLog.pre-git
-CLEANFILES = cheese-gtk.pc
-
DISTCLEANFILES = \
gnome-doc-utils.make
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = cheese.pc cheese-gtk.pc
-
DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install --disable-scrollkeeper --enable-gtk-doc
CHANGELOG_START = 2.26.0
diff --git a/configure.ac b/configure.ac
index 335d361..5c4f1cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -174,12 +174,12 @@ GLIB_GSETTINGS
AC_OUTPUT([
Makefile
-cheese.pc
-cheese-gtk.pc
docs/Makefile
docs/reference/Makefile
docs/reference/version.xml
data/Makefile
+data/cheese.pc
+data/cheese-gtk.pc
data/cheese.desktop.in
data/icons/Makefile
data/icons/16x16/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 1b61e1e..7f5c458 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -18,6 +18,11 @@ pkgdata_DATA = \
cheese-prefs.ui \
cheese-viewport.json
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = \
+ cheese.pc \
+ cheese-gtk.pc
+
EXTRA_DIST = \
$(desktop_in_files) \
$(gsettings_SCHEMAS) \
@@ -31,3 +36,8 @@ clean-local :
DISTCLEANFILES = \
cheese.desktop \
org.gnome.Cheese.service
+
+CLEANFILES = \
+ cheese.pc \
+ cheese-gtk.pc
+
diff --git a/cheese-gtk.pc.in b/data/cheese-gtk.pc.in
similarity index 100%
rename from cheese-gtk.pc.in
rename to data/cheese-gtk.pc.in
diff --git a/cheese.pc.in b/data/cheese.pc.in
similarity index 100%
rename from cheese.pc.in
rename to data/cheese.pc.in
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]