[Gnash-commit] gnash ChangeLog plugin/win32/.cvsignore plugin/...

[Dossy Shiobara]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Dossy Shiobara <dossy>  08/03/30 18:28:41

Modified files:
        .              : ChangeLog 
Added files:
        plugin/win32   : .cvsignore Makefile.am 

Log message:
        Include Win32 npgnash.dll in Gnash build process.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6099&r2=1.6100
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/win32/.cvsignore?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/win32/Makefile.am?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6099
retrieving revision 1.6100
diff -u -b -r1.6099 -r1.6100
--- ChangeLog   30 Mar 2008 18:26:25 -0000      1.6099
+++ ChangeLog   30 Mar 2008 18:28:41 -0000      1.6100
@@ -1,5 +1,10 @@
 2008-03-30  Dossy Shiobara <address@hidden>
 
+       * plugin/win32/.cvsignore, plugin/win32/Makefile.am: Include
+         Win32 npgnash.dll in Gnash build process.
+
+2008-03-30  Dossy Shiobara <address@hidden>
+
        * plugin/mozilla-sdk/np_entry.cpp: Fix symbols so they're
          exported correctly on Win32.
 

Index: plugin/win32/.cvsignore
===================================================================
RCS file: plugin/win32/.cvsignore
diff -N plugin/win32/.cvsignore
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ plugin/win32/.cvsignore     30 Mar 2008 18:28:41 -0000      1.1
@@ -0,0 +1,7 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.la
+*.lo
+*.dll

Index: plugin/win32/Makefile.am
===================================================================
RCS file: plugin/win32/Makefile.am
diff -N plugin/win32/Makefile.am
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ plugin/win32/Makefile.am    30 Mar 2008 18:28:41 -0000      1.1
@@ -0,0 +1,94 @@
+## Process this file with automake to generate Makefile.in
+# 
+#   Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+AUTOMAKE_OPTIONS = 
+
+if NSAPI
+if WIN32
+
+AM_CPPFLAGS = \
+       -I$(top_srcdir) \
+       -I$(top_srcdir)/libbase \
+       -I$(top_srcdir)/libgeometry \
+       -I$(top_srcdir)/libmedia \
+       -I$(top_srcdir)/libmedia/ffmpeg \
+       -I$(top_srcdir)/backend \
+       -I$(top_srcdir)/server \
+       -I$(top_srcdir)/server/parser \
+       -I$(top_srcdir)/server/vm \
+       -I$(top_srcdir)/gui \
+       -I$(top_srcdir)/plugin/mozilla-sdk \
+       -I$(top_srcdir)/plugin/mozilla-sdk/include \
+       $(AGG_CFLAGS) \
+       $(BOOST_CFLAGS) \
+       $(FFMPEG_CFLAGS) \
+       $(SDL_CFLAGS) \
+       $(NULL)
+
+AM_LDFLAGS = \
+       $(top_builddir)/libbase/libgnashbase.la \
+       $(top_builddir)/libmedia/libgnashmedia.la \
+       $(top_builddir)/libamf/libgnashamf.la \
+       $(top_builddir)/backend/libgnashagg.la \
+       $(top_builddir)/server/libgnashserver.la \
+       $(top_builddir)/plugin/mozilla-sdk/libmozsdk.la \
+       $(AGG_LIBS) \
+       $(BOOST_LIBS) \
+       $(CURL_LIBS) \
+       $(EXPAT_LIBS) \
+       $(FFMPEG_LIBS) \
+       $(JPEG_LIBS) \
+       $(LIBXML_LIBS) \
+       $(PNG_LIBS) \
+       $(SDL_LIBS) \
+       $(NSPR_LIBS) \
+       $(NULL)
+
+plugindir   = $(FIREFOX_PLUGINS)
+
+plugin_LTLIBRARIES = npgnash.la
+
+npgnash.la: $(npgnash_la_OBJECTS) $(npgnash_la_DEPENDENCIES)
+       $(CXXLINK) $(am_npgnash_la_rpath) $(npgnash_la_LDFLAGS) 
$(npgnash_la_OBJECTS) $(npgnash_la_LIBADD) $(LIBS) && touch $@
+
+npgnash_la_SOURCES = npgnash.c plugin.cpp
+EXTRA_npgnash_la_SOURCES = npgnash.rc
+npgnash_la_LDFLAGS = -module -shared -no-undefined -version-info 0:0:0 \
+       -o npgnash.dll -Wl,--enable-stdcall-fixup npgnash.def \
+       $(AM_LDFLAGS)
+npgnash_la_LIBADD = npgnashrc.o
+
+npgnashrc.o: npgnash.rc
+       $(WINDRES) -o $@ $<
+
+install-pluginLIBRARIES: $(plugin_LIBRARIES)
+       @echo "Nothing to install here now."
+       @echo "Use \"make install-plugin\" to install the npgnash plugin to 
$(DESTDIR)$(plugindir)."
+
+install-plugin install-plugins: $(plugin_LIBRARIES)
+       test -d $(DESTDIR)$(plugindir) || $(mkinstalldirs) 
$(DESTDIR)$(plugindir)
+       $(INSTALL) $(INSTALL_STRIP_FLAG) $(plugin_LIBRARIES) 
$(DESTDIR)$(plugindir)
+
+uninstall-pluginLIBRARIES: $(plugin_LIBRARIES)
+       $(RM) -f $(DESTDIR)$(plugindir)/npgnash.dll
+
+endif # WIN32
+endif # NSAPI
+
+force:
+
+.PHONY : install-plugins install-plugin uninstall-plugin