[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r11966: add gnash libs to LDFLAGS so
From: |
Rob Savoye |
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r11966: add gnash libs to LDFLAGS so --as-needed works. |
Date: |
Wed, 24 Feb 2010 09:57:23 -0700 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 11966
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Wed 2010-02-24 09:57:23 -0700
message:
add gnash libs to LDFLAGS so --as-needed works.
modified:
backend/Makefile.am
libmedia/Makefile.am
libsound/Makefile.am
=== modified file 'backend/Makefile.am'
--- a/backend/Makefile.am 2010-01-01 17:48:26 +0000
+++ b/backend/Makefile.am 2010-02-24 16:57:23 +0000
@@ -54,6 +54,10 @@
$(CAIRO_CFLAGS) \
$(NULL)
+GNASH_LIBS = \
+ $(top_builddir)/libbase/libgnashbase.la \
+ $(top_builddir)/libcore/libgnashcore.la
+
noinst_HEADERS = \
Renderer.h \
Renderer_agg.h \
@@ -75,7 +79,7 @@
libgnashogl_la_SOURCES = Renderer_ogl.cpp PathParser.cpp
#libgnashogl_la_LDFLAGS = -module -avoid-version -no-undefined
libgnashogl_la_LDFLAGS =
-libgnashogl_la_LIBADD = $(OPENGL_LIBS)
+libgnashogl_la_LIBADD = $(OPENGL_LIBS) $(GNASH_LIBS)
endif
endif
@@ -85,7 +89,7 @@
pkglib_LTLIBRARIES += libgnashagg.la
libgnashagg_la_SOURCES = Renderer_agg.cpp
#libgnashagg_la_LDFLAGS = -module -avoid-version -no-undefined
-libgnashagg_la_LIBADD = $(AGG_LIBS)
+libgnashagg_la_LIBADD = $(AGG_LIBS) $(GNASH_LIBS)
endif
endif
@@ -95,7 +99,7 @@
# plugins_LTLIBRARIES += libgnashcairo.la
libgnashcairo_la_SOURCES = Renderer_cairo.cpp PathParser.cpp
#libgnashcairo_la_LDFLAGS = -module -avoid-version -no-undefined
-libgnashcairo_la_LIBADD = $(CAIRO_LIBS)
+libgnashcairo_la_LIBADD = $(CAIRO_LIBS) $(GNASH_LIBS)
endif
endif
=== modified file 'libmedia/Makefile.am'
--- a/libmedia/Makefile.am 2010-02-10 17:02:22 +0000
+++ b/libmedia/Makefile.am 2010-02-24 16:57:23 +0000
@@ -46,6 +46,7 @@
# include_HEADERS = log.h err.h proc.h serial.h xantrex.h outback.h
libgnashmedia_la_LIBADD = \
+ $(top_builddir)/libbase/libgnashbase.la \
$(PNG_LIBS) \
$(JPEG_LIBS) \
$(GIF_LIBS) \
@@ -172,7 +173,6 @@
if WIN32
libgnashmedia_la_LDFLAGS += -no-undefined
libgnashmedia_la_LIBADD += \
- $(top_builddir)/libbase/libgnashbase.la
-lintl
endif
=== modified file 'libsound/Makefile.am'
--- a/libsound/Makefile.am 2010-02-04 00:01:07 +0000
+++ b/libsound/Makefile.am 2010-02-24 16:57:23 +0000
@@ -30,6 +30,8 @@
$(NULL)
libgnashsound_la_LIBADD = \
+ $(top_builddir)/libbase/libgnashbase.la \
+ $(top_builddir)/libmedia/libgnashmedia.la \
$(BOOST_LIBS) \
$(PTHREAD_LIBS) \
$(SDL_LIBS) \
@@ -65,8 +67,6 @@
if WIN32
libgnashsound_la_LDFLAGS += -no-undefined
libgnashsound_la_LIBADD += \
- $(top_builddir)/libbase/libgnashbase.la \
- $(top_builddir)/libmedia/libgnashmedia.la \
-lintl
endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r11966: add gnash libs to LDFLAGS so --as-needed works.,
Rob Savoye <=