Author: drzeus
Date: 2005-04-06 12:22:12 +0200 (Wed, 06 Apr 2005)
New Revision: 442
Modified:
trunk/tests/Makefile.am
trunk/tests/mock-plugin/Makefile.am
Log:
Cleaner system for building the mockup plugin.
Libtool doesn't build a shared library without -rpath.
Modified: trunk/tests/Makefile.am
===================================================================
--- trunk/tests/Makefile.am 2005-04-05 15:56:56 UTC (rev 441)
+++ trunk/tests/Makefile.am 2005-04-06 10:22:12 UTC (rev 442)
@@ -1,16 +1,14 @@
## Process this file with automake to produce Makefile.in
+SUBDIRS = mock-plugin
+
AM_CFLAGS = @XML_CFLAGS@ -Wall -Werror @GCOV_CFLAGS@
INCLUDES = -I$(top_srcdir) @PACKAGE_CFLAGS@ -I$(top_srcdir)/osengine
EXTRA_DIST = \
data \
- support.h \
- mock-plugin/mock_sync.h \
- mock-plugin/mock_format.c \
- mock-plugin/mock_sync.c \
- mock-plugin/Makefile.am
+ support.h
if ENABLE_PROF
PROFTEST = coverage.sh
@@ -97,7 +95,3 @@
clean:
rm -rf coverage/*
- $(MAKE) clean -C mock-plugin
-
-all-local:
- $(MAKE) -C mock-plugin
Modified: trunk/tests/mock-plugin/Makefile.am
===================================================================
--- trunk/tests/mock-plugin/Makefile.am 2005-04-05 15:56:56 UTC (rev 441)
+++ trunk/tests/mock-plugin/Makefile.am 2005-04-06 10:22:12 UTC (rev 442)
@@ -1,10 +1,13 @@
INCLUDES = @PACKAGE_CFLAGS@
AM_CFLAGS = -Wall -Werror @XML_CFLAGS@
+AM_LDFLAGS = -rpath @libdir@
EXTRA_DIST = mock_sync.h
-lib_LTLIBRARIES = mock_sync.la mockformat.la
+if ENABLE_TESTS
+noinst_LTLIBRARIES = mock_sync.la mockformat.la
+endif
mock_sync_la_SOURCES = mock_sync.c
mock_sync_la_LDFLAGS = -avoid-version -export-dynamic -module
|
