tracker r2942 - in trunk: . docs/reference/libtracker-common docs/reference/libtracker-module src/libinotify src/libstemmer src/libtracker-common src/libtracker-data src/libtracker-db src/libtracker-gtk src/plugins/evolution src/plugins/kmail src/plugins/rss src/qdbm src/tracker-applet src/tracker-extract src/tracker-fts src/tracker-indexer src/tracker-indexer/modules src/tracker-preferences src/tracker-search-tool src/tracker-utils src/trackerd tests/common tests/libtracker-common tests/libtracker-db tests/tracker-extract tests/tracker-indexer tests/trackerd tests/trackerd/xesam utils/qdbm utils/tracker-fts
- From: mr svn gnome org
- To: svn-commits-list gnome org
- Subject: tracker r2942 - in trunk: . docs/reference/libtracker-common docs/reference/libtracker-module src/libinotify src/libstemmer src/libtracker-common src/libtracker-data src/libtracker-db src/libtracker-gtk src/plugins/evolution src/plugins/kmail src/plugins/rss src/qdbm src/tracker-applet src/tracker-extract src/tracker-fts src/tracker-indexer src/tracker-indexer/modules src/tracker-preferences src/tracker-search-tool src/tracker-utils src/trackerd tests/common tests/libtracker-common tests/libtracker-db tests/tracker-extract tests/tracker-indexer tests/trackerd tests/trackerd/xesam utils/qdbm utils/tracker-fts
- Date: Wed, 18 Feb 2009 12:00:47 +0000 (UTC)
Author: mr
Date: Wed Feb 18 12:00:47 2009
New Revision: 2942
URL: http://svn.gnome.org/viewvc/tracker?rev=2942&view=rev
Log:
* docs/reference/libtracker-common/Makefile.am:
* docs/reference/libtracker-module/Makefile.am:
* src/libinotify/Makefile.am:
* src/libstemmer/Makefile.am:
* src/libtracker-common/Makefile.am:
* src/libtracker-data/Makefile.am:
* src/libtracker-db/Makefile.am:
* src/libtracker-gtk/Makefile.am:
* src/plugins/evolution/Makefile.am:
* src/plugins/kmail/Makefile.am:
* src/plugins/rss/Makefile.am:
* src/tracker-applet/Makefile.am:
* src/tracker-extract/Makefile.am:
* src/tracker-fts/Makefile.am:
* src/tracker-indexer/Makefile.am:
* src/tracker-indexer/modules/Makefile.am:
* src/tracker-preferences/Makefile.am:
* src/tracker-search-tool/Makefile.am:
* src/tracker-utils/Makefile.am:
* src/trackerd/Makefile.am:
* tests/common/Makefile.am:
* tests/libtracker-common/Makefile.am:
* tests/libtracker-db/Makefile.am:
* tests/tracker-extract/Makefile.am:
* tests/tracker-indexer/Makefile.am:
* tests/trackerd/Makefile.am:
* tests/trackerd/xesam/Makefile.am:
* utils/qdbm/Makefile.am:
* utils/tracker-fts/Makefile.am: Fixed Makefiles so we include
WARN_CFLAGS in all files. Some files were missing this.
* src/libtracker-common/tracker-albumart.[ch]:
* src/libtracker-common/tracker-thumbnailer.h: Fixed #define
statements so they are not the same as the extractor header files.
* src/libtracker-common/tracker-config.c:
* src/tracker-extract/tracker-dbus.[ch]:
* src/tracker-extract/tracker-extract-albumart.c:
* src/tracker-extract/tracker-extract-gstreamer.c:
* src/tracker-extract/tracker-main.[ch]:
* src/trackerd/tracker-cleanup.c:
* src/trackerd/tracker-dbus.c:
* src/trackerd/tracker-processor.c:
* src/trackerd/tracker-status.c:
* tests/tracker-extract/tracker-extract-gstreamer-test.c:
* tests/tracker-extract/tracker-extract-jpeg-test.c:
* tests/tracker-extract/tracker-extract-mp3-test.c:
* tests/tracker-extract/tracker-extract-png-test.c:
* tests/tracker-extract/tracker-extract-test-utils.c:
* tests/tracker-extract/tracker-extract-testsuite-avi.c:
* tests/tracker-extract/tracker-extract-testsuite-jpeg.c:
* tests/tracker-extract/tracker-extract-testsuite-jpeg.h:
* tests/tracker-extract/tracker-extract-testsuite-mp3.c:
* tests/tracker-extract/tracker-extract-testsuite-mp3.h:
* tests/tracker-extract/tracker-extract-testsuite-png.c:
* tests/tracker-extract/tracker-extract-testsuite-png.h:
* tests/tracker-extract/tracker-extract-testsuite-tiff.c:
* tests/tracker-extract/tracker-extract-testsuite-tiff.h:
* tests/tracker-extract/tracker-extract-tiff-test.c: Fixed all the
warnings produced by adding WARN_CFLAGS to the Makefile.am files.
Modified:
trunk/ChangeLog
trunk/docs/reference/libtracker-common/Makefile.am
trunk/docs/reference/libtracker-module/Makefile.am
trunk/src/libinotify/Makefile.am
trunk/src/libstemmer/Makefile.am
trunk/src/libtracker-common/Makefile.am
trunk/src/libtracker-common/tracker-albumart.c
trunk/src/libtracker-common/tracker-albumart.h
trunk/src/libtracker-common/tracker-config.c
trunk/src/libtracker-common/tracker-thumbnailer.h
trunk/src/libtracker-data/Makefile.am
trunk/src/libtracker-db/Makefile.am
trunk/src/libtracker-gtk/Makefile.am
trunk/src/plugins/evolution/Makefile.am
trunk/src/plugins/kmail/Makefile.am
trunk/src/plugins/rss/Makefile.am
trunk/src/qdbm/Makefile.am
trunk/src/tracker-applet/Makefile.am
trunk/src/tracker-extract/Makefile.am
trunk/src/tracker-extract/tracker-dbus.c
trunk/src/tracker-extract/tracker-dbus.h
trunk/src/tracker-extract/tracker-extract-albumart.c
trunk/src/tracker-extract/tracker-extract-gstreamer.c
trunk/src/tracker-extract/tracker-main.c
trunk/src/tracker-extract/tracker-main.h
trunk/src/tracker-fts/Makefile.am
trunk/src/tracker-indexer/Makefile.am
trunk/src/tracker-indexer/modules/Makefile.am
trunk/src/tracker-preferences/Makefile.am
trunk/src/tracker-search-tool/Makefile.am
trunk/src/tracker-utils/Makefile.am
trunk/src/trackerd/Makefile.am
trunk/src/trackerd/tracker-cleanup.c
trunk/src/trackerd/tracker-dbus.c
trunk/src/trackerd/tracker-processor.c
trunk/src/trackerd/tracker-status.c
trunk/tests/common/Makefile.am
trunk/tests/libtracker-common/Makefile.am
trunk/tests/libtracker-db/Makefile.am
trunk/tests/tracker-extract/Makefile.am
trunk/tests/tracker-extract/tracker-extract-gstreamer-test.c
trunk/tests/tracker-extract/tracker-extract-jpeg-test.c
trunk/tests/tracker-extract/tracker-extract-mp3-test.c
trunk/tests/tracker-extract/tracker-extract-png-test.c
trunk/tests/tracker-extract/tracker-extract-test-utils.c
trunk/tests/tracker-extract/tracker-extract-testsuite-avi.c
trunk/tests/tracker-extract/tracker-extract-testsuite-avi.h
trunk/tests/tracker-extract/tracker-extract-testsuite-jpeg.c
trunk/tests/tracker-extract/tracker-extract-testsuite-jpeg.h
trunk/tests/tracker-extract/tracker-extract-testsuite-mp3.c
trunk/tests/tracker-extract/tracker-extract-testsuite-mp3.h
trunk/tests/tracker-extract/tracker-extract-testsuite-png.c
trunk/tests/tracker-extract/tracker-extract-testsuite-png.h
trunk/tests/tracker-extract/tracker-extract-testsuite-tiff.c
trunk/tests/tracker-extract/tracker-extract-testsuite-tiff.h
trunk/tests/tracker-extract/tracker-extract-tiff-test.c
trunk/tests/tracker-indexer/Makefile.am
trunk/tests/trackerd/Makefile.am
trunk/tests/trackerd/xesam/Makefile.am
trunk/utils/qdbm/Makefile.am
trunk/utils/tracker-fts/Makefile.am
Modified: trunk/docs/reference/libtracker-common/Makefile.am
==============================================================================
--- trunk/docs/reference/libtracker-common/Makefile.am (original)
+++ trunk/docs/reference/libtracker-common/Makefile.am Wed Feb 18 12:00:47 2009
@@ -26,23 +26,23 @@
# CFLAGS and LDFLAGS for compiling scan program. Only needed
# if $(DOC_MODULE).types is non-empty.
-INCLUDES = \
- -DTRACKER_COMPILATION \
- -I$(top_srcdir)/src \
- $(HAL_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(UNAC_CFLAGS) \
- $(PANGO_CFLAGS) \
- $(GIO_CFLAGS) \
- $(GLIB2_CFLAGS)
+INCLUDES = \
+ -DTRACKER_COMPILATION \
+ -I$(top_srcdir)/src \
+ $(GLIB2_CFLAGS) \
+ $(GIO_CFLAGS) \
+ $(PANGO_CFLAGS) \
+ $(HAL_CFLAGS) \
+ $(DBUS_CFLAGS) \
+ $(UNAC_CFLAGS)
-GTKDOC_LIBS = \
+GTKDOC_LIBS = \
$(top_builddir)/src/libtracker-common/libtracker-common.la \
- $(HAL_LIBS) \
- $(DBUS_LIBS) \
- $(UNAC_LIBS) \
- $(PANGO_LIBS) \
- $(GIO_LIBS) \
+ $(HAL_LIBS) \
+ $(DBUS_LIBS) \
+ $(UNAC_LIBS) \
+ $(PANGO_LIBS) \
+ $(GIO_LIBS) \
$(GLIB2_LIBS)
Modified: trunk/docs/reference/libtracker-module/Makefile.am
==============================================================================
--- trunk/docs/reference/libtracker-module/Makefile.am (original)
+++ trunk/docs/reference/libtracker-module/Makefile.am Wed Feb 18 12:00:47 2009
@@ -42,9 +42,9 @@
# if $(DOC_MODULE).types is non-empty.
INCLUDES = \
-I$(top_srcdir)/src \
- $(DBUS_CFLAGS) \
+ $(GMODULE_CFLAGS) \
$(PANGO_CFLAGS) \
- $(GMODULE_CFLAGS)
+ $(DBUS_CFLAGS)
GTKDOC_LIBS = \
$(top_builddir)/src/libtracker-db/libtracker-db.la \
Modified: trunk/src/libinotify/Makefile.am
==============================================================================
--- trunk/src/libinotify/Makefile.am (original)
+++ trunk/src/libinotify/Makefile.am Wed Feb 18 12:00:47 2009
@@ -3,6 +3,7 @@
INCLUDES = \
-DG_LOG_DOMAIN=\"libinotify\" \
-I$(top_srcdir)/src \
+ $(WARN_CFLAGS) \
$(GLIB2_CFLAGS)
noinst_LTLIBRARIES = libinotify.la
Modified: trunk/src/libstemmer/Makefile.am
==============================================================================
--- trunk/src/libstemmer/Makefile.am (original)
+++ trunk/src/libstemmer/Makefile.am Wed Feb 18 12:00:47 2009
@@ -1,9 +1,10 @@
include $(top_srcdir)/Makefile.decl
-INCLUDES = \
- -DSHAREDIR=\""$(datadir)"\" \
- -DG_LOG_DOMAIN=\"Tracker\" \
- -I$(top_srcdir)/src
+INCLUDES = \
+ -DSHAREDIR=\""$(datadir)"\" \
+ -DG_LOG_DOMAIN=\"Tracker\" \
+ -I$(top_srcdir)/src \
+ $(WARN_CFLAGS)
libstemmerdir = $(libdir)/tracker
libstemmer_LTLIBRARIES = libstemmer.la
Modified: trunk/src/libtracker-common/Makefile.am
==============================================================================
--- trunk/src/libtracker-common/Makefile.am (original)
+++ trunk/src/libtracker-common/Makefile.am Wed Feb 18 12:00:47 2009
@@ -6,13 +6,13 @@
-DTRACKER_COMPILATION \
-I$(top_srcdir)/src \
$(WARN_CFLAGS) \
+ $(GLIB2_CFLAGS) \
+ $(GDKPIXBUF_CFLAGS) \
+ $(GIO_CFLAGS) \
+ $(PANGO_CFLAGS) \
$(HAL_CFLAGS) \
$(DBUS_CFLAGS) \
- $(UNAC_CFLAGS) \
- $(PANGO_CFLAGS) \
- $(GIO_CFLAGS) \
- $(GLIB2_CFLAGS) \
- $(GDKPIXBUF_CFLAGS)
+ $(UNAC_CFLAGS)
libtracker_commondir = $(libdir)/tracker
libtracker_commonincludedir=$(includedir)/tracker-1.0/libtracker-common/
Modified: trunk/src/libtracker-common/tracker-albumart.c
==============================================================================
--- trunk/src/libtracker-common/tracker-albumart.c (original)
+++ trunk/src/libtracker-common/tracker-albumart.c Wed Feb 18 12:00:47 2009
@@ -645,10 +645,10 @@
}
void
-tracker_albumart_request_download (gchar *album,
- gchar *artist,
- gchar *local_uri,
- gchar *art_path)
+tracker_albumart_request_download (const gchar *album,
+ const gchar *artist,
+ const gchar *local_uri,
+ const gchar *art_path)
{
GetFileInfo *info;
Modified: trunk/src/libtracker-common/tracker-albumart.h
==============================================================================
--- trunk/src/libtracker-common/tracker-albumart.h (original)
+++ trunk/src/libtracker-common/tracker-albumart.h Wed Feb 18 12:00:47 2009
@@ -21,8 +21,8 @@
* Authors: Philip Van Hoof <philip codeminded be>
*/
-#ifndef __TRACKER_ALBUMART_H__
-#define __TRACKER_ALBUMART_H__
+#ifndef __LIBTRACKER_COMMON_ALBUMART_H__
+#define __LIBTRACKER_COMMON_ALBUMART_H__
G_BEGIN_DECLS
@@ -40,11 +40,11 @@
const gchar *uri,
gchar **path,
gchar **local);
-void tracker_albumart_request_download (gchar *album,
- gchar *artist,
- gchar *local_uri,
- gchar *art_path);
+void tracker_albumart_request_download (const gchar *album,
+ const gchar *artist,
+ const gchar *local_uri,
+ const gchar *art_path);
G_END_DECLS
-#endif /* __TRACKER_THUMBNAILER_H__ */
+#endif /* __LIBTRACKER_COMMON_THUMBNAILER_H__ */
Modified: trunk/src/libtracker-common/tracker-config.c
==============================================================================
--- trunk/src/libtracker-common/tracker-config.c (original)
+++ trunk/src/libtracker-common/tracker-config.c Wed Feb 18 12:00:47 2009
@@ -818,7 +818,7 @@
/* Watches */
g_key_file_set_string_list (key_file, GROUP_WATCHES, KEY_WATCH_DIRECTORY_ROOTS,
watch_directory_roots,
- g_strv_length (watch_directory_roots));
+ g_strv_length ((gchar**) watch_directory_roots));
g_key_file_set_comment (key_file, GROUP_WATCHES, KEY_WATCH_DIRECTORY_ROOTS,
" List of directory roots to index and watch (separator=;)",
NULL);
Modified: trunk/src/libtracker-common/tracker-thumbnailer.h
==============================================================================
--- trunk/src/libtracker-common/tracker-thumbnailer.h (original)
+++ trunk/src/libtracker-common/tracker-thumbnailer.h Wed Feb 18 12:00:47 2009
@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef __TRACKER_THUMBNAILER_H__
-#define __TRACKER_THUMBNAILER_H__
+#ifndef __LIBTRACKER_COMMON_THUMBNAILER_H__
+#define __LIBTRACKER_COMMON_THUMBNAILER_H__
#include <libtracker-common/tracker-config.h>
@@ -41,4 +41,4 @@
G_END_DECLS
-#endif /* __TRACKER_THUMBNAILER_H__ */
+#endif /* __LIBTRACKER_COMMON_THUMBNAILER_H__ */
Modified: trunk/src/libtracker-data/Makefile.am
==============================================================================
--- trunk/src/libtracker-data/Makefile.am (original)
+++ trunk/src/libtracker-data/Makefile.am Wed Feb 18 12:00:47 2009
@@ -6,9 +6,9 @@
-DTRACKER_COMPILATION \
-I$(top_srcdir)/src \
$(WARN_CFLAGS) \
+ $(GLIB2_CFLAGS) \
$(DBUS_CFLAGS) \
- $(RAPTOR_CFLAGS) \
- $(GLIB2_CFLAGS)
+ $(RAPTOR_CFLAGS)
libtracker_datadir = $(libdir)/tracker
libtracker_data_LTLIBRARIES = libtracker-data.la
Modified: trunk/src/libtracker-db/Makefile.am
==============================================================================
--- trunk/src/libtracker-db/Makefile.am (original)
+++ trunk/src/libtracker-db/Makefile.am Wed Feb 18 12:00:47 2009
@@ -6,10 +6,10 @@
-DTRACKER_COMPILATION \
-I$(top_srcdir)/src \
$(WARN_CFLAGS) \
- $(SQLITE3_CFLAGS) \
- $(QDBM_CFLAGS) \
+ $(GLIB2_CFLAGS) \
$(DBUS_CFLAGS) \
- $(GLIB2_CFLAGS)
+ $(SQLITE3_CFLAGS) \
+ $(QDBM_CFLAGS)
libtracker_dbdir = $(libdir)/tracker
libtracker_db_LTLIBRARIES = libtracker-db.la
Modified: trunk/src/libtracker-gtk/Makefile.am
==============================================================================
--- trunk/src/libtracker-gtk/Makefile.am (original)
+++ trunk/src/libtracker-gtk/Makefile.am Wed Feb 18 12:00:47 2009
@@ -1,30 +1,31 @@
include $(top_srcdir)/Makefile.decl
-INCLUDES = \
- -I$(top_srcdir)/src/libtracker \
+INCLUDES = \
+ -I$(top_srcdir)/src/libtracker \
+ $(WARN_CFLAGS) \
$(LIBTRACKERGTK_CFLAGS)
-
+
libtracker_gtkincdir = $(includedir)/libtracker-gtk
lib_LTLIBRARIES = libtracker-gtk.la
-libtracker_gtkinc_HEADERS = \
- tracker-gtk.h \
- tracker-utils.h \
- tracker-ui.h \
- tracker-metadata-tile.h \
- tracker-tag-bar.h \
+libtracker_gtkinc_HEADERS = \
+ tracker-gtk.h \
+ tracker-utils.h \
+ tracker-ui.h \
+ tracker-metadata-tile.h \
+ tracker-tag-bar.h \
tracker-keyword-store.h
-libtracker_gtk_la_SOURCES = \
- tracker-utils.c \
- tracker-ui.c \
- tracker-metadata-tile.c \
- tracker-tag-bar.c \
+libtracker_gtk_la_SOURCES = \
+ tracker-utils.c \
+ tracker-ui.c \
+ tracker-metadata-tile.c \
+ tracker-tag-bar.c \
tracker-keyword-store.c
-libtracker_gtk_la_LIBADD = \
- $(top_builddir)/src/libtracker/libtrackerclient.la \
+libtracker_gtk_la_LIBADD = \
+ $(top_builddir)/src/libtracker/libtrackerclient.la \
$(LIBTRACKERGTK_LIBS)
libtracker_gtk_la_LDFLAGS = -version-info 0:0:0
Modified: trunk/src/plugins/evolution/Makefile.am
==============================================================================
--- trunk/src/plugins/evolution/Makefile.am (original)
+++ trunk/src/plugins/evolution/Makefile.am Wed Feb 18 12:00:47 2009
@@ -1,21 +1,22 @@
include $(top_srcdir)/Makefile.decl
-INCLUDES = \
- -I$(top_srcdir)/src \
- -DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\"" \
- -DLOCALEDIR="\"$(LOCALEDIR)\"" \
- -DTRACKER_COMPILATION \
- $(DBUS_CFLAGS) \
- $(GMIME_CFLAGS) \
+INCLUDES = \
+ -I$(top_srcdir)/src \
+ -DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\"" \
+ -DLOCALEDIR="\"$(LOCALEDIR)\"" \
+ -DTRACKER_COMPILATION \
+ $(WARN_CFLAGS) \
+ $(DBUS_CFLAGS) \
+ $(GMIME_CFLAGS) \
$(EVOLUTION_PLUGIN_CFLAGS)
%.eplug.in: %.eplug.xml
LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@
%.eplug: %.eplug.in
- sed -e "s%+PLUGIN_INSTALL_DIR+%$(EVOLUTION_PLUGIN_INSTALL_DIR)%" \
- -e "s%+GETTEXT_PACKAGE+%$(GETTEXT_PACKAGE)%" \
- -e "s%+LOCALEDIR+%$(LOCALEDIR)%" \
+ sed -e "s%+PLUGIN_INSTALL_DIR+%$(EVOLUTION_PLUGIN_INSTALL_DIR)%"\
+ -e "s%+GETTEXT_PACKAGE+%$(GETTEXT_PACKAGE)%" \
+ -e "s%+LOCALEDIR+%$(LOCALEDIR)%" \
$< > $@
eplugindir = $(EVOLUTION_PLUGIN_INSTALL_DIR)
@@ -93,7 +94,8 @@
$(dbus_sources) \
$(eplugin_DATA)
-CLEANFILES = $(BUILT_SOURCES) \
+CLEANFILES = \
+ $(BUILT_SOURCES) \
org-freedesktop-Tracker-evolution-plugin.eplug
EXTRA_DIST = \
Modified: trunk/src/plugins/kmail/Makefile.am
==============================================================================
--- trunk/src/plugins/kmail/Makefile.am (original)
+++ trunk/src/plugins/kmail/Makefile.am Wed Feb 18 12:00:47 2009
@@ -1,10 +1,11 @@
include $(top_srcdir)/Makefile.decl
-INCLUDES = -I$(top_srcdir)/src \
- -DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\"" \
- -DLOCALEDIR="\"$(LOCALEDIR)\"" \
- -DTRACKER_COMPILATION \
- $(DBUS_CFLAGS) \
+INCLUDES = -I$(top_srcdir)/src \
+ -DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\"" \
+ -DLOCALEDIR="\"$(LOCALEDIR)\"" \
+ -DTRACKER_COMPILATION \
+ $(WARN_CFLAGS) \
+ $(DBUS_CFLAGS) \
$(GMIME_CFLAGS)
module_flags = -module -avoid-version -no-undefined
@@ -15,16 +16,16 @@
pushd_modules_LTLIBRARIES = libtracker-module_kmail-daemon-module.la
pushi_modules_LTLIBRARIES = libtracker-module_kmail-indexer-module.la
-libtracker_module_kmail_indexer_module_la_SOURCES = \
- tracker-kmail-indexer.c \
- tracker-kmail-indexer.h \
- tracker-kmail-registrar-glue.h \
+libtracker_module_kmail_indexer_module_la_SOURCES = \
+ tracker-kmail-indexer.c \
+ tracker-kmail-indexer.h \
+ tracker-kmail-registrar-glue.h \
tracker-kmail-common.h
-libtracker_module_kmail_daemon_module_la_SOURCES = \
- tracker-kmail-registrar.c \
- tracker-kmail-registrar.h \
- tracker-kmail-common.h \
+libtracker_module_kmail_daemon_module_la_SOURCES = \
+ tracker-kmail-registrar.c \
+ tracker-kmail-registrar.h \
+ tracker-kmail-common.h \
tracker-kmail-registrar-glue.h
libtracker_module_kmail_daemon_module_la_LDFLAGS = $(module_flags)
Modified: trunk/src/plugins/rss/Makefile.am
==============================================================================
--- trunk/src/plugins/rss/Makefile.am (original)
+++ trunk/src/plugins/rss/Makefile.am Wed Feb 18 12:00:47 2009
@@ -1,10 +1,11 @@
include $(top_srcdir)/Makefile.decl
-INCLUDES = -I$(top_srcdir)/src \
- -DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\"" \
- -DLOCALEDIR="\"$(LOCALEDIR)\"" \
- -DTRACKER_COMPILATION \
- $(DBUS_CFLAGS) \
+INCLUDES = -I$(top_srcdir)/src \
+ -DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\"" \
+ -DLOCALEDIR="\"$(LOCALEDIR)\"" \
+ -DTRACKER_COMPILATION \
+ $(WARN_CFLAGS) \
+ $(DBUS_CFLAGS) \
$(GMIME_CFLAGS)
module_flags = -module -avoid-version -no-undefined
@@ -15,16 +16,16 @@
pushd_modules_LTLIBRARIES = libtracker-module-rss-daemon-module.la
pushi_modules_LTLIBRARIES = libtracker-module-rss-indexer-module.la
-libtracker_module_rss_indexer_module_la_SOURCES = \
- tracker-rss-indexer.c \
- tracker-rss-indexer.h \
- tracker-rss-registrar-glue.h \
+libtracker_module_rss_indexer_module_la_SOURCES = \
+ tracker-rss-indexer.c \
+ tracker-rss-indexer.h \
+ tracker-rss-registrar-glue.h \
tracker-rss-common.h
-libtracker_module_rss_daemon_module_la_SOURCES = \
- tracker-rss-registrar.c \
- tracker-rss-registrar.h \
- tracker-rss-common.h \
+libtracker_module_rss_daemon_module_la_SOURCES = \
+ tracker-rss-registrar.c \
+ tracker-rss-registrar.h \
+ tracker-rss-common.h \
tracker-rss-registrar-glue.h
libtracker_module_rss_daemon_module_la_LDFLAGS = $(module_flags)
@@ -60,6 +61,8 @@
$(DBUSBINDINGTOOL) --mode=glib-server --output=$@ --prefix=$(subst -,_,$*) $^
BUILT_SOURCES = $(dbus_sources)
+
CLEANFILES = $(BUILT_SOURCES)
+
EXTRA_DIST = $(BUILT_SOURCES)
Modified: trunk/src/qdbm/Makefile.am
==============================================================================
--- trunk/src/qdbm/Makefile.am (original)
+++ trunk/src/qdbm/Makefile.am Wed Feb 18 12:00:47 2009
@@ -1,22 +1,22 @@
include $(top_srcdir)/Makefile.decl
-INCLUDES = \
- -D_XOPEN_SOURCE_EXTENDED=1 \
- -D_GNU_SOURCE=1 \
- -D__EXTENSIONS__=1 \
- -D_HPUX_SOURCE=1 \
- -D_POSIX_MAPPED_FILES=1 \
- -D_POSIX_SYNCHRONIZED_IO=1 \
- -DPIC=1 \
- -D_THREAD_SAFE=1 \
- -D_REENTRANT=1 \
- -DNDEBUG \
+INCLUDES = \
+ -D_XOPEN_SOURCE_EXTENDED=1 \
+ -D_GNU_SOURCE=1 \
+ -D__EXTENSIONS__=1 \
+ -D_HPUX_SOURCE=1 \
+ -D_POSIX_MAPPED_FILES=1 \
+ -D_POSIX_SYNCHRONIZED_IO=1 \
+ -DPIC=1 \
+ -D_THREAD_SAFE=1 \
+ -D_REENTRANT=1 \
+ -DNDEBUG \
-DMYNOMMAP
noinst_LTLIBRARIES = libqdbm-private.la
-libqdbm_private_la_SOURCES = \
- depot.c \
- depot.h \
- myconf.c \
+libqdbm_private_la_SOURCES = \
+ depot.c \
+ depot.h \
+ myconf.c \
myconf.h
Modified: trunk/src/tracker-applet/Makefile.am
==============================================================================
--- trunk/src/tracker-applet/Makefile.am (original)
+++ trunk/src/tracker-applet/Makefile.am Wed Feb 18 12:00:47 2009
@@ -6,8 +6,8 @@
-DTRACKER_COMPILATION \
-I$(top_srcdir)/src \
$(WARN_CFLAGS) \
- $(TRACKER_APPLET_CFLAGS) \
- $(LIBGLADE_CFLAGS)
+ $(LIBGLADE_CFLAGS) \
+ $(TRACKER_APPLET_CFLAGS)
bin_PROGRAMS = tracker-applet
Modified: trunk/src/tracker-extract/Makefile.am
==============================================================================
--- trunk/src/tracker-extract/Makefile.am (original)
+++ trunk/src/tracker-extract/Makefile.am Wed Feb 18 12:00:47 2009
@@ -9,6 +9,11 @@
-DG_LOG_DOMAIN=\"Tracker\" \
-DTRACKER_COMPILATION \
-I$(top_srcdir)/src \
+ $(WARN_CFLAGS) \
+ $(GLIB2_CFLAGS) \
+ $(GDKPIXBUF_CFLAGS) \
+ $(GMODULE_CFLAGS) \
+ $(DBUS_CFLAGS) \
$(EXEMPI_CFLAGS) \
$(LIBJPEG_CFLAGS) \
$(LIBTIFF_CFLAGS) \
@@ -19,10 +24,6 @@
$(POPPLER_GLIB_CFLAGS) \
$(GSTREAMER_CFLAGS) \
$(XINE_CFLAGS) \
- $(GDKPIXBUF_CFLAGS) \
- $(GMODULE_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(GLIB2_CFLAGS) \
$(TOTEM_PL_PARSER_CFLAGS)
modules_LTLIBRARIES = \
@@ -96,7 +97,7 @@
albumart_libs =
albumart_flags =
albumart_sources = \
- tracker-extract-albumart.c \
+ tracker-extract-albumart.c \
tracker-extract-albumart.h
if HAVE_GDKPIXBUF
Modified: trunk/src/tracker-extract/tracker-dbus.c
==============================================================================
--- trunk/src/tracker-extract/tracker-dbus.c (original)
+++ trunk/src/tracker-extract/tracker-dbus.c Wed Feb 18 12:00:47 2009
@@ -79,13 +79,6 @@
dbus_g_connection_register_g_object (lconnection, path, object);
}
-static void
-dbus_name_owner_changed (gpointer data,
- GClosure *closure)
-{
- g_object_unref (data);
-}
-
static gboolean
dbus_register_names (void)
{
Modified: trunk/src/tracker-extract/tracker-dbus.h
==============================================================================
--- trunk/src/tracker-extract/tracker-dbus.h (original)
+++ trunk/src/tracker-extract/tracker-dbus.h Wed Feb 18 12:00:47 2009
@@ -28,9 +28,10 @@
G_BEGIN_DECLS
-gboolean tracker_dbus_init (void);
-void tracker_dbus_shutdown (void);
-gboolean tracker_dbus_register_object (void);
+gboolean tracker_dbus_init (void);
+void tracker_dbus_shutdown (void);
+gboolean tracker_dbus_register_objects (void);
+GObject *tracker_dbus_get_object (GType type);
G_END_DECLS
Modified: trunk/src/tracker-extract/tracker-extract-albumart.c
==============================================================================
--- trunk/src/tracker-extract/tracker-extract-albumart.c (original)
+++ trunk/src/tracker-extract/tracker-extract-albumart.c Wed Feb 18 12:00:47 2009
@@ -42,8 +42,6 @@
#include "tracker-extract-albumart.h"
-
-
#ifdef HAVE_GDKPIXBUF
static gboolean
@@ -121,22 +119,25 @@
gchar *filename_uri;
gboolean lcopied = FALSE;
- if (strchr (filename, ':'))
+ if (strchr (filename, ':')) {
filename_uri = g_strdup (filename);
- else
+ } else {
filename_uri = g_filename_to_uri (filename, NULL, NULL);
+ }
- tracker_albumart_get_path (artist, album, "album", filename_uri,
- &art_path, &local_uri);
+ tracker_albumart_get_path (artist,
+ album,
+ "album",
+ filename_uri,
+ &art_path,
+ &local_uri);
if (!g_file_test (art_path, G_FILE_TEST_EXISTS)) {
-
#ifdef HAVE_GDKPIXBUF
-
/* If we have embedded album art */
-
if (buffer && len) {
- retval = set_albumart (buffer, len,
+ retval = set_albumart (buffer,
+ len,
artist,
album,
filename);
@@ -145,9 +146,7 @@
} else {
#endif /* HAVE_GDK_PIXBUF */
-
/* If not, we perform a heuristic on the dir */
-
if (!tracker_albumart_heuristic (artist, album,
trackercnt_str,
filename,
@@ -156,7 +155,6 @@
/* If the heuristic failed, we request the download
* of the media-art to the media-art downloaders */
-
lcopied = TRUE;
tracker_albumart_request_download (artist,
album,
@@ -164,9 +162,7 @@
art_path);
}
#ifdef HAVE_GDKPIXBUF
-
}
-
#endif /* HAVE_GDKPIXBUF */
/* If the heuristic didn't copy from the .mediaartlocal, then
Modified: trunk/src/tracker-extract/tracker-extract-gstreamer.c
==============================================================================
--- trunk/src/tracker-extract/tracker-extract-gstreamer.c (original)
+++ trunk/src/tracker-extract/tracker-extract-gstreamer.c Wed Feb 18 12:00:47 2009
@@ -59,6 +59,8 @@
#include <string.h>
#include <glib.h>
+#include <glib/gstdio.h>
+
#include <gst/gst.h>
#include <gst/tag/tag.h>
@@ -986,7 +988,7 @@
if (!g_hash_table_lookup (metadata, "Image:Date")) {
struct stat st;
- if (g_lstat(uri, &st) >= 0) {
+ if (g_lstat (uri, &st) >= 0) {
gchar *date;
date = tracker_date_to_string (st.st_mtime);
Modified: trunk/src/tracker-extract/tracker-main.c
==============================================================================
--- trunk/src/tracker-extract/tracker-main.c (original)
+++ trunk/src/tracker-extract/tracker-main.c Wed Feb 18 12:00:47 2009
@@ -34,6 +34,9 @@
#include <sys/resource.h>
#endif
+#include <libtracker-common/tracker-log.h>
+#include <libtracker-common/tracker-config.h>
+#include <libtracker-common/tracker-dbus.h>
#include <libtracker-common/tracker-os-dependant.h>
#include <libtracker-common/tracker-thumbnailer.h>
@@ -124,7 +127,6 @@
{
GOptionContext *context;
GError *error = NULL;
- gchar *summary;
TrackerConfig *config;
gchar *log_filename;
Modified: trunk/src/tracker-extract/tracker-main.h
==============================================================================
--- trunk/src/tracker-extract/tracker-main.h (original)
+++ trunk/src/tracker-extract/tracker-main.h Wed Feb 18 12:00:47 2009
@@ -47,12 +47,12 @@
};
/* This is defined in each extract */
-TrackerExtractData *tracker_get_extract_data (void);
+TrackerExtractData *tracker_get_extract_data (void);
/* This is used to not shutdown after the default of 30 seconds if we
* get more work to do.
*/
-void tracker_main_shutdown_timeout_reset (void);
+void tracker_main_quit_timeout_reset (void);
G_END_DECLS
Modified: trunk/src/tracker-fts/Makefile.am
==============================================================================
--- trunk/src/tracker-fts/Makefile.am (original)
+++ trunk/src/tracker-fts/Makefile.am Wed Feb 18 12:00:47 2009
@@ -1,30 +1,27 @@
include $(top_srcdir)/Makefile.decl
-module_flags = -module -avoid-version -no-undefined
-tracker_fts_modulesdir = $(libdir)
-
-INCLUDES = \
- -g \
- -I$(top_srcdir)/src \
- $(GLIB2_CFLAGS) \
- $(SQLITE3_CFLAGS) \
- $(PANGO_CFLAGS) \
+INCLUDES = \
+ -I$(top_srcdir)/src \
+ $(WARN_CFLAGS) \
+ $(GLIB2_CFLAGS) \
+ $(PANGO_CFLAGS) \
+ $(SQLITE3_CFLAGS) \
-DSTORE_CATEGORY=1
-
+module_flags = -module -avoid-version -no-undefined
+
+tracker_fts_modulesdir = $(libdir)
tracker_fts_modules_LTLIBRARIES = tracker-fts.la
-
-tracker_fts_la_SOURCES = \
- tracker-fts.c \
- tracker-fts-hash.c
-
-
+tracker_fts_la_SOURCES = \
+ tracker-fts.c \
+ tracker-fts-hash.c
+
tracker_fts_la_LDFLAGS = $(module_flags)
-tracker_fts_la_LIBADD = \
- $(top_builddir)/src/libtracker-db/libtracker-db.la \
- $(SQLITE3_LIBS) \
- $(GTHREAD_LIBS) \
- $(PANGO_LIBS) \
+tracker_fts_la_LIBADD = \
+ $(top_builddir)/src/libtracker-db/libtracker-db.la \
+ $(SQLITE3_LIBS) \
+ $(GTHREAD_LIBS) \
+ $(PANGO_LIBS) \
$(GLIB2_LIBS)
Modified: trunk/src/tracker-indexer/Makefile.am
==============================================================================
--- trunk/src/tracker-indexer/Makefile.am (original)
+++ trunk/src/tracker-indexer/Makefile.am Wed Feb 18 12:00:47 2009
@@ -13,11 +13,11 @@
-DG_LOG_DOMAIN=\"Tracker\" \
-DTRACKER_COMPILATION \
-I$(top_srcdir)/src \
- $(DBUS_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(GMODULE_CFLAGS) \
$(PANGO_CFLAGS) \
- $(RAPTOR_CFLAGS) \
- $(GMODULE_CFLAGS)
-
+ $(DBUS_CFLAGS) \
+ $(RAPTOR_CFLAGS)
libtracker_moduledir = $(libdir)/tracker
libtracker_moduleincludedir=$(includedir)/tracker-1.0/libtracker-module/
Modified: trunk/src/tracker-indexer/modules/Makefile.am
==============================================================================
--- trunk/src/tracker-indexer/modules/Makefile.am (original)
+++ trunk/src/tracker-indexer/modules/Makefile.am Wed Feb 18 12:00:47 2009
@@ -13,9 +13,9 @@
-DTRACKER_COMPILATION \
-I$(top_srcdir)/src \
$(WARN_CFLAGS) \
+ $(GLIB2_CFLAGS) \
$(GMODULE_CFLAGS) \
$(GIO_CFLAGS) \
- $(GLIB2_CFLAGS) \
$(GCONF_CFLAGS) \
$(GMIME_CFLAGS) \
$(SQLITE3_CFLAGS)
Modified: trunk/src/tracker-preferences/Makefile.am
==============================================================================
--- trunk/src/tracker-preferences/Makefile.am (original)
+++ trunk/src/tracker-preferences/Makefile.am Wed Feb 18 12:00:47 2009
@@ -15,12 +15,12 @@
-DTRACKER_BINDIR=\""$(bindir)"\" \
-DTRACKER_LIBEXECDIR=\""$(libexecdir)"\" \
-DTRACKER_COMPILATION \
+ -I$(top_srcdir)/src \
$(WARN_CFLAGS) \
- $(LIBGLADE_CFLAGS) \
+ $(GLIB_CFLAGS) \
$(GTK2_CFLAGS) \
$(DBUS_CFLAGS) \
- $(GLIB_CFLAGS) \
- -I$(top_srcdir)/src
+ $(LIBGLADE_CFLAGS)
tracker_preferences_SOURCES = \
tracker-preferences.c \
Modified: trunk/src/tracker-search-tool/Makefile.am
==============================================================================
--- trunk/src/tracker-search-tool/Makefile.am (original)
+++ trunk/src/tracker-search-tool/Makefile.am Wed Feb 18 12:00:47 2009
@@ -3,37 +3,38 @@
@INTLTOOL_DESKTOP_RULE@
INCLUDES = \
- -I$(top_srcdir)/src/libtracker \
- $(GLIB2_CFLAGS) \
- $(GNOME_UTILS_CFLAGS) \
- $(GIO_CFLAGS) \
- $(GNOMEDESKTOP_CFLAGS) \
- $(DBUS_CFLAGS) \
-DG_DISABLE_DEPRECATED \
-DTRACKER_LOCALEDIR=\""$(localedir)"\" \
-DTRACKER_DATADIR=\""$(datadir)"\" \
-DGREP_COMMAND=\""$(GREP_COMMAND)"\" \
+ -I$(top_srcdir)/src/libtracker \
+ $(WARN_CFLAGS) \
+ $(GLIB2_CFLAGS) \
+ $(GIO_CFLAGS) \
+ $(DBUS_CFLAGS) \
+ $(GNOME_UTILS_CFLAGS) \
+ $(GNOMEDESKTOP_CFLAGS) \
$(LIBTRACKERGTK_CFLAGS)
-
+
bin_PROGRAMS = tracker-search-tool
-tracker_search_tool_SOURCES = \
- tracker-search-tool-support.c \
- tracker-search-tool-support.h \
- tracker-search-tool-callbacks.c \
- tracker-search-tool-callbacks.h \
- tracker-search-tool.c \
- tracker-search-tool.h \
- sexy-icon-entry.c \
+tracker_search_tool_SOURCES = \
+ tracker-search-tool-support.c \
+ tracker-search-tool-support.h \
+ tracker-search-tool-callbacks.c \
+ tracker-search-tool-callbacks.h \
+ tracker-search-tool.c \
+ tracker-search-tool.h \
+ sexy-icon-entry.c \
sexy-icon-entry.h
-tracker_search_tool_LDADD = \
- $(GLIB2_LIBS) \
- $(GNOME_UTILS_LIBS) \
- $(GIO_LIBS) \
- $(GNOMEDESKTOP_LIBS) \
- $(DBUS_LIBS) \
- $(top_builddir)/src/libtracker-gtk/libtracker-gtk.la \
+tracker_search_tool_LDADD = \
+ $(GLIB2_LIBS) \
+ $(GNOME_UTILS_LIBS) \
+ $(GIO_LIBS) \
+ $(GNOMEDESKTOP_LIBS) \
+ $(DBUS_LIBS) \
+ $(top_builddir)/src/libtracker-gtk/libtracker-gtk.la \
$(top_builddir)/src/libtracker/libtrackerclient.la
Modified: trunk/src/tracker-utils/Makefile.am
==============================================================================
--- trunk/src/tracker-utils/Makefile.am (original)
+++ trunk/src/tracker-utils/Makefile.am Wed Feb 18 12:00:47 2009
@@ -5,9 +5,10 @@
-DG_LOG_DOMAIN=\"Tracker\" \
-DTRACKER_COMPILATION \
-I$(top_srcdir)/src \
- $(DBUS_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(GLIB2_CFLAGS) \
$(GIO_CFLAGS) \
- $(GLIB2_CFLAGS)
+ $(DBUS_CFLAGS)
libs = \
$(top_builddir)/src/libtracker/libtrackerclient.la \
Modified: trunk/src/trackerd/Makefile.am
==============================================================================
--- trunk/src/trackerd/Makefile.am (original)
+++ trunk/src/trackerd/Makefile.am Wed Feb 18 12:00:47 2009
@@ -9,17 +9,18 @@
-DG_LOG_DOMAIN=\"Tracker\" \
-DTRACKER_COMPILATION \
-I$(top_srcdir)/src \
+ $(WARN_CFLAGS) \
+ $(GLIB2_CFLAGS) \
+ $(GTHREAD_CFLAGS) \
+ $(GMODULE_CFLAGS) \
+ $(GIO_CFLAGS) \
+ $(DBUS_CFLAGS) \
+ $(PANGO_CFLAGS) \
$(GMIME_CFLAGS) \
$(FAM_CFLAGS) \
$(SQLITE3_CFLAGS) \
$(QDBM_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(PANGO_CFLAGS) \
- $(GIO_CFLAGS) \
- $(GMODULE_CFLAGS) \
- $(GTHREAD_CFLAGS) \
- $(RAPTOR_CFLAGS) \
- $(GLIB2_CFLAGS)
+ $(RAPTOR_CFLAGS)
if HAVE_INOTIFY
inotify_libs = $(top_builddir)/src/libinotify/libinotify.la
Modified: trunk/src/trackerd/tracker-cleanup.c
==============================================================================
--- trunk/src/trackerd/tracker-cleanup.c (original)
+++ trunk/src/trackerd/tracker-cleanup.c Wed Feb 18 12:00:47 2009
@@ -59,8 +59,7 @@
gboolean is_valid = TRUE;
while (is_valid) {
- GValue value = { 0, };
- const gchar *mount_point;
+ GValue value = { 0, };
_tracker_db_result_set_get_value (result_set, 0, &value);
Modified: trunk/src/trackerd/tracker-dbus.c
==============================================================================
--- trunk/src/trackerd/tracker-dbus.c (original)
+++ trunk/src/trackerd/tracker-dbus.c Wed Feb 18 12:00:47 2009
@@ -159,19 +159,6 @@
return TRUE;
}
-static void
-indexer_continue_async_cb (DBusGProxy *proxy,
- GError *error,
- gpointer user_data)
-{
- if (error) {
- g_message ("Couldn't resume the indexer: %s", error->message);
- g_error_free (error);
- }
-
- g_object_unref (proxy);
-}
-
static gboolean
indexer_resume_cb (gpointer user_data)
{
@@ -192,7 +179,6 @@
gpointer user_data)
{
DBusGProxy *proxy;
- GError *error = NULL;
gboolean set_paused = TRUE;
TrackerStatus status;
Modified: trunk/src/trackerd/tracker-processor.c
==============================================================================
--- trunk/src/trackerd/tracker-processor.c (original)
+++ trunk/src/trackerd/tracker-processor.c Wed Feb 18 12:00:47 2009
@@ -1478,7 +1478,6 @@
gpointer user_data)
{
TrackerProcessor *processor;
- GList *l;
processor = user_data;
Modified: trunk/src/trackerd/tracker-status.c
==============================================================================
--- trunk/src/trackerd/tracker-status.c (original)
+++ trunk/src/trackerd/tracker-status.c Wed Feb 18 12:00:47 2009
@@ -273,7 +273,7 @@
gint limit;
private = g_static_private_get (&private_key);
- g_return_if_fail (private != NULL);
+ g_return_val_if_fail (private != NULL, FALSE);
limit = tracker_config_get_low_disk_space_limit (private->config);
@@ -338,20 +338,6 @@
}
}
-static void
-disk_space_check_stop (void)
-{
- TrackerStatusPrivate *private;
-
- private = g_static_private_get (&private_key);
- g_return_if_fail (private != NULL);
-
- if (private->disk_space_check_id != 0) {
- g_source_remove (private->disk_space_check_id);
- private->disk_space_check_id = 0;
- }
-}
-
#ifdef HAVE_HAL
static void
Modified: trunk/tests/common/Makefile.am
==============================================================================
--- trunk/tests/common/Makefile.am (original)
+++ trunk/tests/common/Makefile.am Wed Feb 18 12:00:47 2009
@@ -4,6 +4,7 @@
INCLUDES = \
-DTEST_TEXT=\""$(top_srcdir)"/tests/libtracker-common/non-utf8.txt\" \
+ $(WARN_CFLAGS) \
$(GLIB2_CFLAGS)
libtracker_testcommon_la_SOURCES = \
Modified: trunk/tests/libtracker-common/Makefile.am
==============================================================================
--- trunk/tests/libtracker-common/Makefile.am (original)
+++ trunk/tests/libtracker-common/Makefile.am Wed Feb 18 12:00:47 2009
@@ -25,11 +25,12 @@
-DTRACKER_COMPILATION \
-I$(top_srcdir)/src \
-I$(top_srcdir)/tests/common \
- $(DBUS_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(GLIB2_CFLAGS) \
$(GMODULE_CFLAGS) \
$(GTHREAD_CFLAGS) \
$(PANGO_CFLAGS) \
- $(GLIB2_CFLAGS)
+ $(DBUS_CFLAGS)
tracker_ontology_SOURCES = \
tracker-ontology-test.c
Modified: trunk/tests/libtracker-db/Makefile.am
==============================================================================
--- trunk/tests/libtracker-db/Makefile.am (original)
+++ trunk/tests/libtracker-db/Makefile.am Wed Feb 18 12:00:47 2009
@@ -25,12 +25,13 @@
-DTRACKER_COMPILATION \
-I$(top_srcdir)/src \
-I$(top_srcdir)/tests/common \
- $(DBUS_CFLAGS) \
- $(SQLITE3_CFLAGS) \
- $(QDBM_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(GLIB2_CFLAGS) \
$(GMODULE_CFLAGS) \
$(GTHREAD_CFLAGS) \
- $(GLIB2_CFLAGS)
+ $(DBUS_CFLAGS) \
+ $(SQLITE3_CFLAGS) \
+ $(QDBM_CFLAGS)
# TEST_PROGS += \
# union-performance \
Modified: trunk/tests/tracker-extract/Makefile.am
==============================================================================
--- trunk/tests/tracker-extract/Makefile.am (original)
+++ trunk/tests/tracker-extract/Makefile.am Wed Feb 18 12:00:47 2009
@@ -27,11 +27,12 @@
-DTRACKER_COMPILATION \
-I$(top_srcdir)/src \
-I$(top_srcdir)/tests/common \
- $(DBUS_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(GLIB2_CFLAGS) \
$(GMODULE_CFLAGS) \
$(GTHREAD_CFLAGS) \
$(PANGO_CFLAGS) \
- $(GLIB2_CFLAGS)
+ $(DBUS_CFLAGS)
TEST_UTILS_SOURCES = \
tracker-extract-test-utils.c \
Modified: trunk/tests/tracker-extract/tracker-extract-gstreamer-test.c
==============================================================================
--- trunk/tests/tracker-extract/tracker-extract-gstreamer-test.c (original)
+++ trunk/tests/tracker-extract/tracker-extract-gstreamer-test.c Wed Feb 18 12:00:47 2009
@@ -39,8 +39,6 @@
g_thread_init (NULL);
g_test_init (&argc, &argv, NULL);
- TrackerExtractData *data;
-
g_test_message ("Testing extract functionality");
g_test_add_func ("/tracker-extract/tracker-extract-gstreamer/check-extract-data",
test_tracker_extract_check_extract_data);
Modified: trunk/tests/tracker-extract/tracker-extract-jpeg-test.c
==============================================================================
--- trunk/tests/tracker-extract/tracker-extract-jpeg-test.c (original)
+++ trunk/tests/tracker-extract/tracker-extract-jpeg-test.c Wed Feb 18 12:00:47 2009
@@ -32,7 +32,6 @@
int
main (int argc, char **argv) {
- TrackerExtractData *data;
gint result;
g_type_init ();
Modified: trunk/tests/tracker-extract/tracker-extract-mp3-test.c
==============================================================================
--- trunk/tests/tracker-extract/tracker-extract-mp3-test.c (original)
+++ trunk/tests/tracker-extract/tracker-extract-mp3-test.c Wed Feb 18 12:00:47 2009
@@ -47,7 +47,8 @@
data = tracker_test_extract_get_extract ("audio/mpeg");
g_test_add_data_func ("/tracker-extract/tracker-extract-mp3/access",
- data, access_tracker_extract_mp3);
+ data,
+ test_tracker_extract_mp3_access);
#if 0
Modified: trunk/tests/tracker-extract/tracker-extract-png-test.c
==============================================================================
--- trunk/tests/tracker-extract/tracker-extract-png-test.c (original)
+++ trunk/tests/tracker-extract/tracker-extract-png-test.c Wed Feb 18 12:00:47 2009
@@ -38,8 +38,6 @@
g_thread_init (NULL);
g_test_init (&argc, &argv, NULL);
- TrackerExtractData *data;
-
g_test_message ("Testing extract functionality");
g_test_add_func ("/tracker-extract/tracker-extract-png/check-extract-data",
test_tracker_extract_check_extract_data);
Modified: trunk/tests/tracker-extract/tracker-extract-test-utils.c
==============================================================================
--- trunk/tests/tracker-extract/tracker-extract-test-utils.c (original)
+++ trunk/tests/tracker-extract/tracker-extract-test-utils.c Wed Feb 18 12:00:47 2009
@@ -18,6 +18,10 @@
* Boston, MA 02110-1301, USA.
*/
+#include <unistd.h>
+
+#include <glib/gstdio.h>
+
#include "tracker-extract-test-utils.h"
TrackerExtractData *
@@ -132,18 +136,19 @@
}
void
-access_extract_files (const TrackerExtractData *data, const gchar *filematch, guint filecount)
+access_extract_files (const TrackerExtractData *data,
+ const gchar *filematch,
+ guint filecount)
{
- double perftime;
guint i;
g_assert (data != NULL);
g_assert (filematch != NULL);
- g_assert (filecount >0 );
+ g_assert (filecount > 0);
for (i=1;i<=filecount;i++) {
- char filename[256];
- char tmp[256];
+ gchar filename[256];
+ gchar tmp[256];
GHashTable *metadata;
metadata = g_hash_table_new_full (g_str_hash,
@@ -169,24 +174,6 @@
}
}
-TrackerExtractData *
-search_mime_extract (const gchar *mime)
-{
- TrackerExtractData *data;
-
- data = tracker_get_extract_data ();
-
- while (data->mime) {
- if (strcmp (data->mime,mime) == 0) {
- return data;
- }
- data++;
- }
-
- return NULL;
-}
-
-
GHashTable *
parse_testdata_file (const gchar *filename)
{
@@ -239,8 +226,9 @@
for (ttype = g_scanner_get_next_token(scanner);
ttype != G_TOKEN_EOF;
ttype = g_scanner_get_next_token (scanner)) {
- if (ttype = G_TOKEN_IDENTIFIER) {
+ if (ttype == G_TOKEN_IDENTIFIER) {
gchar key[256];
+
strcpy (key, scanner->value.v_identifier);
ttype = g_scanner_get_next_token(scanner);
Modified: trunk/tests/tracker-extract/tracker-extract-testsuite-avi.c
==============================================================================
--- trunk/tests/tracker-extract/tracker-extract-testsuite-avi.c (original)
+++ trunk/tests/tracker-extract/tracker-extract-testsuite-avi.c Wed Feb 18 12:00:47 2009
@@ -20,6 +20,7 @@
#include <glib.h>
+#include "tracker-extract-testsuite-avi.h"
#include "tracker-extract-test-utils.h"
typedef struct {
@@ -32,12 +33,12 @@
{ NULL, NULL }
};
-void test_tracker_extract_avi_basic_tags(gconstpointer data)
+void
+test_tracker_extract_avi_basic_tags (gconstpointer data)
{
- const TrackerExtractData *extract = data;
guint i;
- for (i=0; data_basic_tags[i].filename; i++) {
+ for (i = 0; data_basic_tags[i].filename; i++) {
extract_file (data,
data_basic_tags[i].filename,
data_basic_tags[i].testdata);
Modified: trunk/tests/tracker-extract/tracker-extract-testsuite-avi.h
==============================================================================
--- trunk/tests/tracker-extract/tracker-extract-testsuite-avi.h (original)
+++ trunk/tests/tracker-extract/tracker-extract-testsuite-avi.h Wed Feb 18 12:00:47 2009
@@ -23,6 +23,6 @@
#include <tracker-extract/tracker-extract.h>
-void test_tracker_extract_avi_basic_tags (gconstpointer data);
+void test_tracker_extract_avi_basic_tags (gconstpointer data);
#endif
Modified: trunk/tests/tracker-extract/tracker-extract-testsuite-jpeg.c
==============================================================================
--- trunk/tests/tracker-extract/tracker-extract-testsuite-jpeg.c (original)
+++ trunk/tests/tracker-extract/tracker-extract-testsuite-jpeg.c Wed Feb 18 12:00:47 2009
@@ -18,10 +18,9 @@
* Boston, MA 02110-1301, USA.
*/
-#include "tracker-extract-testsuite-mp3.h"
-
#include <glib.h>
+#include "tracker-extract-testsuite-jpeg.h"
#include "tracker-extract-test-utils.h"
typedef struct {
@@ -106,69 +105,68 @@
{ NULL, NULL }
};
-void test_tracker_extract_jpeg_basic_size(gconstpointer data)
+void
+test_tracker_extract_jpeg_basic_size (gconstpointer data)
{
- const TrackerExtractData *extract = data;
guint i;
- for (i=0; data_basic_size[i].filename; i++) {
+ for (i = 0; data_basic_size[i].filename; i++) {
extract_file (data,
data_basic_size[i].filename,
data_basic_size[i].testdata);
}
}
-void test_tracker_extract_jpeg_exif_size(gconstpointer data)
+void
+test_tracker_extract_jpeg_exif_size (gconstpointer data)
{
- const TrackerExtractData *extract = data;
guint i;
- for (i=0; data_exif_size[i].filename; i++) {
+ for (i = 0; data_exif_size[i].filename; i++) {
extract_file (data,
data_exif_size[i].filename,
data_exif_size[i].testdata);
}
}
-void test_tracker_extract_jpeg_exif_orientation(gconstpointer data)
+void
+test_tracker_extract_jpeg_exif_orientation (gconstpointer data)
{
- const TrackerExtractData *extract = data;
guint i;
- for (i=0; data_exif_orientation[i].filename; i++) {
+ for (i = 0; data_exif_orientation[i].filename; i++) {
extract_file (data,
data_exif_orientation[i].filename,
data_exif_orientation[i].testdata);
}
}
-void test_tracker_extract_jpeg_exif_flash(gconstpointer data)
+void
+test_tracker_extract_jpeg_exif_flash (gconstpointer data)
{
- const TrackerExtractData *extract = data;
guint i;
- for (i=0; data_exif_flash[i].filename; i++) {
+ for (i = 0; data_exif_flash[i].filename; i++) {
extract_file (data,
data_exif_flash[i].filename,
data_exif_flash[i].testdata);
}
}
-void test_tracker_extract_jpeg_exif_tags(gconstpointer data)
+void
+test_tracker_extract_jpeg_exif_tags (gconstpointer data)
{
- const TrackerExtractData *extract = data;
guint i;
- for (i=0; data_exif_tags[i].filename; i++) {
+ for (i = 0; data_exif_tags[i].filename; i++) {
extract_file (data,
data_exif_tags[i].filename,
data_exif_tags[i].testdata);
}
}
-void performance_tracker_extract_jpeg(gconstpointer data)
+void
+test_tracker_extract_jpeg_performance (gconstpointer data)
{
- const TrackerExtractData *extract = data;
-
performance_extract_files (data, "/jpeg/perf_jpeg_%d.jpg", 1000);
}
Modified: trunk/tests/tracker-extract/tracker-extract-testsuite-jpeg.h
==============================================================================
--- trunk/tests/tracker-extract/tracker-extract-testsuite-jpeg.h (original)
+++ trunk/tests/tracker-extract/tracker-extract-testsuite-jpeg.h Wed Feb 18 12:00:47 2009
@@ -30,6 +30,6 @@
void test_tracker_extract_jpeg_exif_tags (gconstpointer data);
-void performance_tracker_extract_jpeg (gconstpointer data);
+void test_tracker_extract_jpeg_performance (gconstpointer data);
#endif
Modified: trunk/tests/tracker-extract/tracker-extract-testsuite-mp3.c
==============================================================================
--- trunk/tests/tracker-extract/tracker-extract-testsuite-mp3.c (original)
+++ trunk/tests/tracker-extract/tracker-extract-testsuite-mp3.c Wed Feb 18 12:00:47 2009
@@ -18,10 +18,9 @@
* Boston, MA 02110-1301, USA.
*/
-#include "tracker-extract-testsuite-mp3.h"
-
#include <glib.h>
+#include "tracker-extract-testsuite-mp3.h"
#include "tracker-extract-test-utils.h"
typedef struct {
@@ -88,7 +87,6 @@
{ NULL, NULL }
};
-
static const ExtractData data_header_sampling[] = {
{ "/mp3/header_sampling_mpeg1_1.mp3", "/mp3/header_sampling_mpeg1_1.data" },
{ "/mp3/header_sampling_mpeg1_2.mp3", "/mp3/header_sampling_mpeg1_2.data" },
@@ -102,103 +100,99 @@
{ NULL, NULL }
};
-void access_tracker_extract_mp3(gconstpointer data)
+void
+test_tracker_extract_mp3_access (gconstpointer data)
{
- const TrackerExtractData *extract = data;
-
access_extract_files (data, "/mp3/access_%d.mp3", 4);
}
-void test_tracker_extract_mp3_id3v1_basic(gconstpointer data)
+void
+test_tracker_extract_mp3_id3v1_basic (gconstpointer data)
{
- const TrackerExtractData *extract = data;
guint i;
- for (i=0; data_id3v1_basic[i].filename; i++) {
+ for (i = 0; data_id3v1_basic[i].filename; i++) {
extract_file (data,
data_id3v1_basic[i].filename,
data_id3v1_basic[i].testdata);
}
}
-void test_tracker_extract_mp3_id3v23_basic(gconstpointer data)
+void
+test_tracker_extract_mp3_id3v23_basic (gconstpointer data)
{
- const TrackerExtractData *extract = data;
guint i;
- for (i=0; data_id3v23_basic[i].filename; i++) {
+ for (i = 0; data_id3v23_basic[i].filename; i++) {
extract_file (data,
data_id3v23_basic[i].filename,
data_id3v23_basic[i].testdata);
}
}
-void test_tracker_extract_mp3_id3v23_tags(gconstpointer data)
+void
+test_tracker_extract_mp3_id3v23_tags (gconstpointer data)
{
- const TrackerExtractData *extract = data;
guint i;
- for (i=0; data_id3v23_tags[i].filename; i++) {
+ for (i = 0; data_id3v23_tags[i].filename; i++) {
extract_file (data,
data_id3v23_tags[i].filename,
data_id3v23_tags[i].testdata);
}
}
-void test_tracker_extract_mp3_id3v23_tcon(gconstpointer data)
+void
+test_tracker_extract_mp3_id3v23_tcon(gconstpointer data)
{
- const TrackerExtractData *extract = data;
guint i;
- for (i=0; data_id3v23_tcon[i].filename; i++) {
+ for (i = 0; data_id3v23_tcon[i].filename; i++) {
extract_file (data,
data_id3v23_tcon[i].filename,
data_id3v23_tcon[i].testdata);
}
}
-void test_tracker_extract_mp3_header_bitrate(gconstpointer data)
+void
+test_tracker_extract_mp3_header_bitrate(gconstpointer data)
{
- const TrackerExtractData *extract = data;
guint i;
- for (i=0; data_header_bitrate[i].filename; i++) {
+ for (i = 0; data_header_bitrate[i].filename; i++) {
extract_file (data,
data_header_bitrate[i].filename,
data_header_bitrate[i].testdata);
}
}
-void test_tracker_extract_mp3_header_bitrate_vbr(gconstpointer data)
+void
+test_tracker_extract_mp3_header_bitrate_vbr (gconstpointer data)
{
- const TrackerExtractData *extract = data;
guint i;
- for (i=0; data_header_bitrate_vbr[i].filename; i++) {
+ for (i = 0; data_header_bitrate_vbr[i].filename; i++) {
extract_file (data,
data_header_bitrate_vbr[i].filename,
data_header_bitrate_vbr[i].testdata);
}
}
-void test_tracker_extract_mp3_header_sampling(gconstpointer data)
+void
+test_tracker_extract_mp3_header_sampling (gconstpointer data)
{
- const TrackerExtractData *extract = data;
guint i;
- for (i=0; data_header_sampling[i].filename; i++) {
+ for (i = 0; data_header_sampling[i].filename; i++) {
extract_file (data,
data_header_sampling[i].filename,
data_header_sampling[i].testdata);
}
}
-
-
-void performance_tracker_extract_mp3(gconstpointer data)
+void
+test_tracker_extract_mp3_performance (gconstpointer data)
{
- const TrackerExtractData *extract = data;
-
performance_extract_files (data, "/mp3/perf_cbr_id3v1_%d.mp3", 1000);
}
Modified: trunk/tests/tracker-extract/tracker-extract-testsuite-mp3.h
==============================================================================
--- trunk/tests/tracker-extract/tracker-extract-testsuite-mp3.h (original)
+++ trunk/tests/tracker-extract/tracker-extract-testsuite-mp3.h Wed Feb 18 12:00:47 2009
@@ -23,16 +23,14 @@
#include <tracker-extract/tracker-extract.h>
-void access_tracker_extract_mp3 (gconstpointer data);
-
-void test_tracker_extract_mp3_id3v1_basic (gconstpointer data);
-void test_tracker_extract_mp3_id3v23_basic (gconstpointer data);
-void test_tracker_extract_mp3_id3v23_tcon (gconstpointer data);
-void test_tracker_extract_mp3_id3v23_tags (gconstpointer data);
-void test_tracker_extract_mp3_header_bitrate (gconstpointer data);
-void test_tracker_extract_mp3_header_bitrate_vbr(gconstpointer data);
-void test_tracker_extract_mp3_header_sampling (gconstpointer data);
-
-void performance_tracker_extract_mp3 (gconstpointer data);
+void test_tracker_extract_mp3_access (gconstpointer data);
+void test_tracker_extract_mp3_id3v1_basic (gconstpointer data);
+void test_tracker_extract_mp3_id3v23_basic (gconstpointer data);
+void test_tracker_extract_mp3_id3v23_tcon (gconstpointer data);
+void test_tracker_extract_mp3_id3v23_tags (gconstpointer data);
+void test_tracker_extract_mp3_header_bitrate (gconstpointer data);
+void test_tracker_extract_mp3_header_bitrate_vbr (gconstpointer data);
+void test_tracker_extract_mp3_header_sampling (gconstpointer data);
+void test_tracker_extract_mp3_performance (gconstpointer data);
#endif
Modified: trunk/tests/tracker-extract/tracker-extract-testsuite-png.c
==============================================================================
--- trunk/tests/tracker-extract/tracker-extract-testsuite-png.c (original)
+++ trunk/tests/tracker-extract/tracker-extract-testsuite-png.c Wed Feb 18 12:00:47 2009
@@ -20,6 +20,7 @@
#include <glib.h>
+#include "tracker-extract-testsuite-png.h"
#include "tracker-extract-test-utils.h"
typedef struct {
@@ -48,33 +49,32 @@
{ NULL, NULL }
};
-void test_tracker_extract_png_basic_size(gconstpointer data)
+void
+test_tracker_extract_png_basic_size (gconstpointer data)
{
- const TrackerExtractData *extract = data;
guint i;
- for (i=0; data_basic_size[i].filename; i++) {
+ for (i = 0; data_basic_size[i].filename; i++) {
extract_file (data,
data_basic_size[i].filename,
data_basic_size[i].testdata);
}
}
-void test_tracker_extract_png_xmp_exif_orientation(gconstpointer data)
+void
+test_tracker_extract_png_xmp_exif_orientation (gconstpointer data)
{
- const TrackerExtractData *extract = data;
guint i;
- for (i=0; data_xmp_exif_orientation[i].filename; i++) {
+ for (i = 0; data_xmp_exif_orientation[i].filename; i++) {
extract_file (data,
data_xmp_exif_orientation[i].filename,
data_xmp_exif_orientation[i].testdata);
}
}
-void performance_tracker_extract_png(gconstpointer data)
+void
+test_tracker_extract_png_performance (gconstpointer data)
{
- const TrackerExtractData *extract = data;
-
performance_extract_files (data, "/png/perf_png_%d.png", 1000);
}
Modified: trunk/tests/tracker-extract/tracker-extract-testsuite-png.h
==============================================================================
--- trunk/tests/tracker-extract/tracker-extract-testsuite-png.h (original)
+++ trunk/tests/tracker-extract/tracker-extract-testsuite-png.h Wed Feb 18 12:00:47 2009
@@ -25,7 +25,6 @@
void test_tracker_extract_png_basic_size (gconstpointer data);
void test_tracker_extract_png_xmp_exif_orientation (gconstpointer data);
-
-void performance_tracker_extract_png (gconstpointer data);
+void test_tracker_extract_png_performance (gconstpointer data);
#endif
Modified: trunk/tests/tracker-extract/tracker-extract-testsuite-tiff.c
==============================================================================
--- trunk/tests/tracker-extract/tracker-extract-testsuite-tiff.c (original)
+++ trunk/tests/tracker-extract/tracker-extract-testsuite-tiff.c Wed Feb 18 12:00:47 2009
@@ -20,6 +20,7 @@
#include <glib.h>
+#include "tracker-extract-testsuite-tiff.h"
#include "tracker-extract-test-utils.h"
typedef struct {
@@ -53,24 +54,24 @@
{ NULL, NULL }
};
-void test_tracker_extract_tiff_basic_size(gconstpointer data)
+void
+test_tracker_extract_tiff_basic_size (gconstpointer data)
{
- const TrackerExtractData *extract = data;
guint i;
- for (i=0; data_basic_size[i].filename; i++) {
+ for (i = 0; data_basic_size[i].filename; i++) {
extract_file (data,
data_basic_size[i].filename,
data_basic_size[i].testdata);
}
}
-void test_tracker_extract_tiff_exif_size(gconstpointer data)
+void
+test_tracker_extract_tiff_exif_size (gconstpointer data)
{
- const TrackerExtractData *extract = data;
guint i;
- for (i=0; data_exif_size[i].filename; i++) {
+ for (i = 0; data_exif_size[i].filename; i++) {
g_debug ("Filename: %s", data_basic_size[i].filename);
extract_file (data,
@@ -79,21 +80,20 @@
}
}
-void test_tracker_extract_tiff_exif_orientation(gconstpointer data)
+void
+test_tracker_extract_tiff_exif_orientation (gconstpointer data)
{
- const TrackerExtractData *extract = data;
guint i;
- for (i=0; data_exif_orientation[i].filename; i++) {
+ for (i = 0; data_exif_orientation[i].filename; i++) {
extract_file (data,
data_exif_orientation[i].filename,
data_exif_orientation[i].testdata);
}
}
-void performance_tracker_extract_tiff(gconstpointer data)
+void
+test_tracker_extract_tiff_performance (gconstpointer data)
{
- const TrackerExtractData *extract = data;
-
performance_extract_files (data, "/tiff/perf_tiff_%d.tif", 1000);
}
Modified: trunk/tests/tracker-extract/tracker-extract-testsuite-tiff.h
==============================================================================
--- trunk/tests/tracker-extract/tracker-extract-testsuite-tiff.h (original)
+++ trunk/tests/tracker-extract/tracker-extract-testsuite-tiff.h Wed Feb 18 12:00:47 2009
@@ -26,8 +26,6 @@
void test_tracker_extract_tiff_basic_size (gconstpointer data);
void test_tracker_extract_tiff_exif_size (gconstpointer data);
void test_tracker_extract_tiff_exif_orientation (gconstpointer data);
-
-void performance_tracker_extract_tiff (gconstpointer data);
-
+void test_tracker_extract_tiff_performance (gconstpointer data);
#endif
Modified: trunk/tests/tracker-extract/tracker-extract-tiff-test.c
==============================================================================
--- trunk/tests/tracker-extract/tracker-extract-tiff-test.c (original)
+++ trunk/tests/tracker-extract/tracker-extract-tiff-test.c Wed Feb 18 12:00:47 2009
@@ -32,7 +32,6 @@
int
main (int argc, char **argv) {
- TrackerExtractData *data;
gint result;
g_type_init ();
Modified: trunk/tests/tracker-indexer/Makefile.am
==============================================================================
--- trunk/tests/tracker-indexer/Makefile.am (original)
+++ trunk/tests/tracker-indexer/Makefile.am Wed Feb 18 12:00:47 2009
@@ -14,12 +14,13 @@
-I$(top_srcdir)/src \
-I$(top_srcdir)/tests/common \
-I$(top_builddir)/src/tracker-indexer \
- $(DBUS_CFLAGS) \
- $(PANGO_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(GLIB2_CFLAGS) \
$(GMODULE_CFLAGS) \
$(GTHREAD_CFLAGS) \
- $(RAPTOR_CFLAGS) \
- $(GLIB2_CFLAGS)
+ $(PANGO_CFLAGS) \
+ $(DBUS_CFLAGS) \
+ $(RAPTOR_CFLAGS)
tracker_metadata_utils_SOURCES = \
$(top_srcdir)/src/tracker-indexer/tracker-dbus.c \
Modified: trunk/tests/trackerd/Makefile.am
==============================================================================
--- trunk/tests/trackerd/Makefile.am (original)
+++ trunk/tests/trackerd/Makefile.am Wed Feb 18 12:00:47 2009
@@ -9,12 +9,13 @@
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/trackerd \
-I$(top_srcdir)/tests/common \
+ $(WARN_CFLAGS) \
+ $(GLIB2_CFLAGS) \
$(GMODULE_CFLAGS) \
$(GTHREAD_CFLAGS) \
- $(GLIB2_CFLAGS) \
- $(QDBM_CFLAGS) \
$(GIO_GFLAGS) \
- $(DBUS_CFLAGS)
+ $(DBUS_CFLAGS) \
+ $(QDBM_CFLAGS)
if HAVE_XESAM_GLIB
Modified: trunk/tests/trackerd/xesam/Makefile.am
==============================================================================
--- trunk/tests/trackerd/xesam/Makefile.am (original)
+++ trunk/tests/trackerd/xesam/Makefile.am Wed Feb 18 12:00:47 2009
@@ -4,23 +4,24 @@
noinst_LTLIBRARIES = libxesamhelper.la
-INCLUDES = \
- -DG_LOG_DOMAIN=\"Tracker\" \
- -I$(top_srcdir)/src \
- $(GMODULE_CFLAGS) \
- $(GTHREAD_CFLAGS) \
- $(GLIB2_CFLAGS) \
+INCLUDES = \
+ -DG_LOG_DOMAIN=\"Tracker\" \
+ -I$(top_srcdir)/src \
+ $(WARN_CFLAGS) \
+ $(GLIB2_CFLAGS) \
+ $(GMODULE_CFLAGS) \
+ $(GTHREAD_CFLAGS) \
$(XESAM_GLIB_CFLAGS)
-libxesamhelper_la_SOURCES = \
- xesam-g-debug-private.h \
- xesam-g-utils.h \
- xesam-g-globals-private.h \
- gtestextensions.c \
- gtestextensions.h \
- xesam-g-test-query-builder.c \
- xesam-g-test-query-builder.h \
- xesam-g-testsearcher.c \
+libxesamhelper_la_SOURCES = \
+ xesam-g-debug-private.h \
+ xesam-g-utils.h \
+ xesam-g-globals-private.h \
+ gtestextensions.c \
+ gtestextensions.h \
+ xesam-g-test-query-builder.c \
+ xesam-g-test-query-builder.h \
+ xesam-g-testsearcher.c \
xesam-g-testsearcher.h
endif
Modified: trunk/utils/qdbm/Makefile.am
==============================================================================
--- trunk/utils/qdbm/Makefile.am (original)
+++ trunk/utils/qdbm/Makefile.am Wed Feb 18 12:00:47 2009
@@ -5,8 +5,9 @@
INCLUDES = \
-DG_LOG_DOMAIN=\"Tracker\" \
-I$(top_srcdir)/src \
- $(QDBM_CFLAGS) \
- $(GLIB2_CFLAGS)
+ $(WARN_CFLAGS) \
+ $(GLIB2_CFLAGS) \
+ $(QDBM_CFLAGS)
print_SOURCES = \
print-words.c
Modified: trunk/utils/tracker-fts/Makefile.am
==============================================================================
--- trunk/utils/tracker-fts/Makefile.am (original)
+++ trunk/utils/tracker-fts/Makefile.am Wed Feb 18 12:00:47 2009
@@ -5,11 +5,11 @@
INCLUDES = \
-DG_LOG_DOMAIN=\"Tracker\" \
-I$(top_srcdir)/src \
- $(SQLITE3_CFLAGS) \
+ $(WARN_CFLAGS) \
+ $(GLIB2_CFLAGS) \
$(GTHREAD_CFLAGS) \
$(PANGO_CFLAGS) \
- $(GLIB2_CFLAGS)
-
+ $(SQLITE3_CFLAGS)
tracker_fts_test_SOURCES = \
tracker-fts-test.c
@@ -21,4 +21,3 @@
$(PANGO_LIBS) \
$(GLIB2_LIBS) \
$(top_builddir)/src/libstemmer/libstemmer.la
-
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
