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

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    07/05/21 15:46:49

Modified files:
        libbase        : Makefile.am 
        .              : ChangeLog 

Log message:
                * libbase/Makefile.am: Build the installable libltdl before
                libgnashbase.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/Makefile.am?cvsroot=gnash&r1=1.71&r2=1.72
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3297&r2=1.3298

Patches:
Index: libbase/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libbase/Makefile.am,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- libbase/Makefile.am 21 May 2007 14:32:26 -0000      1.71
+++ libbase/Makefile.am 21 May 2007 15:46:48 -0000      1.72
@@ -21,7 +21,15 @@
 # this is where Gnash plugins get installed
 pluginsdir = $(prefix)/lib/gnash/plugins
 
-lib_LTLIBRARIES =  libgnashbase.la
+if INSTALL_LTDL
+include_HEADERS =  $(top_srcdir)/libltdl/ltdl.h
+LIBLTDLLIB = libltdl.la
+LIBLTDLHEAD =  $(top_srcdir)/libltdl/ltdl.h
+endif
+
+# 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
 
 libgnashbase_la_CPPFLAGS = -DPLUGINSDIR=\"$(pluginsdir)\" \
        -I.. -I$(srcdir) \
@@ -56,9 +64,10 @@
        $(Z_LIBS) \
        $(CURL_LIBS) \
        $(OPENGL_LIBS) \
+       $(LIBINTL) \
+       $(LIBLTDL) \
        $(BOOST_LIBS) \
        $(PTHREAD_LIBS) \
-       $(LIBINTL) \
        $(NULL)
 
 if HAS_SDL
@@ -99,6 +108,7 @@
        FLVParser.cpp
 
 noinst_HEADERS = \
+       $(LIBLTDLHEAD) \
        container.h \
        demo.h \
        dlmalloc.h \
@@ -163,13 +173,6 @@
 endif
 CLEANFILES = libltdl.la libltdlc.la
 
-if INSTALL_LTDL
-include_HEADERS =  $(top_srcdir)/libltdl/ltdl.h
-lib_LTLIBRARIES += libltdl.la
-else
-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)

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3297
retrieving revision 1.3298
diff -u -b -r1.3297 -r1.3298
--- ChangeLog   21 May 2007 15:29:45 -0000      1.3297
+++ ChangeLog   21 May 2007 15:46:48 -0000      1.3298
@@ -1,3 +1,8 @@
+2007-05-21  Rob Savoye  <address@hidden>
+
+       * libbase/Makefile.am: Build the installable libltdl before
+       libgnashbase.
+
 2007-05-21 Sandro Santilli <address@hidden>
 
        * testsuite/misc-ming.all/displaylist_depths_test9.c: add