[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog Makefile.am configure.ac gui/Ma... [relea
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] gnash ChangeLog Makefile.am configure.ac gui/Ma... [release_0_7_2] |
|
Date: |
Thu, 02 Nov 2006 00:09:57 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch: release_0_7_2
Changes by: Rob Savoye <rsavoye> 06/11/02 00:09:57
Modified files:
. : ChangeLog Makefile.am configure.ac
gui : Makefile.am Player.cpp
macros : kde.m4
plugin : Makefile.am
plugin/klash : Makefile.am
Log message:
* gui/Player.cpp: Force usage of SDL if GtkGLExt isn't
installed,
OpenGL and GTK2 for the gui require it.
* macros/kde.m4: Add /usr/lib64/qt-3.3/include.
* plugin/Makefile.am: Remove unused CFLAGS, code cleanup.
* plugin/klash/Makefile.am: Remove unused CFLAGS, code cleanup.
* gui/Makefile.am: Use the newly fixed KDE_CFLAGS and KDE_LIBS.
* configure.ac: Rearrange conditionals so they get set after all
the tests are done, not before. Set KDE_CFLAGS and KDE_LIBS
here,
as they're a composite of several other packages. Gracefully
fall
back with SDL for the gui if GTK or GtkGLExt aren't
found. Gracefully disable sound if libmad or ffmpeg aren't
found.
* Makefile.am: Don't add the plugin directory unless we have
GTK. Don't add the klash directory unless we are building
klash. Add config option settings for sound, gui, etc... to
dumpconfig target.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.1412.2.40&r2=1.1412.2.41
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.44.2.1&r2=1.44.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.186.2.7&r2=1.186.2.8
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.39.2.2&r2=1.39.2.3
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.23.2.2&r2=1.23.2.3
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/kde.m4?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.20.2.1&r2=1.20.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/Makefile.am?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.50.2.2&r2=1.50.2.3
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/Makefile.am?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.17.2.2&r2=1.17.2.3
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1412.2.40
retrieving revision 1.1412.2.41
diff -u -b -r1.1412.2.40 -r1.1412.2.41
--- ChangeLog 1 Nov 2006 17:05:42 -0000 1.1412.2.40
+++ ChangeLog 2 Nov 2006 00:09:56 -0000 1.1412.2.41
@@ -1,3 +1,21 @@
+2006-11-01 Rob Savoye <address@hidden>
+
+ * gui/Player.cpp: Force usage of SDL if GtkGLExt isn't installed,
+ OpenGL and GTK2 for the gui require it.
+ * macros/kde.m4: Add /usr/lib64/qt-3.3/include.
+ * plugin/Makefile.am: Remove unused CFLAGS, code cleanup.
+ * plugin/klash/Makefile.am: Remove unused CFLAGS, code cleanup.
+ * gui/Makefile.am: Use the newly fixed KDE_CFLAGS and KDE_LIBS.
+ * configure.ac: Rearrange conditionals so they get set after all
+ the tests are done, not before. Set KDE_CFLAGS and KDE_LIBS here,
+ as they're a composite of several other packages. Gracefully fall
+ back with SDL for the gui if GTK or GtkGLExt aren't
+ found. Gracefully disable sound if libmad or ffmpeg aren't found.
+ * Makefile.am: Don't add the plugin directory unless we have
+ GTK. Don't add the klash directory unless we are building
+ klash. Add config option settings for sound, gui, etc... to
+ dumpconfig target.
+
2006-11-01 Bastiaan Jacques <address@hidden>
* gui/sdl{.cpp, sup.h, _glue.h}: Allow glues to implement region
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.44.2.1
retrieving revision 1.44.2.2
diff -u -b -r1.44.2.1 -r1.44.2.2
--- Makefile.am 30 Oct 2006 14:28:46 -0000 1.44.2.1
+++ Makefile.am 2 Nov 2006 00:09:57 -0000 1.44.2.2
@@ -16,11 +16,12 @@
#
#
-# $Id: Makefile.am,v 1.44.2.1 2006/10/30 14:28:46 rsavoye Exp $
+# $Id: Makefile.am,v 1.44.2.2 2006/11/02 00:09:57 rsavoye Exp $
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = 1.6.0
ACLOCAL_AMFLAGS = -I macros
+noinst_SCRIPT = autogen.sh
STD_DIRS = \
libbase \
@@ -33,16 +34,20 @@
testsuite
if PLUGIN
+if HAVE_GTK2
PLUGIN_DIRS = plugin
endif
+endif
if DOCBOOK
DOC_DIRS = doc
endif
+if PLUGIN
if KLASH
KLASH_DIRS = plugin/klash
endif
+endif
SUBDIRS = $(STD_DIRS) $(DOC_DIRS) $(PLUGIN_DIRS) $(KLASH_DIRS)
@@ -84,6 +89,47 @@
@echo "Rebuilding with GCC Mudflap support"
$(MAKE) 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
@@ -129,8 +175,8 @@
@echo "GSTREAMER_LIBS is $(GSTREAMER_LIBS)"
@echo "FFMPEG_CFLAGS is $(FFMPEG_CFLAGS)"
@echo "FFMPEG_LIBS is $(FFMPEG_LIBS)"
- @echo "KDE_INCLUDES is $(KDE_INCLUDES)"
- @echo "KDE_LDFLAGS is $(KDE_LDFLAGS)"
+ @echo "KDE_CFLAGS is $(KDE_CFLAGS)"
+ @echo "KDE_LIBS is $(KDE_LIBS)"
@echo "CAIRO_CFLAGS is $(CAIRO_CFLAGS)"
@echo "CAIRO_LIBS is $(CAIRO_LIBS)"
@echo "BOOST_CFLAGS is $(BOOST_CFLAGS)"
@@ -141,4 +187,9 @@
@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 "Sound handler: $(SOUND_OPT)"
+ @echo "MP3 decoder: $(ENGINE_OPT)"
+ @echo "Renderer engine: $(RENDER_OPT)"
+ @echo "GUI: $(GUI_OPT)"
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.186.2.7
retrieving revision 1.186.2.8
diff -u -b -r1.186.2.7 -r1.186.2.8
--- configure.ac 31 Oct 2006 19:45:01 -0000 1.186.2.7
+++ configure.ac 2 Nov 2006 00:09:57 -0000 1.186.2.8
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.186.2.7 2006/10/31 19:45:01 rsavoye Exp $
+dnl $Id: configure.ac,v 1.186.2.8 2006/11/02 00:09:57 rsavoye Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, 0.7.2)
@@ -147,9 +147,6 @@
*)
esac
-AM_CONDITIONAL(USE_GUI_GTK, test x$gui = xgtk)
-AM_CONDITIONAL(USE_GUI_SDL, test x$gui = xsdl)
-AM_CONDITIONAL(USE_GUI_KDE, test x$gui = xkde)
AM_CONDITIONAL(USE_GUI_FLTK, test x$gui = xfltk)
AM_CONDITIONAL(USE_GUI_FB, test x$gui = xfb)
@@ -208,14 +205,6 @@
esac],
[sound_handler=sdl]
)
-case "${sound_handler}" in
- gst) AC_DEFINE([SOUND_GST], [1], [Use GSTREAMER for sound]) ;;
- sdl) AC_DEFINE([SOUND_SDL], [1], [Use SDL for sound]) ;;
- *)
-esac
-
-AM_CONDITIONAL(USE_SOUND_GST, test x$sound_handler = xgst)
-AM_CONDITIONAL(USE_SOUND_SDL, test x$sound_handler = xsdl)
dnl --------------------------------------------------------
dnl Select mp3 decoder (only for 'sdl' sound)
@@ -238,15 +227,6 @@
dnl AC_MSG_ERROR([--with-mp3-decoder is only valid with
--enable-sound=sdl])
fi
-case "${mp3_decoder}" in
- ffmpeg) AC_DEFINE([USE_FFMPEG], [1], [Use FFMPEG for mp3 decoding]) ;;
- mad) AC_DEFINE([USE_MAD], [1], [Use MAD for mp3 decoding]) ;;
- *)
-esac
-
-AM_CONDITIONAL(USE_FFMPEG_ENGINE, test x$mp3_decoder = xffmpeg)
-AM_CONDITIONAL(USE_MAD_ENGINE, test x$mp3_decoder = xmad)
-
dnl --------------------------------------------------------
dnl ...
dnl --------------------------------------------------------
@@ -331,7 +311,6 @@
esac],
plugin=yes
)
-AM_CONDITIONAL(PLUGIN, [test x$plugin = xyes])
GNASH_PATH_FIREFOX
@@ -503,12 +482,18 @@
fi
dnl If we have KDE, try to build
-if test x$kde = xyes; then
+if test x$have_kde = xyes; then
AM_CONDITIONAL(KLASH, [test x"$plugin" = xyes -a x"$klash" = xyes])
+ KDE_CFLAGS="$all_includes -I$kde_includes/kio"
+ KDE_LIBS="$KDE_LDFLAGS $LIB_KDEUI $LIB_KDECORE $LIB_KDEPRINT $QT_LDFLAGS
$kde_int_qt"
else
- AM_CONDITIONAL(KLASH, [test x$kde = xyes])
+ AM_CONDITIONAL(KLASH, [test x$have_kde = xyes])
+ KDE_CFLAGS=""
+ KDE_LIBS=""
fi
+AC_SUBST(KDE_CFLAGS)
+AC_SUBST(KDE_LIBS)
if test x$renderer = xopengl; then
GNASH_PATH_OPENGL
fi
@@ -531,7 +516,6 @@
GNASH_PATH_GHELP
fi
AM_CONDITIONAL(GHELP, [test x$ghelp = xyes])
-AM_CONDITIONAL(HAVE_GLEXT, [test x$glext = xyes])
AM_CONDITIONAL(HAVE_AGG, [test x${ac_cv_path_agg_lib} != x])
dnl these conditionals were moved out of kde.m4
@@ -541,18 +525,57 @@
AM_CONDITIONAL(include_ARTS, test "$build_arts" '!=' "no")
AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test
"$kde_gcc_supports_pch" = "yes")
-AM_CONDITIONAL(HAS_GTK2, [ test x$has_gtk2 = xyes ])
+AM_CONDITIONAL(HAVE_GTK2, [ test x$has_gtk2 = xyes ])
+AM_CONDITIONAL(HAVE_GLEXT, [test x$glext = xyes])
+
+dnl We don't have GTKGLExt, so default to SDL, and don't build the Firefox
plugin
+if test x$glext = xno -a x$renderer = xopengl; then
+ if test x$gtk2 = xyes -a x$gui = xgtk; then
+ AC_ERROR([You have GTK installed, but not GtkGLExt. You need GtkGLExt to
use the OpenGL renderer. Attempting to build SDL version])
+ fi
+ gui=sdl
+ plugin=no
+ AC_MSG_WARN([GTK2 specified for the GUI, but GtkGlExt is not present. Trying
SDL instead.])
+fi
+AM_CONDITIONAL(PLUGIN, [test x$plugin = xyes])
+AM_CONDITIONAL(USE_GUI_GTK, test x$gui = xgtk)
+AM_CONDITIONAL(USE_GUI_SDL, test x$gui = xsdl)
+AM_CONDITIONAL(USE_GUI_KDE, test x$gui = xkde)
if test x"$mp3_decoder" = x"ffmpeg"; then
GNASH_PATH_FFMPEG
+ if test x"${ac_cv_path_ffmpeg_lib}" = x ; then
+ AC_MSG_WARN([ffmpeg specified as decoder, but it's not present,
disabling sound])
+ mp3_decoder=none
+ sound_handler=none
+ fi
fi
if test x"$mp3_decoder" = x"mad"; then
dnl Will set MAD_LIBS and MAD_CFLAGS.
dnl Handles --with-mad-incl and --with-mad-lib
GNASH_PATH_MAD
+ if test x"${ac_cv_path_mad_lib}" = x ; then
+ mp3_decoder=none
+ sound_handler=none
+ AC_MSG_WARN([Libmad specified as decoder, but it's not present,
disabling sound])
+ fi
fi
+AM_CONDITIONAL(USE_SOUND_GST, test x$sound_handler = xgst)
+AM_CONDITIONAL(USE_SOUND_SDL, test x$sound_handler = xsdl)
+AM_CONDITIONAL(USE_FFMPEG_ENGINE, test x$mp3_decoder = xffmpeg)
+AM_CONDITIONAL(USE_MAD_ENGINE, test x$mp3_decoder = xmad)
dnl AM_CONDITIONAL(HAVE_FFMPEG, [test x"${FFMPEG_LIBS}" != x])
+case "${sound_handler}" in
+ gst) AC_DEFINE([SOUND_GST], [1], [Use GSTREAMER for sound]) ;;
+ sdl) AC_DEFINE([SOUND_SDL], [1], [Use SDL for sound]) ;;
+ *)
+esac
+case "${mp3_decoder}" in
+ ffmpeg) AC_DEFINE([USE_FFMPEG], [1], [Use FFMPEG for mp3 decoding]) ;;
+ mad) AC_DEFINE([USE_MAD], [1], [Use MAD for mp3 decoding]) ;;
+ *)
+esac
if test "$sound_handler" = "gst"; then
GNASH_PATH_GSTREAMER
@@ -688,10 +711,6 @@
dnl AC_CONFIG_LINKS(doc/C/images)
AC_CONFIG_LINKS(testsuite/libbase/gnashrc:testsuite/libbase/gnashrc.in)
-plugmk=""
-if test x"$plugin" = x"yes"; then
-plugmk="plugin/Makefile plugin/mozilla-sdk/Makefile"
-fi
AC_OUTPUT(Makefile
libbase/Makefile
@@ -711,9 +730,10 @@
testsuite/samples/Makefile
testsuite/misc-ming.all/Makefile
testsuite/server/Makefile
+gui/Makefile
plugin/Makefile
+plugin/mozilla-sdk/Makefile
plugin/klash/Makefile
-gui/Makefile
)
echo ""
@@ -813,9 +833,9 @@
fi
if test x$kde = xyes; then
- if test x"$KDE_INCLUDES" != x; then
- echo " KDE flags are: $KDE_INCLUDES"
- echo " KDE libs are: $KDE_LDFLAGS"
+ if test x"$KDE_CFLAGS" != x; then
+ echo " KDE flags are: $KDE_CFLAGS"
+ echo " KDE libs are: $KDE_LIBS"
else
if x$gui = xkde -o x$klash = xyes ; then
echo " ERROR: No kde development package installed!"
Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.39.2.2
retrieving revision 1.39.2.3
diff -u -b -r1.39.2.2 -r1.39.2.3
--- gui/Makefile.am 31 Oct 2006 16:35:05 -0000 1.39.2.2
+++ gui/Makefile.am 2 Nov 2006 00:09:57 -0000 1.39.2.3
@@ -17,7 +17,7 @@
#
-# $Id: Makefile.am,v 1.39.2.2 2006/10/31 16:35:05 rsavoye Exp $
+# $Id: Makefile.am,v 1.39.2.3 2006/11/02 00:09:57 rsavoye Exp $
AUTOMAKE_OPTIONS =
@@ -52,9 +52,11 @@
if USE_RENDERER_OPENGL
INCLUDES += $(OPENGL_CFLAGS)
if USE_GUI_GTK
+if HAVE_GLEXT
AM_LDFLAGS += $(GLEXT_LIBS)
INCLUDES += $(GLEXT_CFLAGS)
GTK_OPENGL_SRCS = gtk_glue_gtkglext.cpp gtk_glue_gtkglext.h
+endif # HAVE_GLEXT
endif # USE_GUI_GTK
if USE_GUI_SDL
SDL_OPENGL_SRCS = sdl_ogl_glue.cpp sdl_ogl_glue.h
@@ -62,7 +64,7 @@
if USE_GUI_KDE
KDE_OPENGL_SRCS = kde_glue_opengl.cpp kde_glue_opengl.h
AM_LDFLAGS += \
- $(KDE_LDFLAGS) \
+ $(KDE_LIBS) \
$(LIB_KDECORE) \
$(LIB_KDEUI)
BUILT_SOURCES = klash.moc
@@ -96,10 +98,17 @@
endif
if USE_GUI_GTK
+if USE_RENDERER_OPENGL
+if HAVE_GLEXT
GTK_SRCS = gtk.cpp gtksup.h gtk_glue.h $(GTK_CAIRO_SRCS) $(GTK_OPENGL_SRCS)
$(GTK_AGG_SRCS)
AM_LDFLAGS += $(GTK2_LIBS)
INCLUDES += $(GTK2_CFLAGS)
else
+ echo "ERROR: You need to install GtkGLExt to use OpenGL with GTK2!"
+ exit
+endif
+endif
+else
GTK_SRCS =
endif
Index: gui/Player.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.cpp,v
retrieving revision 1.23.2.2
retrieving revision 1.23.2.3
diff -u -b -r1.23.2.2 -r1.23.2.3
--- gui/Player.cpp 31 Oct 2006 19:31:49 -0000 1.23.2.2
+++ gui/Player.cpp 2 Nov 2006 00:09:57 -0000 1.23.2.3
@@ -18,6 +18,12 @@
#include "config.h"
#endif
+#if defined(RENDERER_OPENGL) && !defined(HAVE_GTK_GTKGL_H)
+#warning "ERROR: You need to install GtkGLExt to use OpenGL with GTK2! Forcing
SDL usage!"
+#undef GUI_GTK
+#define GUI_SDL
+#endif
+
#ifndef GUI_KDE
# ifdef GUI_GTK
# include "gtksup.h"
Index: macros/kde.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/kde.m4,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -u -b -r1.20.2.1 -r1.20.2.2
--- macros/kde.m4 30 Oct 2006 14:28:47 -0000 1.20.2.1
+++ macros/kde.m4 2 Nov 2006 00:09:57 -0000 1.20.2.2
@@ -17,7 +17,7 @@
dnl
dnl
-dnl $Id: kde.m4,v 1.20.2.1 2006/10/30 14:28:47 rsavoye Exp $
+dnl $Id: kde.m4,v 1.20.2.2 2006/11/02 00:09:57 rsavoye Exp $
dnl ------------------------------------------------------------------------
dnl Find a file (or one of more files in a list of dirs)
@@ -1014,10 +1014,10 @@
fi
if test $kde_qtver = 4; then
- kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
+ kde_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
fi
if test $kde_qtver = 3; then
- kde_qt_dirs="$QTDIR /usr/lib/qt-3.3 /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
+ kde_qt_dirs="$QTDIR /usr/lib64/qt-3.3 /usr/lib/qt-3.3 /usr/lib/qt3
/usr/lib/qt /usr/share/qt3"
fi
if test $kde_qtver = 2; then
kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
@@ -1239,7 +1239,7 @@
for dir in $kde_qt_dirs; do
qt_incdirs="$qt_incdirs $dir/include $dir"
done
-qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt
/usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt
/usr/X11R6/include/qt2 /usr/include/qt3 $x_includes"
+qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt
/usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt
/usr/X11R6/include/qt2 /usr/include/qt3 $x_includes "
if test ! "$ac_qt_includes" = "NO"; then
qt_incdirs="$ac_qt_includes $qt_incdirs"
fi
Index: plugin/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/Makefile.am,v
retrieving revision 1.50.2.2
retrieving revision 1.50.2.3
diff -u -b -r1.50.2.2 -r1.50.2.3
--- plugin/Makefile.am 31 Oct 2006 19:33:49 -0000 1.50.2.2
+++ plugin/Makefile.am 2 Nov 2006 00:09:57 -0000 1.50.2.3
@@ -15,12 +15,12 @@
# 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.50.2.2 2006/10/31 19:33:49 rsavoye Exp $
+# $Id: Makefile.am,v 1.50.2.3 2006/11/02 00:09:57 rsavoye Exp $
AUTOMAKE_OPTIONS =
if KLASH
-KLASH = klash
+
endif
SUBDIRS = $(KLASH) # test mozilla-sdk
@@ -33,23 +33,14 @@
INCLUDES = -I.. \
-I$(srcdir) \
+ -I$(top_srcdir)/server \
+ -I$(top_srcdir)/server/parser \
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/backend \
- -I$(top_srcdir)/libgeometry \
- -I$(top_srcdir)/server \
-I$(srcdir)/mozilla-sdk \
-I$(srcdir)/mozilla-sdk/include \
- $(LIBXML_CFLAGS) \
- $(GLEXT_CFLAGS) \
$(GTK2_CFLAGS) \
- $(PANGO_CFLAGS) \
- $(GLIB_CFLAGS) \
- $(CAIRO_CFLAGS) \
- $(ATK_CFLAGS) \
- $(SDL_CFLAGS) \
- $(X_CFLAGS) \
- $(DMALLOC_CFLAGS) \
- $(OGG_CFLAGS)
+ $(NULL)
AM_CXXFLAGS = $(INCLUDES)
@@ -92,33 +83,6 @@
libgnashplugin_la_LIBADD = \
$(NULL)
-# -lXi -lX11
-# -lXmu
-# $(X_LIBS)\
-# $(X_EXTRA_LIBS)
-#
-# $(GLIB_LIBS) \
-# $(X_LIBS) \
-# $(SDL_LIBS) \
-# $(OPENGL_LIBS) \
-# $(GLEXT_LIBS) \
-# $(GTK2_LIBS) \
-# $(PANGO_LIBS) \
-# $(CAIRO_LIBS) \
-# $(ATK_LIBS) \
-# $(LIBXML_LIBS) \
-# $(JPEG_LIBS) \
-# $(PNG_LIBS) \
-# $(DMALLOC_LIBS) \
-# $(OGG_LIBS) \
-# $(DMALLOC_LIBS) \
-# $(top_builddir)/backend/libgnashbackend.la\
-# $(top_builddir)/server/asobj/libgnashasobjs.la \
-# $(top_builddir)/server/libgnashserver.la\
-# $(top_builddir)/libgeometry/libgnashgeo.la\
-# $(top_builddir)/libamf/libgnashamf.la \
-#
-
if PLUGIN_LINK_UNDEFINED
libgnashplugin_la_LDFLAGS = -avoid-version -L$(plugindir)
else
Index: plugin/klash/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/Makefile.am,v
retrieving revision 1.17.2.2
retrieving revision 1.17.2.3
diff -u -b -r1.17.2.2 -r1.17.2.3
--- plugin/klash/Makefile.am 31 Oct 2006 16:35:05 -0000 1.17.2.2
+++ plugin/klash/Makefile.am 2 Nov 2006 00:09:57 -0000 1.17.2.3
@@ -17,7 +17,7 @@
#
-# $Id: Makefile.am,v 1.17.2.2 2006/10/31 16:35:05 rsavoye Exp $
+# $Id: Makefile.am,v 1.17.2.3 2006/11/02 00:09:57 rsavoye Exp $
AUTOMAKE_OPTIONS =
@@ -59,21 +59,9 @@
dist_appsdata_DATA= pluginsinfo
AM_LDFLAGS = \
- $(JPEG_LIBS) \
- $(PNG_LIBS) \
- $(OGG_LIBS) \
- $(ZLIB_LIBS) \
+ $(KDE_LIBS) \
$(LIBXML_LIBS) \
- $(SDL_LIBS) \
- $(X_LIBS) \
- $(MP3_LIBS) \
- $(PTHREAD_LIBS) \
- $(LIB_KDEUI) \
- $(LIB_KDECORE) \
- $(KDE_LDFLAGS) \
- $(LIB_KDEUI) \
- $(LIB_KDECORE) \
- $(QT_LDFLAGS)
+ $(PTHREAD_LIBS)
AM_INCLUDES = -I.. \
-I$(top_srcdir) \
@@ -81,18 +69,9 @@
-I$(top_srcdir)/server/parser \
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/backend \
- -I$(top_srcdir)/libamf \
- -I$(top_srcdir)/libgeometry \
- $(QT_INCLUDES) \
- $(PTHREAD_CFLAGS) \
- $(SDL_CFLAGS) \
- $(LIBXML_CFLAGS) \
$(OPENGL_CFLAGS) \
- $(PNG_CFLAGS) \
- $(JPEG_CFLAGS) \
- $(MP3_CFLAGS) \
- $(OGG_CFLAGS) \
- $(KDE_INCLS)
+ $(LIBXML_CFLAGS) \
+ $(KDE_CFLAGS)
CLEANFILES = klash_part.moc klash.moc
dummy.cpp:
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog Makefile.am configure.ac gui/Ma... [release_0_7_2],
Rob Savoye <=