CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/08/10 04:36:13
Modified files:
. : ChangeLog
backend : Makefile.am
libamf : Makefile.am
libbase : Makefile.am
libgeometry : Makefile.am
plugin/mozilla-sdk: Makefile.am
server : Makefile.am
Log message:
Applied patch from bug #20665 by Alexander Sack <[EMAIL PROTECTED]>:
* backend/Makefile.am, libamf/Makefile.am, libbase/Makefile.am,
libgeometry/Makefile.am, plugin/mozilla-sdk/Makefile.am,
server/Makefile.am: use $pkglibdir for unversioned libs.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3980&r2=1.3981
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/Makefile.am?cvsroot=gnash&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/Makefile.am?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/Makefile.am?cvsroot=gnash&r1=1.77&r2=1.78
http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/Makefile.am?cvsroot=gnash&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/mozilla-sdk/Makefile.am?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Makefile.am?cvsroot=gnash&r1=1.120&r2=1.121
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3980
retrieving revision 1.3981
diff -u -b -r1.3980 -r1.3981
--- ChangeLog 10 Aug 2007 03:54:16 -0000 1.3980
+++ ChangeLog 10 Aug 2007 04:36:12 -0000 1.3981
@@ -1,3 +1,9 @@
+2007-08-10 Alexander Sack <[EMAIL PROTECTED]>
+
+ * backend/Makefile.am, libamf/Makefile.am, libbase/Makefile.am,
+ libgeometry/Makefile.am, plugin/mozilla-sdk/Makefile.am,
+ server/Makefile.am: use $pkglibdir for unversioned libs.
+
2007-08-09 Sandro Santilli <[EMAIL PROTECTED]>
* server/swf/tag_loaders.cpp (sound_stream_block_loader): don't
Index: backend/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/backend/Makefile.am,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- backend/Makefile.am 23 Jul 2007 22:07:58 -0000 1.58
+++ backend/Makefile.am 10 Aug 2007 04:36:13 -0000 1.59
@@ -78,7 +78,7 @@
# bin_PROGRAMS = gnash
-lib_LTLIBRARIES = libgnashbackend.la
+pkglib_LTLIBRARIES = libgnashbackend.la
# RENDER_SOURCES = render_handler_tri.cpp
SOUND_SOURCES =
Index: libamf/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libamf/Makefile.am,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- libamf/Makefile.am 30 Jul 2007 22:48:19 -0000 1.27
+++ libamf/Makefile.am 10 Aug 2007 04:36:13 -0000 1.28
@@ -15,11 +15,11 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-# $Id: Makefile.am,v 1.27 2007/07/30 22:48:19 strk Exp $
+# $Id: Makefile.am,v 1.28 2007/08/10 04:36:13 strk Exp $
AUTOMAKE_OPTIONS =
-lib_LTLIBRARIES = libgnashamf.la
+pkglib_LTLIBRARIES = libgnashamf.la
libgnashamf_la_SOURCES = amf.cpp rtmp.cpp
libgnashamf_la_LIBADD = $(top_builddir)/libbase/libgnashbase.la
Index: libbase/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libbase/Makefile.am,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- libbase/Makefile.am 20 Jul 2007 01:50:32 -0000 1.77
+++ libbase/Makefile.am 10 Aug 2007 04:36:13 -0000 1.78
@@ -29,7 +29,7 @@
# If we are using an installable libltdl, then it needs to be built
# before libgnash, as libgnash depends on it for extensions.
-lib_LTLIBRARIES = $(LIBLTDLLIB) libgnashbase.la
+pkglib_LTLIBRARIES = $(LIBLTDLLIB) libgnashbase.la
libgnashbase_la_CPPFLAGS = -DPLUGINSDIR=\"$(pluginsdir)\" \
-I.. -I$(srcdir) \
@@ -186,9 +186,9 @@
#noinst_PROGRAMS = demo
#demo_SOURCES = demo.cpp
#demo_LDADD = libgnashbase.la
-demo$(EXEEXT): demo.o $(lib_LTLIBRARIES)
+demo$(EXEEXT): demo.o $(pkglib_LTLIBRARIES)
# @$(RM) demo$(EXEEXT)
-# $(CXXLINK) $(AM_LDFLAGS) demo.o $(lib_LTLIBRARIES) $(LIBS)
+# $(CXXLINK) $(AM_LDFLAGS) demo.o $(pkglib_LTLIBRARIES) $(LIBS)
# Rebuild with GCC 4.x Mudflap support
mudflap:
Index: libgeometry/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libgeometry/Makefile.am,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- libgeometry/Makefile.am 1 Jul 2007 10:54:11 -0000 1.30
+++ libgeometry/Makefile.am 10 Aug 2007 04:36:13 -0000 1.31
@@ -18,7 +18,7 @@
#
#
-# $Id: Makefile.am,v 1.30 2007/07/01 10:54:11 bjacques Exp $
+# $Id: Makefile.am,v 1.31 2007/08/10 04:36:13 strk Exp $
AUTOMAKE_OPTIONS =
@@ -27,7 +27,7 @@
# AM_LDFLAGS = $(OPENGL_LIBNS) $(SDL_LIBS)
# noinst_LTLIBRARIES = libgeometry.la
-lib_LTLIBRARIES = libgnashgeo.la
+pkglib_LTLIBRARIES = libgnashgeo.la
# noinst_LIBRARIES = libgeometry.a
# These headers get installed
Index: plugin/mozilla-sdk/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/mozilla-sdk/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- plugin/mozilla-sdk/Makefile.am 1 Jul 2007 10:54:15 -0000 1.15
+++ plugin/mozilla-sdk/Makefile.am 10 Aug 2007 04:36:13 -0000 1.16
@@ -28,7 +28,7 @@
# AM_LDFLAGS = $(FIREFOX_LIBS)
# noinst_LTLIBRARIES = libmozsdk.la
-lib_LTLIBRARIES = libmozsdk.la
+pkglib_LTLIBRARIES = libmozsdk.la
noinst_HEADERS = npplat.h \
pluginbase.h \
Index: server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/Makefile.am,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -b -r1.120 -r1.121
--- server/Makefile.am 1 Jul 2007 10:54:18 -0000 1.120
+++ server/Makefile.am 10 Aug 2007 04:36:13 -0000 1.121
@@ -18,14 +18,14 @@
#
#
-# $Id: Makefile.am,v 1.120 2007/07/01 10:54:18 bjacques Exp $
+# $Id: Makefile.am,v 1.121 2007/08/10 04:36:13 strk Exp $
AUTOMAKE_OPTIONS =
SUBDIRS = asobj parser vm
# noinst_LTLIBRARIES = libserver.la
-lib_LTLIBRARIES = libgnashserver.la
+pkglib_LTLIBRARIES = libgnashserver.la
# noinst_SCRIPTS = gen-files.sh
# TODO: use a conditional to optionally link ?
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
