tracker r2718 - in trunk: . src/libtracker src/libtracker-common src/libtracker-data src/libtracker-db src/tracker-applet src/tracker-indexer src/tracker-indexer/modules src/tracker-preferences

From: carlosg svn gnome org
To: svn-commits-list gnome org
Subject: tracker r2718 - in trunk: . src/libtracker src/libtracker-common src/libtracker-data src/libtracker-db src/tracker-applet src/tracker-indexer src/tracker-indexer/modules src/tracker-preferences
Date: Tue, 16 Dec 2008 17:49:18 +0000 (UTC)
Author: carlosg
Date: Tue Dec 16 17:49:18 2008
New Revision: 2718
URL: http://svn.gnome.org/viewvc/tracker?rev=2718&view=rev

Log:
2008-12-16  Carlos Garnacho  <carlos imendio com>

        * acinclude.m4: Add macro to enable compile warnings.
        * configure.ac: call it.
        * src/*/Makefile.am: Add WARN_CFLAGS to INCLUDES.

Modified:
   trunk/ChangeLog
   trunk/acinclude.m4
   trunk/configure.ac
   trunk/src/libtracker-common/Makefile.am
   trunk/src/libtracker-data/Makefile.am
   trunk/src/libtracker-db/Makefile.am
   trunk/src/libtracker/Makefile.am
   trunk/src/tracker-applet/Makefile.am
   trunk/src/tracker-indexer/modules/Makefile.am
   trunk/src/tracker-indexer/tracker-removable-device.c
   trunk/src/tracker-preferences/Makefile.am

Modified: trunk/acinclude.m4
==============================================================================
--- trunk/acinclude.m4	(original)
+++ trunk/acinclude.m4	Tue Dec 16 17:49:18 2008
@@ -90,3 +90,68 @@
     m4_ifvaln([$5],[else $5])dnl
   fi
 ]) dnl AX_COMPARE_VERSION
+
+dnl #########################################################################
+dnl Turn on the additional warnings last, so -Werror doesn't affect other tests.
+AC_DEFUN([IDT_COMPILE_WARNINGS],[
+   if test -f $srcdir/autogen.sh; then
+	default_compile_warnings="error"
+    else
+	default_compile_warnings="no"
+    fi
+
+    AC_ARG_WITH(compile-warnings,
+                AS_HELP_STRING([--with-compile-warnings=@<:@no/yes/error@:>@],
+                               [Compiler warnings]),
+                [enable_compile_warnings="$withval"],
+                [enable_compile_warnings="$default_compile_warnings"])
+
+    warnCFLAGS=
+    if test "x$GCC" != xyes; then
+	enable_compile_warnings=no
+    fi
+
+    warning_flags=
+    realsave_CFLAGS="$CFLAGS"
+
+    case "$enable_compile_warnings" in
+    no)
+	warning_flags=
+	;;
+    yes)
+	warning_flags="-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations"
+	;;
+    maximum|error)
+	warning_flags="-Wall -Wunused -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
+	CFLAGS="$warning_flags $CFLAGS"
+	for option in -Wno-sign-compare -Wno-pointer-sign; do
+		SAVE_CFLAGS="$CFLAGS"
+		CFLAGS="$CFLAGS $option"
+		AC_MSG_CHECKING([whether gcc understands $option])
+		AC_TRY_COMPILE([], [],
+			has_option=yes,
+			has_option=no,)
+		CFLAGS="$SAVE_CFLAGS"
+		AC_MSG_RESULT($has_option)
+		if test $has_option = yes; then
+		  warning_flags="$warning_flags $option"
+		fi
+		unset has_option
+		unset SAVE_CFLAGS
+	done
+	unset option
+	if test "$enable_compile_warnings" = "error" ; then
+	    warning_flags="$warning_flags -Werror"
+	fi
+	;;
+    *)
+	AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
+	;;
+    esac
+    CFLAGS="$realsave_CFLAGS"
+    AC_MSG_CHECKING(what warning flags to pass to the C compiler)
+    AC_MSG_RESULT($warning_flags)
+
+    WARN_CFLAGS="$warning_flags"
+    AC_SUBST(WARN_CFLAGS)
+]) dnl IDT_COMPILE_WARNINGS

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Dec 16 17:49:18 2008
@@ -40,6 +40,8 @@
 AM_INIT_AUTOMAKE(no-define)
 AM_CONFIG_HEADER(config.h)
 
+IDT_COMPILE_WARNINGS
+
 TRACKER_MAJOR_VERSION=tracker_major_version
 TRACKER_MINOR_VERSION=tracker_minor_version
 TRACKER_MICRO_VERSION=tracker_micro_version

Modified: trunk/src/libtracker-common/Makefile.am
==============================================================================
--- trunk/src/libtracker-common/Makefile.am	(original)
+++ trunk/src/libtracker-common/Makefile.am	Tue Dec 16 17:49:18 2008
@@ -5,6 +5,7 @@
 	-DG_LOG_DOMAIN=\"Tracker\"			\
 	-DTRACKER_COMPILATION				\
 	-I$(top_srcdir)/src				\
+	$(WARN_CFLAGS)							\
 	$(HAL_CFLAGS)					\
 	$(DBUS_CFLAGS)					\
 	$(UNAC_CFLAGS)					\

Modified: trunk/src/libtracker-data/Makefile.am
==============================================================================
--- trunk/src/libtracker-data/Makefile.am	(original)
+++ trunk/src/libtracker-data/Makefile.am	Tue Dec 16 17:49:18 2008
@@ -5,6 +5,7 @@
 	-DG_LOG_DOMAIN=\"Tracker\"					\
 	-DTRACKER_COMPILATION						\
 	-I$(top_srcdir)/src						\
+	$(WARN_CFLAGS)							\
 	$(DBUS_CFLAGS)							\
 	$(RAPTOR_CFLAGS)                                                \
 	$(GLIB2_CFLAGS)

Modified: trunk/src/libtracker-db/Makefile.am
==============================================================================
--- trunk/src/libtracker-db/Makefile.am	(original)
+++ trunk/src/libtracker-db/Makefile.am	Tue Dec 16 17:49:18 2008
@@ -5,6 +5,7 @@
 	-DG_LOG_DOMAIN=\"Tracker\"					\
 	-DTRACKER_COMPILATION						\
 	-I$(top_srcdir)/src						\
+	$(WARN_CFLAGS)							\
 	$(SQLITE3_CFLAGS)						\
 	$(QDBM_CFLAGS)							\
 	$(DBUS_CFLAGS)							\

Modified: trunk/src/libtracker/Makefile.am
==============================================================================
--- trunk/src/libtracker/Makefile.am	(original)
+++ trunk/src/libtracker/Makefile.am	Tue Dec 16 17:49:18 2008
@@ -4,6 +4,7 @@
 	-DLOCALEDIR=\""$(localedir)"\" 		\
 	-DG_LOG_DOMAIN=\"Tracker\"		\
 	-I$(top_srcdir)/src			\
+	$(WARN_CFLAGS)				\
 	$(GLIB2_CFLAGS)				\
 	$(DBUS_CFLAGS)			
 

Modified: trunk/src/tracker-applet/Makefile.am
==============================================================================
--- trunk/src/tracker-applet/Makefile.am	(original)
+++ trunk/src/tracker-applet/Makefile.am	Tue Dec 16 17:49:18 2008
@@ -5,6 +5,7 @@
 	-DLOCALEDIR=\""$(localedir)"\" 					\
 	-DTRACKER_COMPILATION						\
 	-I$(top_srcdir)/src						\
+	$(WARN_CFLAGS)							\
 	$(TRACKER_APPLET_CFLAGS)					\
 	$(LIBGLADE_CFLAGS)
 

Modified: trunk/src/tracker-indexer/modules/Makefile.am
==============================================================================
--- trunk/src/tracker-indexer/modules/Makefile.am	(original)
+++ trunk/src/tracker-indexer/modules/Makefile.am	Tue Dec 16 17:49:18 2008
@@ -4,7 +4,6 @@
 indexer_modulesdir = $(libdir)/tracker/indexer-modules
 
 INCLUDES =								\
-	-Wall								\
 	-DSHAREDIR=\""$(datadir)"\"					\
 	-DLIBDIR=\""$(libdir)"\"					\
 	-DLOCALEDIR=\""$(localedir)"\" 					\
@@ -13,6 +12,7 @@
 	-D_GNU_SOURCE							\
 	-DTRACKER_COMPILATION						\
 	-I$(top_srcdir)/src						\
+	$(WARN_CFLAGS)							\
 	$(GMODULE_CFLAGS)						\
 	$(GIO_CFLAGS)							\
 	$(GLIB2_CFLAGS)							\

Modified: trunk/src/tracker-indexer/tracker-removable-device.c
==============================================================================
--- trunk/src/tracker-indexer/tracker-removable-device.c	(original)
+++ trunk/src/tracker-indexer/tracker-removable-device.c	Tue Dec 16 17:49:18 2008
@@ -330,11 +330,8 @@
 
 	g_free (statement);
 }
-#endif
-
 
 /* TODO URI branch: path -> uri */
-#ifdef HAVE_RAPTOR
 static void
 foreach_in_metadata_set_metadata (TrackerField *field,
 				  gpointer      value,
@@ -354,7 +351,7 @@
 	}
 
 }
-#endif
+#endif /* HAVE_RAPTOR */
 
 void
 tracker_removable_device_add_metadata (TrackerIndexer        *indexer, 

Modified: trunk/src/tracker-preferences/Makefile.am
==============================================================================
--- trunk/src/tracker-preferences/Makefile.am	(original)
+++ trunk/src/tracker-preferences/Makefile.am	Tue Dec 16 17:49:18 2008
@@ -15,6 +15,7 @@
 	-DTRACKER_BINDIR=\""$(bindir)"\" 				\
 	-DTRACKER_LIBEXECDIR=\""$(libexecdir)"\" 			\
 	-DTRACKER_COMPILATION 						\
+	$(WARN_CFLAGS)							\
 	$(LIBGLADE_CFLAGS) 						\
 	$(GTK2_CFLAGS) 							\
 	$(DBUS_CFLAGS) 							\
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]