diff options
Diffstat (limited to 'src')
40 files changed, 2 insertions, 79 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index f0b3e93a0..1a71da587 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/Makefile.decl - if HAVE_TRACKER_FTS libstemmer_dir = libstemmer endif diff --git a/src/gvdb/Makefile.am b/src/gvdb/Makefile.am index ad702e427..390e4ed61 100644 --- a/src/gvdb/Makefile.am +++ b/src/gvdb/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/Makefile.decl - AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ $(GVDB_CFLAGS) diff --git a/src/libstemmer/Makefile.am b/src/libstemmer/Makefile.am index 934727f32..7fccbb588 100644 --- a/src/libstemmer/Makefile.am +++ b/src/libstemmer/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/Makefile.decl - AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -I$(top_srcdir)/src \ diff --git a/src/libtracker-bus/Makefile.am b/src/libtracker-bus/Makefile.am index fde7644b6..1b59a7775 100644 --- a/src/libtracker-bus/Makefile.am +++ b/src/libtracker-bus/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/Makefile.decl - noinst_LTLIBRARIES = libtracker-bus.la AM_VALAFLAGS = \ diff --git a/src/libtracker-common/Makefile.am b/src/libtracker-common/Makefile.am index da761f9b3..63fbf6b63 100644 --- a/src/libtracker-common/Makefile.am +++ b/src/libtracker-common/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/Makefile.decl - AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -I$(top_srcdir)/src \ diff --git a/src/libtracker-control/Makefile.am b/src/libtracker-control/Makefile.am index 8d74ad7f5..dcad29b40 100644 --- a/src/libtracker-control/Makefile.am +++ b/src/libtracker-control/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/Makefile.decl - AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -I$(top_srcdir)/src \ diff --git a/src/libtracker-data/Makefile.am b/src/libtracker-data/Makefile.am index 4827542f9..ada850e7f 100644 --- a/src/libtracker-data/Makefile.am +++ b/src/libtracker-data/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/Makefile.decl - AM_VALAFLAGS = \ --includedir=libtracker-data \ --header tracker-sparql-query.h \ diff --git a/src/libtracker-direct/Makefile.am b/src/libtracker-direct/Makefile.am index 1e2813d2d..b5e441b82 100644 --- a/src/libtracker-direct/Makefile.am +++ b/src/libtracker-direct/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/Makefile.decl - noinst_LTLIBRARIES = libtracker-direct.la AM_VALAFLAGS = \ diff --git a/src/libtracker-extract/Makefile.am b/src/libtracker-extract/Makefile.am index 531b69ae1..3d135f252 100644 --- a/src/libtracker-extract/Makefile.am +++ b/src/libtracker-extract/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/Makefile.decl - AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -I$(top_srcdir)/src \ diff --git a/src/libtracker-fts/Makefile.am b/src/libtracker-fts/Makefile.am index e99ea7229..f5a23a3a8 100644 --- a/src/libtracker-fts/Makefile.am +++ b/src/libtracker-fts/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/Makefile.decl - AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -I$(top_srcdir)/src \ diff --git a/src/libtracker-miner/Makefile.am b/src/libtracker-miner/Makefile.am index 27222b35c..76fe5148e 100644 --- a/src/libtracker-miner/Makefile.am +++ b/src/libtracker-miner/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/Makefile.decl - # Include list of shared sources: # Defines: # $(libtracker_miner_monitor_sources) diff --git a/src/libtracker-sparql-backend/Makefile.am b/src/libtracker-sparql-backend/Makefile.am index 50874283b..27356a591 100644 --- a/src/libtracker-sparql-backend/Makefile.am +++ b/src/libtracker-sparql-backend/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/Makefile.decl - lib_LTLIBRARIES = libtracker-sparql-@TRACKER_API_VERSION@.la AM_VALAFLAGS = \ diff --git a/src/libtracker-sparql/Makefile.am b/src/libtracker-sparql/Makefile.am index de3612518..4ff547638 100644 --- a/src/libtracker-sparql/Makefile.am +++ b/src/libtracker-sparql/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/Makefile.decl - noinst_LTLIBRARIES = libtracker-sparql.la libtracker_sparql_la_VALAFLAGS = \ diff --git a/src/miners/Makefile.am b/src/miners/Makefile.am index 9f017c6fd..ad1244788 100644 --- a/src/miners/Makefile.am +++ b/src/miners/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/Makefile.decl - SUBDIRS = if HAVE_TRACKER_MINER_FS diff --git a/src/miners/fs/Makefile.am b/src/miners/fs/Makefile.am index e7b747169..99d92790b 100644 --- a/src/miners/fs/Makefile.am +++ b/src/miners/fs/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/Makefile.decl - AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -I$(top_srcdir)/src \ diff --git a/src/miners/rss/Makefile.am b/src/miners/rss/Makefile.am index d38566bb5..8340cefb4 100644 --- a/src/miners/rss/Makefile.am +++ b/src/miners/rss/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/Makefile.decl - AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -DSHAREDIR=\""$(datadir)"\" \ diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am index e525adb49..dc1e7aa31 100644 --- a/src/plugins/Makefile.am +++ b/src/plugins/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/Makefile.decl - SUBDIRS = if HAVE_TRACKER_MINER_EVOLUTION diff --git a/src/plugins/evolution/Makefile.am b/src/plugins/evolution/Makefile.am index 9717511c6..dd9823d82 100644 --- a/src/plugins/evolution/Makefile.am +++ b/src/plugins/evolution/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/Makefile.decl - AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -I$(top_srcdir)/src \ diff --git a/src/plugins/firefox/Makefile.am b/src/plugins/firefox/Makefile.am index 7d0f5a818..d45d19a82 100644 --- a/src/plugins/firefox/Makefile.am +++ b/src/plugins/firefox/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/Makefile.decl - SUBDIRS = chrome defaults extensiondir = $(datadir)/xul-ext/trackerfox diff --git a/src/plugins/firefox/chrome/Makefile.am b/src/plugins/firefox/chrome/Makefile.am index 8e1b19dbf..90fd0e7f3 100644 --- a/src/plugins/firefox/chrome/Makefile.am +++ b/src/plugins/firefox/chrome/Makefile.am @@ -1,3 +1 @@ -include $(top_srcdir)/Makefile.decl - SUBDIRS = skin locale content diff --git a/src/plugins/firefox/chrome/content/Makefile.am b/src/plugins/firefox/chrome/content/Makefile.am index 05eb8250c..59db804cf 100644 --- a/src/plugins/firefox/chrome/content/Makefile.am +++ b/src/plugins/firefox/chrome/content/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/Makefile.decl - extensiondir = $(datadir)/xul-ext/trackerfox/chrome/content extension_DATA = \ about.xul \ diff --git a/src/plugins/firefox/chrome/locale/Makefile.am b/src/plugins/firefox/chrome/locale/Makefile.am index 26bd7f247..6f8bbae0e 100644 --- a/src/plugins/firefox/chrome/locale/Makefile.am +++ b/src/plugins/firefox/chrome/locale/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/Makefile.decl - # General localesdir = $(datadir)/xul-ext/trackerfox/chrome/locale/ diff --git a/src/plugins/firefox/chrome/skin/Makefile.am b/src/plugins/firefox/chrome/skin/Makefile.am index edd9e2fcf..bb05d7039 100644 --- a/src/plugins/firefox/chrome/skin/Makefile.am +++ b/src/plugins/firefox/chrome/skin/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/Makefile.decl - extensiondir = $(datadir)/xul-ext/trackerfox/chrome/skin extension_DATA = \ overlay.css diff --git a/src/plugins/firefox/defaults/Makefile.am b/src/plugins/firefox/defaults/Makefile.am index 4c3d6b4b3..287fa7162 100644 --- a/src/plugins/firefox/defaults/Makefile.am +++ b/src/plugins/firefox/defaults/Makefile.am @@ -1,3 +1 @@ -include $(top_srcdir)/Makefile.decl - SUBDIRS = preferences diff --git a/src/plugins/firefox/defaults/preferences/Makefile.am b/src/plugins/firefox/defaults/preferences/Makefile.am index 675876889..6b3756cf4 100644 --- a/src/plugins/firefox/defaults/preferences/Makefile.am +++ b/src/plugins/firefox/defaults/preferences/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/Makefile.decl - extensiondir = $(datadir)/xul-ext/trackerfox/defaults/preferences extension_DATA = \ prefs.js diff --git a/src/plugins/nautilus/Makefile.am b/src/plugins/nautilus/Makefile.am index cfe229c9d..880998d37 100644 --- a/src/plugins/nautilus/Makefile.am +++ b/src/plugins/nautilus/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/Makefile.decl - AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -I$(top_srcdir)/src \ diff --git a/src/plugins/thunderbird/Makefile.am b/src/plugins/thunderbird/Makefile.am index 7d30a762f..2d8ea96ba 100644 --- a/src/plugins/thunderbird/Makefile.am +++ b/src/plugins/thunderbird/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/Makefile.decl - SUBDIRS = chrome defaults extensiondir = $(datadir)/xul-ext/trackerbird diff --git a/src/plugins/thunderbird/chrome/Makefile.am b/src/plugins/thunderbird/chrome/Makefile.am index 8e1b19dbf..90fd0e7f3 100644 --- a/src/plugins/thunderbird/chrome/Makefile.am +++ b/src/plugins/thunderbird/chrome/Makefile.am @@ -1,3 +1 @@ -include $(top_srcdir)/Makefile.decl - SUBDIRS = skin locale content diff --git a/src/plugins/thunderbird/chrome/content/Makefile.am b/src/plugins/thunderbird/chrome/content/Makefile.am index 504b17119..805d4142f 100644 --- a/src/plugins/thunderbird/chrome/content/Makefile.am +++ b/src/plugins/thunderbird/chrome/content/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/Makefile.decl - extensiondir = $(datadir)/xul-ext/trackerbird/chrome/content extension_DATA = \ mailstore.js \ diff --git a/src/plugins/thunderbird/chrome/locale/Makefile.am b/src/plugins/thunderbird/chrome/locale/Makefile.am index 41f263263..81e035527 100644 --- a/src/plugins/thunderbird/chrome/locale/Makefile.am +++ b/src/plugins/thunderbird/chrome/locale/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/Makefile.decl - # General localesdir = $(datadir)/xul-ext/trackerbird/chrome/locale/ diff --git a/src/plugins/thunderbird/chrome/skin/Makefile.am b/src/plugins/thunderbird/chrome/skin/Makefile.am index 3d864ecbb..5ab9ac0a6 100644 --- a/src/plugins/thunderbird/chrome/skin/Makefile.am +++ b/src/plugins/thunderbird/chrome/skin/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/Makefile.decl - extensiondir = $(datadir)/xul-ext/trackerbird/chrome/skin extension_DATA = \ overlay.css diff --git a/src/plugins/thunderbird/defaults/Makefile.am b/src/plugins/thunderbird/defaults/Makefile.am index 4c3d6b4b3..287fa7162 100644 --- a/src/plugins/thunderbird/defaults/Makefile.am +++ b/src/plugins/thunderbird/defaults/Makefile.am @@ -1,3 +1 @@ -include $(top_srcdir)/Makefile.decl - SUBDIRS = preferences diff --git a/src/plugins/thunderbird/defaults/preferences/Makefile.am b/src/plugins/thunderbird/defaults/preferences/Makefile.am index d75285146..6f9a19eb1 100644 --- a/src/plugins/thunderbird/defaults/preferences/Makefile.am +++ b/src/plugins/thunderbird/defaults/preferences/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/Makefile.decl - extensiondir = $(datadir)/xul-ext/trackerbird/defaults/preferences extension_DATA = \ prefs.js diff --git a/src/tracker-control/Makefile.am b/src/tracker-control/Makefile.am index 751466c62..935de46d1 100644 --- a/src/tracker-control/Makefile.am +++ b/src/tracker-control/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/Makefile.decl - AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -DLOCALEDIR=\""$(localedir)"\" \ diff --git a/src/tracker-extract/Makefile.am b/src/tracker-extract/Makefile.am index f7dc1f330..5c1880bd3 100644 --- a/src/tracker-extract/Makefile.am +++ b/src/tracker-extract/Makefile.am @@ -1,4 +1,4 @@ -include $(top_srcdir)/Makefile.decl +extractrulesdir = $(datadir)/tracker/extract-rules module_flags = -module -avoid-version -no-undefined rulesdir = $(extractrulesdir) @@ -54,6 +54,7 @@ rules_files = \ # NOTE: # We don't always link with libtracker-common, we only link # against it if we directly use functions in the .so +extractmodulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/extract-modules extractmodules_LTLIBRARIES = # Empty rules_DATA = # Empty diff --git a/src/tracker-needle/Makefile.am b/src/tracker-needle/Makefile.am index 4bf8e8fb6..d49297827 100644 --- a/src/tracker-needle/Makefile.am +++ b/src/tracker-needle/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/Makefile.decl - bin_PROGRAMS = tracker-needle AM_VALAFLAGS = \ diff --git a/src/tracker-preferences/Makefile.am b/src/tracker-preferences/Makefile.am index 9827e7eea..7e1543cf6 100644 --- a/src/tracker-preferences/Makefile.am +++ b/src/tracker-preferences/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/Makefile.decl - @INTLTOOL_DESKTOP_RULE@ bin_PROGRAMS = tracker-preferences diff --git a/src/tracker-store/Makefile.am b/src/tracker-store/Makefile.am index 06a19f903..3a7a45cb6 100644 --- a/src/tracker-store/Makefile.am +++ b/src/tracker-store/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/Makefile.decl - AM_CPPFLAGS = \ $(BUILD_VALACFLAGS) \ -DSHAREDIR=\""$(datadir)"\" \ diff --git a/src/tracker-utils/Makefile.am b/src/tracker-utils/Makefile.am index 7795fb8fd..3f16b5bb7 100644 --- a/src/tracker-utils/Makefile.am +++ b/src/tracker-utils/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/Makefile.decl - AM_CPPFLAGS = \ $(BUILD_CFLAGS) \ -DLOCALEDIR=\""$(localedir)"\" \ diff --git a/src/tracker-writeback/Makefile.am b/src/tracker-writeback/Makefile.am index 35d1e8655..bac5dc1d3 100644 --- a/src/tracker-writeback/Makefile.am +++ b/src/tracker-writeback/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/Makefile.decl - module_flags = -module -avoid-version -no-undefined modulesdir = $(libdir)/tracker-$(TRACKER_API_VERSION)/writeback-modules |