[tracker/data-in-binary-dirs: 1/3] data: Moved all .pc data into their respective lib dirs
- From: Martyn James Russell <mr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/data-in-binary-dirs: 1/3] data: Moved all .pc data into their respective lib dirs
- Date: Thu, 4 Sep 2014 18:32:22 +0000 (UTC)
commit 59b3534388cd3b79635f050f5c72c68170be1376
Author: Martyn Russell <martyn lanedo com>
Date: Thu Sep 4 19:04:43 2014 +0100
data: Moved all .pc data into their respective lib dirs
configure.ac | 6 ++--
data/Makefile.am | 21 ++-----------------
src/libtracker-control/Makefile.am | 11 +++++++++-
.../libtracker-control}/tracker-control.pc.in | 0
src/libtracker-miner/Makefile.am | 11 +++++++++-
{data => src/libtracker-miner}/tracker-miner.pc.in | 0
src/libtracker-sparql/Makefile.am | 12 +++++++++-
.../libtracker-sparql}/tracker-sparql.pc.in | 0
8 files changed, 36 insertions(+), 25 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 01f00b0..1680670 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2540,9 +2540,6 @@ AC_CONFIG_FILES([
data/Makefile
data/miners/Makefile
data/ontologies/Makefile
- data/tracker-control.pc
- data/tracker-sparql.pc
- data/tracker-miner.pc
docs/Makefile
docs/design/Makefile
docs/manpages/Makefile
@@ -2562,14 +2559,17 @@ AC_CONFIG_FILES([
src/libstemmer/Makefile
src/libtracker-common/Makefile
src/libtracker-sparql/Makefile
+ src/libtracker-sparql/tracker-sparql.pc
src/libtracker-bus/Makefile
src/libtracker-control/Makefile
+ src/libtracker-control/tracker-control.pc
src/libtracker-data/Makefile
src/libtracker-direct/Makefile
src/libtracker-sparql-backend/Makefile
src/libtracker-fts/Makefile
src/libtracker-extract/Makefile
src/libtracker-miner/Makefile
+ src/libtracker-miner/tracker-miner.pc
src/Makefile
src/miners/Makefile
src/miners/fs/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 055f214..a508920 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -76,26 +76,11 @@ endif
@INTLTOOL_DESKTOP_RULE@
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = \
- tracker-control-$(TRACKER_API_VERSION).pc \
- tracker-sparql-$(TRACKER_API_VERSION).pc \
- tracker-miner-$(TRACKER_API_VERSION).pc
-
-tracker-control-$(TRACKER_API_VERSION).pc: tracker-control.pc
- cp $< $@
-
-tracker-sparql-$(TRACKER_API_VERSION).pc: tracker-sparql.pc
- cp $< $@
-
tracker-miner-$(TRACKER_API_VERSION).pc: tracker-miner.pc
cp $< $@
-CLEANFILES = \
- $(autostart_DATA) \
- $(desktop_in_files) \
- tracker-control-$(TRACKER_API_VERSION).pc \
- tracker-sparql-$(TRACKER_API_VERSION).pc \
- tracker-miner-$(TRACKER_API_VERSION).pc
+CLEANFILES = \
+ $(autostart_DATA) \
+ $(desktop_in_files)
EXTRA_DIST = $(desktop_in_in_files)
diff --git a/src/libtracker-control/Makefile.am b/src/libtracker-control/Makefile.am
index 20c1179..be6eb15 100644
--- a/src/libtracker-control/Makefile.am
+++ b/src/libtracker-control/Makefile.am
@@ -34,6 +34,15 @@ libtracker_control_ TRACKER_API_VERSION@_la_LIBADD = \
$(BUILD_LIBS) \
$(LIBTRACKER_MINER_LIBS)
+# PkgConfig
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = tracker-control-$(TRACKER_API_VERSION).pc
+
+tracker-control-$(TRACKER_API_VERSION).pc: tracker-control.pc
+ cp $< $@
+
+CLEANFILES = tracker-control-$(TRACKER_API_VERSION).pc
+
# Vala bindings
vapidir = $(datadir)/vala/vapi
vapi_DATA = \
@@ -49,7 +58,7 @@ tracker-control-$(TRACKER_API_VERSION).deps: tracker-control.deps
BUILT_SOURCES = \
$(vapi_DATA)
-CLEANFILES = $(BUILT_SOURCES)
+CLEANFILES += $(BUILT_SOURCES)
EXTRA_DIST = \
tracker-control.vapi \
diff --git a/data/tracker-control.pc.in b/src/libtracker-control/tracker-control.pc.in
similarity index 100%
rename from data/tracker-control.pc.in
rename to src/libtracker-control/tracker-control.pc.in
diff --git a/src/libtracker-miner/Makefile.am b/src/libtracker-miner/Makefile.am
index b2d7a5d..cdd0f27 100644
--- a/src/libtracker-miner/Makefile.am
+++ b/src/libtracker-miner/Makefile.am
@@ -118,6 +118,15 @@ libtracker_miner_ TRACKER_API_VERSION@_la_LIBADD = \
$(BUILD_LIBS) \
$(LIBTRACKER_MINER_LIBS)
+# PkgConfig
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = tracker-miner-$(TRACKER_API_VERSION).pc
+
+tracker-miner-$(TRACKER_API_VERSION).pc: tracker-miner.pc
+ cp $< $@
+
+CLEANFILES = tracker-miner-$(TRACKER_API_VERSION).pc
+
# Vala bindings
vapidir = $(datadir)/vala/vapi
vapi_DATA = \
@@ -135,7 +144,7 @@ BUILT_SOURCES = \
tracker-miner-enum-types.h \
$(vapi_DATA)
-CLEANFILES = $(BUILT_SOURCES)
+CLEANFILES += $(BUILT_SOURCES)
EXTRA_DIST = \
tracker-miner-enum-types.c.template \
diff --git a/data/tracker-miner.pc.in b/src/libtracker-miner/tracker-miner.pc.in
similarity index 100%
rename from data/tracker-miner.pc.in
rename to src/libtracker-miner/tracker-miner.pc.in
diff --git a/src/libtracker-sparql/Makefile.am b/src/libtracker-sparql/Makefile.am
index 4ff5476..1947302 100644
--- a/src/libtracker-sparql/Makefile.am
+++ b/src/libtracker-sparql/Makefile.am
@@ -51,6 +51,15 @@ libtracker_sparqlinclude_HEADERS = \
tracker-sparql-$(TRACKER_API_VERSION).deps: tracker-sparql.deps
$(AM_V_GEN)cp $^ $@
+# PkgConfig
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = tracker-sparql-$(TRACKER_API_VERSION).pc
+
+tracker-sparql-$(TRACKER_API_VERSION).pc: tracker-sparql.pc
+ cp $< $@
+
+CLEANFILES = tracker-sparql-$(TRACKER_API_VERSION).pc
+
# Vala bindings
vapidir = $(datadir)/vala/vapi
vapi_DATA = \
@@ -65,8 +74,7 @@ MAINTAINERCLEANFILES = \
tracker-sparql-$(TRACKER_API_VERSION).deps \
$(vala_header:.h=-no-checks.h)
-CLEANFILES = \
- tracker-sparql-$(TRACKER_API_VERSION).vapi
+CLEANFILES += tracker-sparql-$(TRACKER_API_VERSION).vapi
EXTRA_DIST = \
tracker-sparql-$(TRACKER_API_VERSION).deps \
diff --git a/data/tracker-sparql.pc.in b/src/libtracker-sparql/tracker-sparql.pc.in
similarity index 100%
rename from data/tracker-sparql.pc.in
rename to src/libtracker-sparql/tracker-sparql.pc.in
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]