[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r11799: link in the static libltdl l
From: |
Rob Savoye |
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r11799: link in the static libltdl library. |
Date: |
Sun, 24 Jan 2010 19:27:36 -0700 |
User-agent: |
Bazaar (2.0.2) |
------------------------------------------------------------
revno: 11799
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Sun 2010-01-24 19:27:36 -0700
message:
link in the static libltdl library.
modified:
libbase/Makefile.am
testsuite/libcore.all/Makefile.am
=== modified file 'libbase/Makefile.am'
--- a/libbase/Makefile.am 2010-01-21 00:27:19 +0000
+++ b/libbase/Makefile.am 2010-01-25 02:27:36 +0000
@@ -197,6 +197,14 @@
libgnashbase_la_LDFLAGS = -release $(VERSION)
libgnashbase_la_DEPENDENCIES = $(LIBLTDLLIB)
+if LIBLTDL2
+libgnashbase_la_LIBADD += $(top_builddir)/libltdl/libltdlc.la
+endif
+if LIBLTDL1
+libgnashbase_la_LIBADD += $(top_builddir)/libbase/libltdlc.la
+endif
+
+
if WIN32
libgnashbase_la_LDFLAGS += -no-undefined
libgnashbase_la_LIBADD += -lws2_32 -lwinmm
=== modified file 'testsuite/libcore.all/Makefile.am'
--- a/testsuite/libcore.all/Makefile.am 2010-01-22 16:18:18 +0000
+++ b/testsuite/libcore.all/Makefile.am 2010-01-25 02:27:36 +0000
@@ -35,10 +35,10 @@
$(BOOST_CFLAGS) \
$(NULL)
+# MatrixTest
check_PROGRAMS = \
StreamTest \
BitsReaderTest \
- MatrixTest \
PointTest \
EdgeTest \
PropertyListTest \
@@ -50,8 +50,7 @@
$(NULL)
if ENABLE_AVM2
-check_PROGRAMS += \
- CodeStreamTest
+check_PROGRAMS += CodeStreamTest
endif
CLEANFILES = \
@@ -62,89 +61,63 @@
gnash-dbg.log \
$(NULL)
-GNASH_LIBS = \
- $(top_builddir)/libbase/libgnashbase.la \
- $(top_builddir)/libamf/libgnashamf.la \
+AM_LDFLAGS = \
$(top_builddir)/libcore/libgnashcore.la \
$(top_builddir)/libmedia/libgnashmedia.la \
$(top_builddir)/libsound/libgnashsound.la \
- $(NULL)
+ $(top_builddir)/libbase/libgnashbase.la \
+ $(top_builddir)/libamf/libgnashamf.la
if LIBLTDL2
-GNASH_LIBS += $(top_builddir)/libltdl/libltdlc.la
+AM_LDFLAGS += $(top_builddir)/libltdl/libltdlc.la
endif
if LIBLTDL1
-GNASH_LIBS += $(top_builddir)/libbase/libltdlc.la
+AM_LDFLAGS += $(top_builddir)/libbase/libltdlc.la
endif
if USE_FFMPEG_ENGINE
- GNASH_LIBS += $(FFMPEG_LIBS)
+AM_LDFLAGS += $(FFMPEG_LIBS)
endif
BitsReaderTest_SOURCES = BitsReaderTest.cpp
-BitsReaderTest_LDADD = \
- $(GNASH_LIBS) \
- $(NULL)
+BitsReaderTest_LDADD = $(AM_LDFLAGS)
StreamTest_SOURCES = StreamTest.cpp
-StreamTest_LDADD = \
- $(GNASH_LIBS) \
- $(NULL)
+StreamTest_LDADD = $(AM_LDFLAGS)
MatrixTest_SOURCES = MatrixTest.cpp
-MatrixTest_LDADD = \
- $(GNASH_LIBS) \
- $(NULL)
+MatrixTest_LDADD = $(AM_LDFLAGS)
PointTest_SOURCES = PointTest.cpp
-PointTest_LDADD = \
- $(GNASH_LIBS) \
- $(NULL)
+PointTest_LDADD = $(AM_LDFLAGS)
EdgeTest_SOURCES = EdgeTest.cpp
-EdgeTest_LDADD = \
- $(GNASH_LIBS) \
- $(NULL)
+EdgeTest_LDADD = $(AM_LDFLAGS)
PropertyListTest_SOURCES = PropertyListTest.cpp
-PropertyListTest_LDADD = \
- $(GNASH_LIBS) \
- $(NULL)
+PropertyListTest_LDADD = $(AM_LDFLAGS)
PropFlagsTest_SOURCES = PropFlagsTest.cpp
-PropFlagsTest_LDADD = \
- $(GNASH_LIBS) \
- $(NULL)
+PropFlagsTest_LDADD = $(AM_LDFLAGS)
DisplayListTest_SOURCES = DisplayListTest.cpp
-DisplayListTest_LDADD = \
- $(GNASH_LIBS) \
- $(NULL)
+DisplayListTest_LDADD = $(AM_LDFLAGS)
AsValueTest_SOURCES = AsValueTest.cpp
-AsValueTest_LDADD = \
- $(GNASH_LIBS) \
- $(NULL)
+AsValueTest_LDADD = $(AM_LDFLAGS)
ClassSizes_SOURCES = ClassSizes.cpp
-ClassSizes_LDADD = \
- $(GNASH_LIBS) \
- $(NULL)
+ClassSizes_LDADD = $(AM_LDFLAGS)
SafeStackTest_SOURCES = SafeStackTest.cpp
-SafeStackTest_LDADD = \
- $(GNASH_LIBS) \
- $(NULL)
+SafeStackTest_LDADD = $(AM_LDFLAGS)
CodeStreamTest_SOURCES = CodeStreamTest.cpp
-CodeStreamTest_LDADD = \
- $(GNASH_LIBS) \
- $(NULL)
+CodeStreamTest_LDADD = $(AM_LDFLAGS)
+CodeStreamTest_DEPENDENCIES = $(AM_LDFLAGS)
TEST_DRIVERS = ../simple.exp
-TEST_CASES = \
- $(check_PROGRAMS) \
- $(NULL)
+TEST_CASES = $(check_PROGRAMS)
check-DEJAGNU: site-update $(TEST_CASES)
@runtest=$(RUNTEST); \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r11799: link in the static libltdl library.,
Rob Savoye <=