[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash libbase/Makefile.am ChangeLog
From: |
Rob Savoye |
Subject: |
[Gnash-commit] gnash libbase/Makefile.am ChangeLog |
Date: |
Thu, 17 May 2007 18:47:58 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 07/05/17 18:47:58
Modified files:
libbase : Makefile.am
. : ChangeLog
Log message:
* libbase/Makefile.am: Build libltdl optionally by duplicating
the
way libltdl/Makefile used to buuld this library.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/Makefile.am?cvsroot=gnash&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3254&r2=1.3255
Patches:
Index: libbase/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libbase/Makefile.am,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- libbase/Makefile.am 17 May 2007 16:53:25 -0000 1.68
+++ libbase/Makefile.am 17 May 2007 18:47:57 -0000 1.69
@@ -21,7 +21,12 @@
# this is where Gnash plugins get installed
pluginsdir = $(prefix)/lib/gnash/plugins
-lib_LTLIBRARIES = libltdl.la libgnashbase.la
+if CONVENIENCE_LTDL
+noinst_LTLIBRARIES = libltdlc.la
+endif
+CLEANFILES = libltdl.la libltdlc.la
+
+lib_LTLIBRARIES = libgnashbase.la
libltdl_la_CPPFLAGS = $(LTDLINCL)
@@ -72,7 +77,8 @@
endif
libltdl_la_SOURCES = $(top_srcdir)/libltdl/ltdl.c
-noinst_HEADERS = $(top_srcdir)/libltdl/ltdl.h
+libltdl_la_LDFLAGS = -no-undefined -version-info 4:4:1
+libltdl_la_LIBADD = $(LIBADD_DL)
libgnashbase_la_SOURCES = \
config.cpp \
@@ -104,7 +110,7 @@
LoadThread.cpp \
FLVParser.cpp
-noinst_HEADERS += \
+noinst_HEADERS = \
container.h \
demo.h \
dlmalloc.h \
@@ -160,7 +166,14 @@
endif
libgnashbase_la_LDFLAGS = -release $(VERSION)
-libltdl_la_LDFLAGS = -release $(VERSION)
+
+if INSTALL_LTDL
+include_HEADERS = $(top_srcdir)/libltdl/ltdl.h
+lib_LTLIBRARIES += libltdl.la
+else
+noinst_HEADERS += $(top_srcdir)/libltdl/ltdl.h
+endif
+
# 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.3254
retrieving revision 1.3255
diff -u -b -r1.3254 -r1.3255
--- ChangeLog 17 May 2007 18:27:59 -0000 1.3254
+++ ChangeLog 17 May 2007 18:47:58 -0000 1.3255
@@ -1,3 +1,8 @@
+2007-05-17 Rob Savoye <address@hidden>
+
+ * libbase/Makefile.am: Build libltdl optionally by duplicating the
+ way libltdl/Makefile used to buuld this library.
+
2007-05-17 Sandro Santilli <address@hidden>
* macros/: boost.m4, x11.m4: avoid explicit -L/usr/lib.