CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/08/03 04:22:55
Modified files:
. : ChangeLog
plugin : Makefile.am
plugin/klash : Makefile.am
Log message:
* plugin/Makefile.am: don't build libgnashplugin if NSAPI
conditional is false.
* plugin/klash/Makefile.am: don't override the 'all' target.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3927&r2=1.3928
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/Makefile.am?cvsroot=gnash&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/Makefile.am?cvsroot=gnash&r1=1.33&r2=1.34
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3927
retrieving revision 1.3928
diff -u -b -r1.3927 -r1.3928
--- ChangeLog 3 Aug 2007 03:01:16 -0000 1.3927
+++ ChangeLog 3 Aug 2007 04:22:54 -0000 1.3928
@@ -1,3 +1,9 @@
+2007-08-02 Sandro Santilli <[EMAIL PROTECTED]>
+
+ * plugin/Makefile.am: don't build libgnashplugin if NSAPI
+ conditional is false.
+ * plugin/klash/Makefile.am: don't override the 'all' target.
+
2007-08-02 Rob Savoye <[EMAIL PROTECTED]>
* plugin/Makefile.am: Use BUILD_KDE_GUI instead of KLASH. Use
Index: plugin/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/Makefile.am,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- plugin/Makefile.am 3 Aug 2007 03:01:15 -0000 1.61
+++ plugin/Makefile.am 3 Aug 2007 04:22:55 -0000 1.62
@@ -15,7 +15,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-# $Id: Makefile.am,v 1.61 2007/08/03 03:01:15 rsavoye Exp $
+# $Id: Makefile.am,v 1.62 2007/08/03 04:22:55 strk Exp $
AUTOMAKE_OPTIONS =
@@ -53,8 +53,6 @@
# AM_CXXFLAGS = $(AM_CPPFLAGS)
-plugin_LTLIBRARIES = libgnashplugin.la
-
noinst_HEADERS = plugin.h \
mozilla-sdk/pluginbase.h \
mozilla-sdk/npplat.h \
@@ -80,6 +78,9 @@
mozilla-sdk/include/obsolete/protypes.h
if NSAPI
+
+plugin_LTLIBRARIES = libgnashplugin.la
+
libgnashplugin_la_SOURCES = plugin.cpp \
mozilla-sdk/npn_gate.cpp \
mozilla-sdk/npp_gate.cpp \
Index: plugin/klash/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/Makefile.am,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- plugin/klash/Makefile.am 3 Aug 2007 03:01:16 -0000 1.33
+++ plugin/klash/Makefile.am 3 Aug 2007 04:22:55 -0000 1.34
@@ -15,7 +15,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-# $Id: Makefile.am,v 1.33 2007/08/03 03:01:16 rsavoye Exp $
+# $Id: Makefile.am,v 1.34 2007/08/03 04:22:55 strk Exp $
AUTOMAKE_OPTIONS =
@@ -68,9 +68,6 @@
$(RM) -f $(DESTDIR)$(plugindir)/libklashpart.la
$(RM) -f $(DESTDIR)$(plugindir)/libklashpart.a
-else
-all:
- echo "Building klash is disabled"
endif
force:
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
