[passepartout] build libppttest.la with libtool



commit b9c4062fbd20e00a3e0c08de6cba1f600d758b55
Author: Sven Herzberg <herzi lanedo com>
Date:   Thu Apr 30 10:42:58 2009 +0200

    build libppttest.la with libtool
    
    * src/testbed/Makefile.am: completely cleaned up
    * src/ps/Makefile.am,
    * src/util/Makefile.am: updated references to libppttest
---
 src/ps/Makefile.am      |    2 +-
 src/testbed/Makefile.am |   22 +++++++++++-----------
 src/util/Makefile.am    |    2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/ps/Makefile.am b/src/ps/Makefile.am
index 500e37a..d71d8d6 100644
--- a/src/ps/Makefile.am
+++ b/src/ps/Makefile.am
@@ -33,7 +33,7 @@ runtest_SOURCES = test_glyphlist.cc
 runtest_CPPFLAGS = -I$(top_srcdir)/src
 runtest_CPPFLAGS += $(GTKMM_CFLAGS) $(WARN_CFLAGS)
 runtest_LDADD=\
-	-L../testbed -lppttest \
+	../testbed/libppttest.la \
 	libps.la \
 	../util/libpptutil.la \
 	$(GTKMM_LIBS)
diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index b3717d1..8f70b0d 100644
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -1,11 +1,11 @@
-noinst_LIBRARIES = libppttest.a
-
-dist_noinst_HEADERS = testbed.hh
-
-libppttest_a_SOURCES = testbed.cc
-
-libppttest_a_CPPFLAGS = -I$(top_srcdir)/src
-
-# Just because Glib::Exception is stupid and doesn't inherit the standard
-# exception the testbed has to know about glib!
-libppttest_a_CPPFLAGS += $(GTKMM_CFLAGS) $(WARN_CFLAGS)
+noinst_LTLIBRARIES=libppttest.la
+
+libppttest_la_SOURCES=\
+	testbed.cc \
+	testbed.hh \
+	$(NULL)
+libppttest_la_CPPFLAGS=\
+	-I$(top_srcdir)/src \
+	$(GTKMM_CFLAGS) \
+	$(WARN_CFLAGS) \
+	$(NULL)
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 480a2a3..5cfc681 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -24,7 +24,7 @@ runtest_SOURCES = test_stringutil.cc test_valuunit.cc test_matrix.cc \
 	test_boundary.cc test_procio.cc test_cmdline.cc
 runtest_CPPFLAGS = -I$(top_srcdir)/src $(AM_CPPFLAGS)
 runtest_LDADD=\
-	-L../testbed -lppttest \
+	../testbed/libppttest.la \
 	libpptutil.la \
 	$(GTKMM_LIBS) \
 	$(GNOMECANVAS_LIBS) \



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]