soylent r150 - in trunk: . data libsoylent libsoylent/test m4 src

[svenp svn gnome org]

Author: svenp
Date: Thu Jun  5 11:36:01 2008
New Revision: 150
URL: http://svn.gnome.org/viewvc/soylent?rev=150&view=rev

Log:
applied patch to improve autofoo (see http://lists.codethink.co.uk/pipermail/soylent-devel/2008-June/000024.html) and removed .desktop files from distclean files

Added:
   trunk/m4/
Modified:
   trunk/   (props changed)
   trunk/Makefile.am
   trunk/configure.ac
   trunk/data/Makefile.am
   trunk/libsoylent/Makefile.am
   trunk/libsoylent/test/Makefile.am
   trunk/src/soylent-browser.c
   trunk/src/soylent.c

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Thu Jun  5 11:36:01 2008
@@ -1,13 +1,14 @@
+
+ACLOCAL_AMFLAGS = -I m4
+
 SUBDIRS = src data
+
 if ENABLE_LIBSOYLENT
 SUBDIRS += libsoylent
 endif
 
 EXTRA_DIST =
 
-# TODO: does this work?
-TESTS = test
-
 # Generate Changelog, copied from dbus-glib
 #
 

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Thu Jun  5 11:36:01 2008
@@ -14,8 +14,10 @@
 AC_INIT(soylent, soylent_version)
 
 AC_CONFIG_SRCDIR([src/soylent.c])
+AM_CONFIG_HEADER([config.h])
+AC_CONFIG_MACRO_DIR([m4])
 
-AM_INIT_AUTOMAKE([1.9])
+AM_INIT_AUTOMAKE([1.9 -Wall])
 
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
@@ -97,7 +99,8 @@
 
 # --- libsoylent ---
 
-AC_ARG_ENABLE(libsoylent, [  --enable-libsoylent     build libsoylent and libsoylent test-cases ])
+AC_ARG_ENABLE(libsoylent,
+	AS_HELP_STRING([--enable-libsoylent],[build libsoylent and libsoylent test-cases]),,)
 
 if test "x$enable_libsoylent" = "xyes"; then	
 
@@ -105,21 +108,22 @@
 	[
 		glib-2.0
 	])
-	AC_SUBST(LIBSOYLENT_CLFAGS)
-	AC_SUBST(LIBSOYLENT_LIBS)
 	
 	PKG_CHECK_MODULES(TEST,
 	[
 		glib-2.0
 	])
-	AC_SUBST(TEST_CLFAGS)
-	AC_SUBST(TEST_LIBS)
 	
-	AC_DEFINE(ENABLE_LIBSOYLENT)
+	AC_DEFINE(ENABLE_LIBSOYLENT, 1, [Build libsoylent])
 fi
 
 AM_CONDITIONAL(ENABLE_LIBSOYLENT, test "x$enable_libsoylent" = "xyes")
 
+AC_SUBST(LIBSOYLENT_CFLAGS)
+AC_SUBST(LIBSOYLENT_LIBS)
+AC_SUBST(TEST_CFLAGS)
+AC_SUBST(TEST_LIBS)
+
 # ------------------
 
 SOYLENT_MAJOR_MINOR=soylent_major_minor
@@ -146,7 +150,7 @@
 
 AC_SUBST(abs_top_srcdir)
 
-AC_CONFIG_FILES(
+AC_CONFIG_FILES([
   Makefile
   data/Makefile
   data/icons/Makefile
@@ -165,6 +169,6 @@
   src/Makefile
   libsoylent/Makefile
   libsoylent/test/Makefile
-)
+])
 
 AC_OUTPUT

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Thu Jun  5 11:36:01 2008
@@ -13,7 +13,10 @@
 glade_DATA = soylent.glade
 
 # TODO: uncomment the following line once we handle translations
+# in the meantime, provide the .desktop
 #EXTRA_DIST = $(DESKTOP_IN_FILES)
-EXTRA_DIST = $(glade_DATA)
+EXTRA_DIST = $(glade_DATA) \
+	$(DESKTOP_FILES)
 
-DISTCLEANFILES = $(DESKTOP_FILES)
+# TODO: at the moment removing .desktop files makes no sense
+#DISTCLEANFILES = $(DESKTOP_FILES)

Modified: trunk/libsoylent/Makefile.am
==============================================================================
--- trunk/libsoylent/Makefile.am	(original)
+++ trunk/libsoylent/Makefile.am	Thu Jun  5 11:36:01 2008
@@ -8,5 +8,5 @@
 	soylent-person.h \
 	soylent-person.c
 
-libsoylent_la_CFLAGS = ${LIBSOYLENT_CFLAGS} ${WARN_CFLAGS}
-libsoylent_la_LIBADD = ${LIBSOYLENT_LIBS}
+libsoylent_la_CFLAGS = $(LIBSOYLENT_CFLAGS) $(WARN_CFLAGS)
+libsoylent_la_LIBADD = $(LIBSOYLENT_LIBS)

Modified: trunk/libsoylent/test/Makefile.am
==============================================================================
--- trunk/libsoylent/test/Makefile.am	(original)
+++ trunk/libsoylent/test/Makefile.am	Thu Jun  5 11:36:01 2008
@@ -1,12 +1,14 @@
 #
 
+TESTS = test
+
 noinst_PROGRAMS = test
 
 test_SOURCES = \
 	test.h \
 	test.c
 
-test_CFLAGS = ${WARN_CFLAGS} ${TEST_CFLAGS}
-test_LDADD = ../libsoylent.la ${TEST_LIBS}
+test_CFLAGS = $(WARN_CFLAGS) $(TEST_CFLAGS)
+test_LDADD = $(top_builddir)/libsoylent/libsoylent.la $(TEST_LIBS)
 
-INCLUDES = -I${top_srcdir}
+AM_CPPFLAGS = -I$(top_srcdir)

Modified: trunk/src/soylent-browser.c
==============================================================================
--- trunk/src/soylent-browser.c	(original)
+++ trunk/src/soylent-browser.c	Thu Jun  5 11:36:01 2008
@@ -17,6 +17,8 @@
  *
  */
 
+#include <config.h>
+
 #include <libempathy/empathy-idle.h>
 #include <libempathy/empathy-status-presets.h>
 

Modified: trunk/src/soylent.c
==============================================================================
--- trunk/src/soylent.c	(original)
+++ trunk/src/soylent.c	Thu Jun  5 11:36:01 2008
@@ -22,6 +22,8 @@
  *
  */
 
+#include <config.h>
+
 #include "soylent.h"
 #include "soylent-browser.h"
 #include "soylent-utils.h"