CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/08/03 04:37:44
Modified files:
. : ChangeLog Makefile.am
Log message:
* Makefile.am: add plugins info to 'dumpconfig' output,
simplify the SUBDIR construction (side-effect is we always
descend to most subdirs, even if there's nothing to do in
them)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3929&r2=1.3930
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.83&r2=1.84
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3929
retrieving revision 1.3930
diff -u -b -r1.3929 -r1.3930
--- ChangeLog 3 Aug 2007 04:27:39 -0000 1.3929
+++ ChangeLog 3 Aug 2007 04:37:43 -0000 1.3930
@@ -1,5 +1,8 @@
2007-08-02 Sandro Santilli <[EMAIL PROTECTED]>
+ * Makefile.am: add plugins info to 'dumpconfig' output,
+ simplify the SUBDIR construction (side-effect is we always
+ descend to most subdirs, even if there's nothing to do in them)
* plugin/Makefile.am: don't build libgnashplugin if NSAPI
conditional is false; always descend to klash/ subdir
and let the inner Makefile.am handle conditionals for KPARTS.
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- Makefile.am 3 Aug 2007 03:01:15 -0000 1.83
+++ Makefile.am 3 Aug 2007 04:37:44 -0000 1.84
@@ -15,7 +15,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-# $Id: Makefile.am,v 1.83 2007/08/03 03:01:15 rsavoye Exp $
+# $Id: Makefile.am,v 1.84 2007/08/03 04:37:44 strk Exp $
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = 1.6.0
@@ -30,33 +30,22 @@
backend \
utilities \
gui \
+ extensions \
+ plugin \
testsuite \
po \
+ doc \
$(NULL)
-if NSAPI
-PLUGIN_DIRS = plugin
-endif
-
-if KPARTS
-PLUGIN_DIRS = plugin
-endif
-
-if DOCBOOK
-DOC_DIRS = doc
-endif
-
if CYGNAL
CYGNAL_DIRS = cygnal
endif
-EXTEND_DIRS = extensions
-
-SUBDIRS = $(STD_DIRS) $(DOC_DIRS) $(PLUGIN_DIRS) $(EXTEND_DIRS)
$(CYGNAL_DIRS)
+SUBDIRS = $(STD_DIRS) $(CYGNAL_DIRS)
man_MANS = doc/gnash.1
-DIST_SUBDIRS = $(STD_DIRS) doc plugin cygnal extensions
+DIST_SUBDIRS = $(STD_DIRS) cygnal
EXTRA_DIST = config.rpath $(man_MANS) macros/incllist macros/libslist
@@ -210,31 +199,44 @@
@echo " AGG_CFLAGS is $(AGG_CFLAGS)"
@echo " AGG_LIBS is $(AGG_LIBS)"
endif
+ @echo ""
@echo "A blank value for CFLAGS means the header is installed in the"
@echo "default system header location. All the LIBS should have a"
@echo "legit value"
@echo ""
@echo "Configurable options are:"
- @echo "Media handler: $(MEDIA_CONFIG)"
- @echo "Renderer engine: $(RENDERER_CONFIG)"
+ @echo " Media handler: $(MEDIA_CONFIG)"
+ @echo " Renderer engine: $(RENDERER_CONFIG)"
if BUILD_GTK_GUI
- @echo "Supported GUI: GTK"
+ @echo " Supported GUI: GTK"
endif
if BUILD_KDE_GUI
- @echo "Supported GUI: KDE"
+ @echo " Supported GUI: KDE"
endif
if BUILD_SDL_GUI
- @echo "Supported GUI: SDL"
+ @echo " Supported GUI: SDL"
endif
if BUILD_FLTK_GUI
- @echo "Supported GUI: FLTK"
+ @echo " Supported GUI: FLTK"
endif
if BUILD_AQUA_GUI
- @echo "Supported GUI: AQUA"
+ @echo " Supported GUI: AQUA"
endif
if BUILD_FB_GUI
- @echo "Supported GUI: FB"
+ @echo " Supported GUI: FB"
+endif
+
+if KPARTS
+ @echo " Konqueror (kparts) plugin enabled"
+else
+ @echo " Konqueror (kparts) plugin disabled"
+endif
+
+if NSAPI
+ @echo " Firefox (NSAPI) plugin enabled"
+else
+ @echo " Firefox (NSAPI) plugin disabled"
endif
check: check-recursive anal
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
