[Gnash-commit] gnash ChangeLog Makefile.am

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/11/21 19:23:57

Modified files:
        .              : ChangeLog Makefile.am 

Log message:
        * Makefile.am: fix 'make dump' output.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1692&r2=1.1693
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.48&r2=1.49

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1692
retrieving revision 1.1693
diff -u -b -r1.1692 -r1.1693
--- ChangeLog   21 Nov 2006 17:20:02 -0000      1.1692
+++ ChangeLog   21 Nov 2006 19:23:57 -0000      1.1693
@@ -1,5 +1,6 @@
 2006-11-21 Sandro Santilli <address@hidden>
 
+       * Makefile.am: fix 'make dump' output.
        * testsuite/actionscript.all/Makefile.am: fixed dependencies
          for explicitly generated SWF  (ASTESTS_OUT).
        * configure.ac: suggest 'texinfo' package for building dox

Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- Makefile.am 11 Nov 2006 17:05:25 -0000      1.48
+++ Makefile.am 21 Nov 2006 19:23:57 -0000      1.49
@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # 
 
-# $Id: Makefile.am,v 1.48 2006/11/11 17:05:25 strk Exp $
+# $Id: Makefile.am,v 1.49 2006/11/21 19:23:57 strk Exp $
 
 ## Process this file with automake to produce Makefile.in
 AUTOMAKE_OPTIONS = 1.6.0
@@ -93,6 +93,47 @@
        @echo "Rechecking with GCC Mudflap support"
        $(MAKE) check CXXFLAGS="$(CXXFLAGS) -fmudflap" LDFLAGS="$(LDFLAGS) 
-lmudflap"
 
+# Set a few variables to what features we selected so we cab dump it with the
+# test of the config
+if USE_SOUND_SDL
+  SOUND_OPT=sdl
+else
+  SOUND_OPT=none
+endif
+if USE_SOUND_GST
+  SOUND_OPT=gst
+endif
+if USE_MAD_ENGINE
+  ENGINE_OPT=mad
+else
+  ENGINE_OPT=none
+endif
+if USE_FFMPEG_ENGINE
+  ENGINE_OPT=ffmpeg
+endif
+
+if USE_GUI_GTK
+  GUI_OPT=gtk2
+endif
+if USE_GUI_SDL
+  GUI_OPT=sdl
+endif
+if USE_GUI_KDE
+  GUI_OPT=kde
+endif
+if USE_GUI_FLTK
+  GUI_OPT=fltk2
+endif
+if USE_RENDERER_OPENGL
+  RENDER_OPT=opengl
+endif
+if USE_RENDERER_CAIRO
+  RENDER_OPT=cairo
+endif
+if USE_RENDERER_AGG
+  RENDER_OPT=agg
+endif
+
 dumpconfig:
        @uname -a
        $(CC) -v
@@ -153,7 +194,7 @@
        @echo "legit value"
        @echo ""
        @echo "Configurable options are:"
-       @echo "Sound handler: $(SOUND_CONFIG)"
-       @echo "MP3 decoder: $(ENGINE_CONFIG)"
-       @echo "Renderer engine: $(RENDER_CONFIG)"
-       @echo "GUI: $(GUI_CONFIG)"
+       @echo "Sound handler: $(SOUND_OPT)"
+       @echo "MP3 decoder: $(ENGINE_OPT)"
+       @echo "Renderer engine: $(RENDER_OPT)"
+       @echo "GUI: $(GUI_OPT)"