[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ./ChangeLog backend/Makefile.am libbase/M...
From: |
Rob Savoye |
Subject: |
[Gnash-commit] gnash ./ChangeLog backend/Makefile.am libbase/M... |
Date: |
Mon, 23 Jan 2006 21:50:21 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch:
Changes by: Rob Savoye <address@hidden> 06/01/23 21:50:21
Modified files:
. : ChangeLog
backend : Makefile.am
libbase : Makefile.am
plugin : Makefile.am
server : Makefile.am
plugin/mozilla-sdk: Makefile.am
Log message:
* server/Makefile.am: Don't install the libraries.
* backend/Makefile.am: Don't install the libraries.
* plugin/Makefile.am: Don't install the
libraries. Pass-no-undefined to libtool so all symbols are
resolved in the final shared library.
* plugin/mozilla-sdk/Makefile.am: Don't install the libraries.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.36&tr2=1.37&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/backend/Makefile.am.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/libbase/Makefile.am.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/Makefile.am.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/Makefile.am.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/plugin/mozilla-sdk/Makefile.am.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.36 gnash/ChangeLog:1.37
--- gnash/ChangeLog:1.36 Mon Jan 23 20:37:19 2006
+++ gnash/ChangeLog Mon Jan 23 21:50:21 2006
@@ -1,5 +1,13 @@
2006-01-23 Rob Savoye <address@hidden>
+
+ * server/Makefile.am: Don't install the libraries.
+ * backend/Makefile.am: Don't install the libraries.
+ * plugin/Makefile.am: Don't install the
+ libraries. Pass-no-undefined to libtool so all symbols are
+ resolved in the final shared library.
+ * plugin/mozilla-sdk/Makefile.am: Don't install the libraries.
+
* configure.ac: Use new DMALLOC test.
* macros/dmalloc.m4: New macro for dmalloc support.
* utilities/Makefile.am: Add support for dmalloc.
Index: gnash/backend/Makefile.am
diff -u gnash/backend/Makefile.am:1.8 gnash/backend/Makefile.am:1.9
--- gnash/backend/Makefile.am:1.8 Mon Jan 23 20:37:19 2006
+++ gnash/backend/Makefile.am Mon Jan 23 21:50:21 2006
@@ -57,7 +57,7 @@
bin_PROGRAMS = gnash
-lib_LTLIBRARIES = libgbackend.la
+noinst_LTLIBRARIES = libgbackend.la
libgbackend_la_SOURCES = \
render_handler_ogl.cpp \
Index: gnash/libbase/Makefile.am
diff -u gnash/libbase/Makefile.am:1.7 gnash/libbase/Makefile.am:1.8
--- gnash/libbase/Makefile.am:1.7 Fri Jan 20 19:25:17 2006
+++ gnash/libbase/Makefile.am Mon Jan 23 21:50:21 2006
@@ -23,7 +23,7 @@
AM_CPPFLAGS = -Wall
# AM_LDFLAGS = $(OPENGL_LIBS) $(GLU_LIBS) $(SDL_LIBS)
-lib_LTLIBRARIES = libbase.la
+noinst_LTLIBRARIES = libbase.la
# These headers get installed
# include_HEADERS = log.h err.h proc.h serial.h xantrex.h outback.h
Index: gnash/plugin/Makefile.am
diff -u gnash/plugin/Makefile.am:1.5 gnash/plugin/Makefile.am:1.6
--- gnash/plugin/Makefile.am:1.5 Mon Jan 23 20:37:19 2006
+++ gnash/plugin/Makefile.am Mon Jan 23 21:50:21 2006
@@ -71,7 +71,7 @@
plugin_LTLIBRARIES = libgnash.la
-noinst_HEADERS = plugin.h ogl_sdl.h
+noinst_HEADERS = plugin.h
libgnash_la_SOURCES = plugin.cpp
libgnash_la_LIBADD = $(AM_LDFLAGS) \
@@ -82,6 +82,7 @@
../backend/libgbackend.la
libgnash_la_DEPENDENCIES = mozilla-sdk/libmozsdk.la
+libgnash_la_LDFLAGS = -module -avoid-version -no-undefined
install-pluginLTLIBRARIES: $(plugin_LIBRARIES)
cp .libs/libgnash.so $(plugindir)/libgnash.so
Index: gnash/plugin/mozilla-sdk/Makefile.am
diff -u gnash/plugin/mozilla-sdk/Makefile.am:1.3
gnash/plugin/mozilla-sdk/Makefile.am:1.4
--- gnash/plugin/mozilla-sdk/Makefile.am:1.3 Thu Jan 19 23:50:11 2006
+++ gnash/plugin/mozilla-sdk/Makefile.am Mon Jan 23 21:50:21 2006
@@ -19,8 +19,6 @@
AUTOMAKE_OPTIONS = dejagnu
-sdkdir = $(FIREFOX_PLUGINS)
-
INCLUDES = -I.. \
-I$(srcdir) \
$(FIREFOX_CFLAGS)
@@ -29,15 +27,9 @@
AM_CPPFLAGS = -Wall -DPLUGIN_TRACE -DXP_UNIX $(FIREFOX_DEFS)
# AM_LDFLAGS = $(FIREFOX_LIBS)
-sdk_LTLIBRARIES = libmozsdk.la
+noinst_LTLIBRARIES = libmozsdk.la
noinst_HEADERS = npplat.h pluginbase.h
libmozsdk_la_SOURCES = \
npn_gate.cpp \
npp_gate.cpp \
np_entry.cpp
-
-install-sdkLTLIBRARIES: $(sdk_LIBRARIES)
- cp .libs/libmozsdk.so $(sdkdir)/libgnash.so
-
-uninstall-sdkLTLIBRARIES: $(sdk_LIBRARIES)
- rm -f $(sdkdir)/libmozsdk.so
Index: gnash/server/Makefile.am
diff -u gnash/server/Makefile.am:1.8 gnash/server/Makefile.am:1.9
--- gnash/server/Makefile.am:1.8 Mon Jan 23 20:37:19 2006
+++ gnash/server/Makefile.am Mon Jan 23 21:50:21 2006
@@ -22,7 +22,7 @@
AM_CXXFLAGS = $(CFLAGS) $(SDL_CFLAGS) $(SDL_MIXER_CFLAGS) $(INCLUDES)
AM_CPPFLAGS = -Wall
-lib_LTLIBRARIES = libserver.la
+noinst_LTLIBRARIES = libserver.la
# Only enable if we're configured with --enable-mp3
INCLUDES = -I.. \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ./ChangeLog backend/Makefile.am libbase/M...,
Rob Savoye <=