[Gnash-commit] gnash libbase/Makefile.am ChangeLog

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    07/05/18 14:04:06

Modified files:
        libbase        : Makefile.am 
        .              : ChangeLog 

Log message:
                * libbase/Makefile.am: Add makefile rules from libltd.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/Makefile.am?cvsroot=gnash&r1=1.69&r2=1.70
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3269&r2=1.3270

Patches:
Index: libbase/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libbase/Makefile.am,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- libbase/Makefile.am 17 May 2007 18:47:57 -0000      1.69
+++ libbase/Makefile.am 18 May 2007 14:04:05 -0000      1.70
@@ -21,15 +21,8 @@
 # this is where Gnash plugins get installed
 pluginsdir = $(prefix)/lib/gnash/plugins
 
-if CONVENIENCE_LTDL
-noinst_LTLIBRARIES = libltdlc.la
-endif
-CLEANFILES = libltdl.la libltdlc.la
-
 lib_LTLIBRARIES =  libgnashbase.la
 
-libltdl_la_CPPFLAGS = $(LTDLINCL)
-
 libgnashbase_la_CPPFLAGS = -DPLUGINSDIR=\"$(pluginsdir)\" \
        -I.. -I$(srcdir) \
        -I$(top_srcdir) \
@@ -76,10 +69,6 @@
 EXTRA_DIST += tu_file_SDL.cpp
 endif
 
-libltdl_la_SOURCES = $(top_srcdir)/libltdl/ltdl.c
-libltdl_la_LDFLAGS = -no-undefined -version-info 4:4:1
-libltdl_la_LIBADD = $(LIBADD_DL)
-
 libgnashbase_la_SOURCES = \
        config.cpp \
        container.cpp \
@@ -151,6 +140,7 @@
        FLVParser.h
 
 
+
 if USE_SOUND_GST
 libgnashbase_la_SOURCES += gstgnashsrc.c embedVideoDecoderGst.cpp
 noinst_HEADERS += gstgnashsrc.h embedVideoDecoderGst.h
@@ -167,6 +157,13 @@
 
 libgnashbase_la_LDFLAGS = -release $(VERSION)
 
+libltdlc_la_CPPFLAGS = $(LTDLINCL)
+if CONVENIENCE_LTDL
+noinst_LTLIBRARIES = libltdlc.la
+libltdlc_la_SOURCES = $(top_srcdir)/libltdl/ltdl.c
+endif
+CLEANFILES = libltdl.la libltdlc.la
+
 if INSTALL_LTDL
 include_HEADERS =  $(top_srcdir)/libltdl/ltdl.h
 lib_LTLIBRARIES += libltdl.la
@@ -174,6 +171,9 @@
 noinst_HEADERS +=  $(top_srcdir)/libltdl/ltdl.h
 endif
 
+libltdl_la_SOURCES = $(top_srcdir)/libltdl/ltdl.c
+libltdl_la_LDFLAGS = -no-undefined -version-info 4:4:1
+libltdl_la_LIBADD = $(LIBADD_DL)
 
 # We use our own rule to build the demo so it isn't built by default.
 # Since it doesn't contain a main() routine, we only try to compile,

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3269
retrieving revision 1.3270
diff -u -b -r1.3269 -r1.3270
--- ChangeLog   18 May 2007 13:17:53 -0000      1.3269
+++ ChangeLog   18 May 2007 14:04:05 -0000      1.3270
@@ -1,3 +1,7 @@
+2007-05-18  Rob Savoye  <address@hidden>
+
+       * libbase/Makefile.am: Add makefile rules from libltd.
+
 2007-05-18 Sandro Santilli <address@hidden>
 
        * testsuite/misc-ming.all/: Makefile.am, displaylist_depths_test10.c: