mousetweaks r204 - in trunk: . data help m4 src

[gerdk svn gnome org]

Author: gerdk
Date: Sun Jul  6 14:34:10 2008
New Revision: 204
URL: http://svn.gnome.org/viewvc/mousetweaks?rev=204&view=rev

Log:
2008-07-06 Gerd Kohlberger <gerdk svn gnome org>

	* help/Makefile.am: Add -Wno-portability to get rid of
	gnome-doc-utils warnings.
	* src/Makefile.am: Use GNOME_MAINTAINER_MODE_DEFINES.
	* data/Makefile.am: Don't try to install schemas.in files. Sigh.

	* configure.ac:
	* Makefile.am:
	Use m4 subdir for macros + bump intltool requirement to 0.40.0 +
	misc. nitpicking.



Added:
   trunk/m4/
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.ac
   trunk/data/Makefile.am
   trunk/help/Makefile.am
   trunk/src/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Sun Jul  6 14:34:10 2008
@@ -1,13 +1,14 @@
 SUBDIRS = src data pixmaps po help man
 
+ACLOCAL_AMFLAGS = -I m4
+
 EXTRA_DIST =			\
-	intltool-extract.in     \
-	intltool-merge.in       \
-	intltool-update.in	\
+	gnome-doc-utils.make	\
+	MAINTAINERS		\
 	COPYING.GPL		\
 	COPYING.FDL
 
 DISTCLEANFILES =		\
-	intltool-extract	\
-	intltool-merge		\
-	intltool-update
+	gnome-doc-utils.make	\
+	omf.make		\
+	xmldocs.make

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Jul  6 14:34:10 2008
@@ -6,6 +6,7 @@
 
 AC_CONFIG_SRCDIR([src])
 AC_CONFIG_HEADER([config.h])
+AC_CONFIG_MACRO_DIR([m4])
 AC_PREFIX_DEFAULT([/usr])
 
 AM_INIT_AUTOMAKE([1.9])
@@ -16,10 +17,13 @@
 AC_HEADER_STDC
 AC_C_CONST
 
+GNOME_COMMON_INIT
+GNOME_COMPILE_WARNINGS([maximum])
+GNOME_MAINTAINER_MODE_DEFINES
+
 dnl *** i18n ***
 
-AM_GLIB_GNU_GETTEXT
-IT_PROG_INTLTOOL([0.35.0])
+IT_PROG_INTLTOOL([0.40.0])
 
 GETTEXT_PACKAGE=mousetweaks
 AC_SUBST(GETTEXT_PACKAGE)
@@ -27,6 +31,8 @@
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext Package])
 AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS'])
 
+AM_GLIB_GNU_GETTEXT
+
 dnl *** documentation ***
 
 GNOME_DOC_INIT

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Sun Jul  6 14:34:10 2008
@@ -44,7 +44,7 @@
 	$(GCONFTOOL) --makefile-install-rule mousetweaks.schemas
 if BUILD_PCA
 	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
-	$(GCONFTOOL) --makefile-install-rule $(pca_schemas)
+	$(GCONFTOOL) --makefile-install-rule pointer-capture-applet.schemas
 endif
 
 uninstall-local:
@@ -52,7 +52,7 @@
 	$(GCONFTOOL) --makefile-uninstall-rule mousetweaks.schemas
 if BUILD_PCA
 	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
-	$(GCONFTOOL) --makefile-uninstall-rule $(pca_schemas)
+	$(GCONFTOOL) --makefile-uninstall-rule pointer-capture-applet.schemas
 endif
 endif
 

Modified: trunk/help/Makefile.am
==============================================================================
--- trunk/help/Makefile.am	(original)
+++ trunk/help/Makefile.am	Sun Jul  6 14:34:10 2008
@@ -1,6 +1,8 @@
-include $(top_srcdir)/gnome-doc-utils.make
+AUTOMAKE_OPTIONS = -Wno-portability
 dist-hook: doc-dist-hook
 
 DOC_MODULE = mousetweaks
 DOC_INCLUDES = legal.xml
 DOC_LINGUAS = el es oc sv
+
+include $(top_srcdir)/gnome-doc-utils.make

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sun Jul  6 14:34:10 2008
@@ -1,5 +1,6 @@
 INCLUDES =				     \
 	$(DEPENDENCIES_CFLAGS)		     \
+	$(DISABLE_DEPRECATED)		     \
 	-DDATADIR=\"$(datadir)/mousetweaks\" \
 	-DLOCALEDIR=\"$(datadir)/locale\"