[maemo-commits] [maemo-commits] r16275 - in projects/haf/trunk/sapwood: . server tests

[From: subversion at stage.maemo.org]

Author: herzi
Date: 2008-09-29 16:54:11 +0300 (Mon, 29 Sep 2008)
New Revision: 16275

Modified:
   projects/haf/trunk/sapwood/ChangeLog
   projects/haf/trunk/sapwood/server/Makefile.am
   projects/haf/trunk/sapwood/tests/Makefile.am
Log:
2008-09-29  Sven Herzberg  <sven at imendio.com>

	Pass "make distcheck" again

	* server/Makefile.am: fixed the include path for the protocol header
	* tests/Makefile.am: fixed the reference to the wrapper script and
	distribute it with tarballs


Modified: projects/haf/trunk/sapwood/ChangeLog
===================================================================
--- projects/haf/trunk/sapwood/ChangeLog	2008-09-29 13:54:03 UTC (rev 16274)
+++ projects/haf/trunk/sapwood/ChangeLog	2008-09-29 13:54:11 UTC (rev 16275)
@@ -1,5 +1,13 @@
 2008-09-29  Sven Herzberg  <sven at imendio.com>
 
+	Pass "make distcheck" again
+
+	* server/Makefile.am: fixed the include path for the protocol header
+	* tests/Makefile.am: fixed the reference to the wrapper script and
+	distribute it with tarballs
+
+2008-09-29  Sven Herzberg  <sven at imendio.com>
+
 	Fix warnings about double-assignment of EXTRA_DIST, append instead
 
 	* demos/Makefile.am,

Modified: projects/haf/trunk/sapwood/server/Makefile.am
===================================================================
--- projects/haf/trunk/sapwood/server/Makefile.am	2008-09-29 13:54:03 UTC (rev 16274)
+++ projects/haf/trunk/sapwood/server/Makefile.am	2008-09-29 13:54:11 UTC (rev 16275)
@@ -2,7 +2,7 @@
 
 INCLUDES = \
     $(GDK_CFLAGS) \
-    -I../protocol \
+    -I$(top_srcdir)/protocol \
     -DSAPWOOD_SERVER=\"$(daemondir)/sapwood-server\"
 
 daemondir = $(libdir)/sapwood

Modified: projects/haf/trunk/sapwood/tests/Makefile.am
===================================================================
--- projects/haf/trunk/sapwood/tests/Makefile.am	2008-09-29 13:54:03 UTC (rev 16274)
+++ projects/haf/trunk/sapwood/tests/Makefile.am	2008-09-29 13:54:11 UTC (rev 16275)
@@ -3,7 +3,7 @@
 AM_CPPFLAGS=-I$(top_srcdir)/protocol $(GTK_CFLAGS)
 LDADD=$(top_builddir)/protocol/libprotocol.la
 
-TESTS_ENVIRONMENT=./sapwood-wrapper
+TESTS_ENVIRONMENT=$(srcdir)/sapwood-wrapper
 
 noinst_PROGRAMS = $(TEST_PROGS)
 
@@ -12,3 +12,6 @@
 double_free_CPPFLAGS=$(AM_CPPFLAGS) $(GIO_CFLAGS) -I$(top_srcdir)/engine
 double_free_LDADD=$(LDADD) $(GIO_LIBS)
 
+EXTRA_DIST+=\
+	sapwood-wrapper \
+	$(NULL)