[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog plugin/Makefile.am
From: |
Dossy Shiobara |
Subject: |
[Gnash-commit] gnash ChangeLog plugin/Makefile.am |
Date: |
Sun, 30 Mar 2008 18:25:28 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Dossy Shiobara <dossy> 08/03/30 18:25:28
Modified files:
. : ChangeLog
plugin : Makefile.am
Log message:
Conditionally add directories to the SUBDIRS list. Build
plugin/mozilla-sdk separately, with its own Makefile.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6097&r2=1.6098
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/Makefile.am?cvsroot=gnash&r1=1.71&r2=1.72
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6097
retrieving revision 1.6098
diff -u -b -r1.6097 -r1.6098
--- ChangeLog 30 Mar 2008 18:24:55 -0000 1.6097
+++ ChangeLog 30 Mar 2008 18:25:27 -0000 1.6098
@@ -1,5 +1,11 @@
2008-03-30 Dossy Shiobara <address@hidden>
+ * plugin/Makefile.am: Conditionally add directories to the
+ SUBDIRS list. Build plugin/mozilla-sdk separately, with its
+ own Makefile.
+
+2008-03-30 Dossy Shiobara <address@hidden>
+
* libbase/getclocktime.hpp: Win32 has no "struct timespec" so we
provide one.
Index: plugin/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/Makefile.am,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- plugin/Makefile.am 18 Mar 2008 01:28:52 -0000 1.71
+++ plugin/Makefile.am 30 Mar 2008 18:25:28 -0000 1.72
@@ -18,7 +18,19 @@
AUTOMAKE_OPTIONS =
-SUBDIRS = klash
+SUBDIRS =
+
+if KPARTS
+SUBDIRS += klash
+endif
+
+if NSAPI
+SUBDIRS += mozilla-sdk
+
+if WIN32
+SUBDIRS += win32
+endif
+endif # NSAPI
# if DMALLOC
# MALL_CFLAGS = $(DMALLOC_CFLAGS)
@@ -76,6 +88,7 @@
mozilla-sdk/include/prwin16.h \
mozilla-sdk/include/obsolete/protypes.h
+if !WIN32
if NSAPI
plugin_LTLIBRARIES = libgnashplugin.la
@@ -93,7 +106,8 @@
else
libgnashplugin_la_LDFLAGS = -module -avoid-version -L$(plugindir)
endif
-endif
+endif # NSAPI
+endif # WIN32
test_perms:
@if test ! -w $(DESTDIR)$(plugindir); then \
@@ -123,3 +137,4 @@
$(RM) -f $(DESTDIR)$(plugindir)/libgnashplugin.so
.PHONY : install-plugins install-plugin test_perms
+
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog plugin/Makefile.am,
Dossy Shiobara <=