44bdecfe18
- Substitute gdk-pixbuf for qt4 as music album extractor - Split off nautilus-plugin into a sub-package
135 lines
6.3 KiB
Diff
135 lines
6.3 KiB
Diff
--- docs/tools/Makefile.am 2010-12-01 05:37:10.000000000 -0500
|
|
+++ docs/tools/Makefile.am.new 2010-12-03 21:28:47.235232125 -0500
|
|
@@ -12,7 +12,10 @@
|
|
LDADD = \
|
|
$(top_builddir)/src/libtracker-common/libtracker-common.la \
|
|
$(top_builddir)/src/libtracker-data/libtracker-data.la \
|
|
- $(LIBTRACKER_DATA_LIBS)
|
|
+ $(LIBTRACKER_DATA_LIBS) \
|
|
+ -Wl,-rpath,$(top_builddir)/src/libtracker-data/.libs \
|
|
+ -Wl,-rpath,$(top_builddir)/src/libtracker-sparql/.libs \
|
|
+ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs
|
|
|
|
ontology_graph_SOURCES = \
|
|
ontology-graph.c
|
|
--- docs/tools/Makefile.in 2010-12-02 11:15:45.000000000 -0500
|
|
+++ docs/tools/Makefile.in.new 2010-12-03 21:31:39.137243927 -0500
|
|
@@ -410,7 +410,10 @@
|
|
LDADD = \
|
|
$(top_builddir)/src/libtracker-common/libtracker-common.la \
|
|
$(top_builddir)/src/libtracker-data/libtracker-data.la \
|
|
- $(LIBTRACKER_DATA_LIBS)
|
|
+ $(LIBTRACKER_DATA_LIBS) \
|
|
+ -Wl,-rpath,$(top_builddir)/src/libtracker-data/.libs \
|
|
+ -Wl,-rpath,$(top_builddir)/src/libtracker-sparql/.libs \
|
|
+ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs
|
|
|
|
ontology_graph_SOURCES = \
|
|
ontology-graph.c
|
|
--- docs/reference/libtracker-client/Makefile.am 2010-11-10 10:58:55.000000000 -0500
|
|
+++ docs/reference/libtracker-client/Makefile.am.new 2010-12-03 21:44:30.717843736 -0500
|
|
@@ -36,7 +36,9 @@
|
|
GTKDOC_LIBS = \
|
|
$(top_builddir)/src/libtracker-client/libtracker-client-@TRACKER_API_VERSION@.la \
|
|
$(top_builddir)/src/libtracker-common/libtracker-common.la \
|
|
- $(LIBTRACKER_CLIENT_LIBS)
|
|
+ $(LIBTRACKER_CLIENT_LIBS) \
|
|
+ -Wl,-rpath,$(top_builddir)/src/libtracker-client/.libs \
|
|
+ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs
|
|
|
|
# Extra options to supply to gtkdoc-mkdb
|
|
MKDB_OPTIONS = --sgml-mode --output-format=xml
|
|
--- docs/reference/libtracker-client/Makefile.in 2010-12-02 11:15:44.000000000 -0500
|
|
+++ docs/reference/libtracker-client/Makefile.in.new 2010-12-03 21:45:23.520865732 -0500
|
|
@@ -400,7 +400,9 @@
|
|
GTKDOC_LIBS = \
|
|
$(top_builddir)/src/libtracker-client/libtracker-client-@TRACKER_API_VERSION@.la \
|
|
$(top_builddir)/src/libtracker-common/libtracker-common.la \
|
|
- $(LIBTRACKER_CLIENT_LIBS)
|
|
+ $(LIBTRACKER_CLIENT_LIBS) \
|
|
+ -Wl,-rpath,$(top_builddir)/src/libtracker-client/.libs \
|
|
+ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs
|
|
|
|
|
|
# Extra options to supply to gtkdoc-mkdb
|
|
--- docs/reference/libtracker-extract/Makefile.am 2010-11-10 10:58:55.000000000 -0500
|
|
+++ docs/reference/libtracker-extract/Makefile.am.new 2010-12-03 21:47:24.501864478 -0500
|
|
@@ -34,7 +34,9 @@
|
|
GTKDOC_LIBS = \
|
|
$(top_builddir)/src/libtracker-extract/libtracker-extract-@TRACKER_API_VERSION@.la \
|
|
$(top_builddir)/src/libtracker-common/libtracker-common.la \
|
|
- $(LIBTRACKER_EXTRACT_LIBS)
|
|
+ $(LIBTRACKER_EXTRACT_LIBS) \
|
|
+ -Wl,-rpath,$(top_builddir)/src/libtracker-extract/.libs \
|
|
+ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs
|
|
|
|
# Extra options to supply to gtkdoc-mkdb
|
|
MKDB_OPTIONS = --sgml-mode --output-format=xml
|
|
--- docs/reference/libtracker-extract/Makefile.in 2010-12-02 11:15:45.000000000 -0500
|
|
+++ docs/reference/libtracker-extract/Makefile.in.new 2010-12-03 21:48:32.781865171 -0500
|
|
@@ -397,7 +397,9 @@
|
|
GTKDOC_LIBS = \
|
|
$(top_builddir)/src/libtracker-extract/libtracker-extract-@TRACKER_API_VERSION@.la \
|
|
$(top_builddir)/src/libtracker-common/libtracker-common.la \
|
|
- $(LIBTRACKER_EXTRACT_LIBS)
|
|
+ $(LIBTRACKER_EXTRACT_LIBS) \
|
|
+ -Wl,-rpath,$(top_builddir)/src/libtracker-extract/.libs \
|
|
+ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs
|
|
|
|
|
|
# Extra options to supply to gtkdoc-mkdb
|
|
--- docs/reference/libtracker-miner/Makefile.am 2010-11-10 10:58:55.000000000 -0500
|
|
+++ docs/reference/libtracker-miner/Makefile.am.new 2010-12-03 21:51:13.275061430 -0500
|
|
@@ -46,7 +46,10 @@
|
|
$(top_builddir)/src/libtracker-miner/libtracker-miner-@TRACKER_API_VERSION@.la \
|
|
$(top_builddir)/src/libtracker-sparql/libtracker-sparql-@TRACKER_API_VERSION@.la \
|
|
$(top_builddir)/src/libtracker-common/libtracker-common.la \
|
|
- $(LIBTRACKER_MINER_LIBS)
|
|
+ $(LIBTRACKER_MINER_LIBS) \
|
|
+ -Wl,-rpath,$(top_builddir)/src/libtracker-miner/.libs \
|
|
+ -Wl,-rpath,$(top_builddir)/src/libtracker-sparql/.libs \
|
|
+ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs
|
|
|
|
# Extra options to supply to gtkdoc-mkdb
|
|
MKDB_OPTIONS=--sgml-mode --output-format=xml
|
|
--- docs/reference/libtracker-miner/Makefile.in 2010-12-02 11:15:45.000000000 -0500
|
|
+++ docs/reference/libtracker-miner/Makefile.in.new 2010-12-03 21:52:31.387843244 -0500
|
|
@@ -410,7 +410,10 @@
|
|
$(top_builddir)/src/libtracker-miner/libtracker-miner-@TRACKER_API_VERSION@.la \
|
|
$(top_builddir)/src/libtracker-sparql/libtracker-sparql-@TRACKER_API_VERSION@.la \
|
|
$(top_builddir)/src/libtracker-common/libtracker-common.la \
|
|
- $(LIBTRACKER_MINER_LIBS)
|
|
+ $(LIBTRACKER_MINER_LIBS) \
|
|
+ -Wl,-rpath,$(top_builddir)/src/libtracker-miner/.libs \
|
|
+ -Wl,-rpath,$(top_builddir)/src/libtracker-sparql/.libs \
|
|
+ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs
|
|
|
|
|
|
# Extra options to supply to gtkdoc-mkdb
|
|
--- docs/reference/libtracker-sparql/Makefile.am 2010-11-10 10:58:55.000000000 -0500
|
|
+++ docs/reference/libtracker-sparql/Makefile.am.new 2010-12-03 21:53:49.711842894 -0500
|
|
@@ -34,7 +34,9 @@
|
|
GTKDOC_LIBS = \
|
|
$(top_builddir)/src/libtracker-sparql/libtracker-sparql-@TRACKER_API_VERSION@.la \
|
|
$(top_builddir)/src/libtracker-common/libtracker-common.la \
|
|
- $(LIBTRACKER_SPARQL_LIBS)
|
|
+ $(LIBTRACKER_SPARQL_LIBS) \
|
|
+ -Wl,-rpath,$(top_builddir)/src/libtracker-sparql/.libs \
|
|
+ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs
|
|
|
|
# Extra options to supply to gtkdoc-mkdb
|
|
MKDB_OPTIONS = --sgml-mode --output-format=xml
|
|
--- docs/reference/libtracker-sparql/Makefile.in 2010-12-02 11:15:45.000000000 -0500
|
|
+++ docs/reference/libtracker-sparql/Makefile.in.new 2010-12-03 21:54:42.545968217 -0500
|
|
@@ -397,7 +397,9 @@
|
|
GTKDOC_LIBS = \
|
|
$(top_builddir)/src/libtracker-sparql/libtracker-sparql-@TRACKER_API_VERSION@.la \
|
|
$(top_builddir)/src/libtracker-common/libtracker-common.la \
|
|
- $(LIBTRACKER_SPARQL_LIBS)
|
|
+ $(LIBTRACKER_SPARQL_LIBS) \
|
|
+ -Wl,-rpath,$(top_builddir)/src/libtracker-sparql/.libs \
|
|
+ -Wl,-rpath,$(top_builddir)/src/libtracker-common/.libs
|
|
|
|
|
|
# Extra options to supply to gtkdoc-mkdb
|