[tracker] Remove some unused Makefile variables and compile flags



commit cdd2fe287889f6e66561fca76fe6576c0a89ae0b
Author: Sam Thursfield <sam afuera me uk>
Date:   Thu Feb 23 16:09:30 2017 +0000

    Remove some unused Makefile variables and compile flags

 src/libtracker-bus/Makefile.am  |    1 -
 src/miners/fs/Makefile.am       |    6 ++----
 src/tracker-extract/Makefile.am |   10 ++++------
 src/tracker-store/Makefile.am   |    5 +----
 4 files changed, 7 insertions(+), 15 deletions(-)
---
diff --git a/src/libtracker-bus/Makefile.am b/src/libtracker-bus/Makefile.am
index c9f24bc..70a8cfc 100644
--- a/src/libtracker-bus/Makefile.am
+++ b/src/libtracker-bus/Makefile.am
@@ -13,7 +13,6 @@ AM_CPPFLAGS =                                          \
        $(BUILD_VALACFLAGS)                            \
        -I$(top_srcdir)/src                            \
        -I$(top_builddir)/src                          \
-       -DNO_LIBDBUS                                   \
        $(LIBTRACKER_BUS_CFLAGS)
 
 libtracker_bus_la_SOURCES =                            \
diff --git a/src/miners/fs/Makefile.am b/src/miners/fs/Makefile.am
index c1dc2da..56f3084 100644
--- a/src/miners/fs/Makefile.am
+++ b/src/miners/fs/Makefile.am
@@ -117,14 +117,12 @@ CLEANFILES = \
        $(service_DATA) \
        $(service_DATA:.service=.service.in) \
        $(systemd_user_DATA) \
-       $(gsettings_SCHEMAS) \
-       $(man_MANS)
+       $(gsettings_SCHEMAS)
 
 EXTRA_DIST = \
        $(autostart_DATA:.desktop=.desktop.in.in) \
        $(config_DATA) \
        $(service_DATA:.service=.service.in.in) \
        $(systemd_user_DATA:.service=.service.in) \
-       $(gsettings_SCHEMAS:.xml=.xml.in) \
-       $(man_MANS)
+       $(gsettings_SCHEMAS:.xml=.xml.in)
 
diff --git a/src/tracker-extract/Makefile.am b/src/tracker-extract/Makefile.am
index 04593e1..1685185 100644
--- a/src/tracker-extract/Makefile.am
+++ b/src/tracker-extract/Makefile.am
@@ -207,7 +207,7 @@ libextract_mp3_la_LIBADD =  \
        $(TRACKER_EXTRACT_MODULES_LIBS)
 
 # Vorbis (OGG)
-libextract_vorbis_la_SOURCES = tracker-extract-vorbis.c $(escape_sources)
+libextract_vorbis_la_SOURCES = tracker-extract-vorbis.c
 libextract_vorbis_la_CFLAGS = $(TRACKER_EXTRACT_MODULES_CFLAGS)
 libextract_vorbis_la_LDFLAGS = $(module_flags)
 libextract_vorbis_la_LIBADD = \
@@ -218,7 +218,7 @@ libextract_vorbis_la_LIBADD = \
        $(LIBVORBIS_LIBS)
 
 # Flac
-libextract_flac_la_SOURCES = tracker-extract-flac.c $(escape_sources)
+libextract_flac_la_SOURCES = tracker-extract-flac.c
 libextract_flac_la_CFLAGS = $(TRACKER_EXTRACT_MODULES_CFLAGS)
 libextract_flac_la_LDFLAGS = $(module_flags)
 libextract_flac_la_LIBADD = \
@@ -626,13 +626,11 @@ CLEANFILES += \
        $(service_DATA) \
        $(service_DATA:.service=.service.in) \
        $(systemd_user_DATA) \
-       $(gsettings_SCHEMAS) \
-       $(man_MANS)
+       $(gsettings_SCHEMAS)
 
 EXTRA_DIST += \
        $(autostart_DATA:.desktop=.desktop.in.in) \
        $(config_DATA) \
        $(service_DATA:.service=.service.in.in) \
        $(systemd_user_DATA:.service=.service.in) \
-       $(gsettings_SCHEMAS:.xml=.xml.in) \
-       $(man_MANS)
+       $(gsettings_SCHEMAS:.xml=.xml.in)
diff --git a/src/tracker-store/Makefile.am b/src/tracker-store/Makefile.am
index 07eb557..c8f761c 100644
--- a/src/tracker-store/Makefile.am
+++ b/src/tracker-store/Makefile.am
@@ -2,13 +2,10 @@ AM_CPPFLAGS =                                          \
        $(BUILD_VALACFLAGS)                            \
        -DSHAREDIR=\""$(datadir)"\"                    \
        -DLOCALEDIR=\""$(localedir)"\"                 \
-       -DMAIL_MODULES_DIR=\""$(libdir)"/tracker-$(TRACKER_API_VERSION)/mail-modules\" \
-       -DPUSH_MODULES_DIR=\""$(libdir)/tracker-$(TRACKER_API_VERSION)/push-modules/daemon"\" \
        -I$(top_srcdir)/src                            \
        -I$(top_builddir)/src                          \
        $(TRACKER_STORE_CFLAGS)                        \
-       -include config.h                              \
-       -DNO_LIBDBUS
+       -include config.h
 
 libexec_PROGRAMS = tracker-store
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]