[maemo-commits] [maemo-commits] r16279 - in projects/haf/trunk/sapwood: . engine tests

[From: subversion at stage.maemo.org]

Author: herzi
Date: 2008-09-29 19:19:20 +0300 (Mon, 29 Sep 2008)
New Revision: 16279

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

	Create libsapwood-client.la to be shared between the engine and the
	test cases

	* engine/Makefile.am: create libsapwood-client.la
	* tests/Makefile.am: link against libsapwood-client.la


Modified: projects/haf/trunk/sapwood/ChangeLog
===================================================================
--- projects/haf/trunk/sapwood/ChangeLog	2008-09-29 16:19:08 UTC (rev 16278)
+++ projects/haf/trunk/sapwood/ChangeLog	2008-09-29 16:19:20 UTC (rev 16279)
@@ -1,5 +1,13 @@
 2008-09-29  Sven Herzberg  <sven at imendio.com>
 
+	Create libsapwood-client.la to be shared between the engine and the
+	test cases
+
+	* engine/Makefile.am: create libsapwood-client.la
+	* tests/Makefile.am: link against libsapwood-client.la
+
+2008-09-29  Sven Herzberg  <sven at imendio.com>
+
 	Moved the structure definition for the SapwoodPixmap into a private
 	header
 

Modified: projects/haf/trunk/sapwood/engine/Makefile.am
===================================================================
--- projects/haf/trunk/sapwood/engine/Makefile.am	2008-09-29 16:19:08 UTC (rev 16278)
+++ projects/haf/trunk/sapwood/engine/Makefile.am	2008-09-29 16:19:20 UTC (rev 16279)
@@ -6,11 +6,10 @@
 
 enginedir = $(libdir)/gtk-2.0/$(GTK_VERSION)/engines
 
-engine_LTLIBRARIES = libsapwood.la
+engine_LTLIBRARIES=libsapwood.la
+noinst_LTLIBRARIES=libsapwood-client.la
 
 libsapwood_la_SOURCES=\
-	sapwood-client.c \
-	sapwood-client.h \
 	sapwood-main.c \
 	sapwood-rc-style.c	\
 	sapwood-rc-style.h	\
@@ -23,10 +22,21 @@
 	sapwood-pixmap-priv.h \
 	$(NULL)
 
+libsapwood_client_la_SOURCES=\
+	sapwood-client.c \
+	sapwood-client.h \
+	$(NULL)
+
 libsapwood_la_LDFLAGS = -avoid-version -module -Wl,-z,defs
-libsapwood_la_LIBADD = $(GTK_LIBS) $(top_builddir)/protocol/libprotocol.la
+libsapwood_la_LIBADD=$(GTK_LIBS) \
+	libsapwood-client.la \
+	$(NULL)
 libsapwood_la_CFLAGS = -DG_LOG_DOMAIN=\"sapwood\" $(AM_CFLAGS)
 
+libsapwood_client_la_LIBADD=\
+	$(top_builddir)/protocol/libprotocol.la \
+	$(NULL)
+
 MAINTAINERCLEANFILES = Makefile.in
 CLEANFILES = actual-abi actual-abi2 expected-abi expected-abi2 optional-abi
 

Modified: projects/haf/trunk/sapwood/tests/Makefile.am
===================================================================
--- projects/haf/trunk/sapwood/tests/Makefile.am	2008-09-29 16:19:08 UTC (rev 16278)
+++ projects/haf/trunk/sapwood/tests/Makefile.am	2008-09-29 16:19:20 UTC (rev 16279)
@@ -1,7 +1,7 @@
 include $(top_srcdir)/Makefile.decl
 
 AM_CPPFLAGS=-I$(top_srcdir)/protocol $(GTK_CFLAGS)
-LDADD=$(top_builddir)/protocol/libprotocol.la
+LDADD=$(top_builddir)/engine/libsapwood-client.la
 
 TESTS_ENVIRONMENT=$(srcdir)/sapwood-wrapper