On Mon, Nov 13, 2006 at 05:28:10PM +0100, strk wrote: > > Sounds good to me, the "narrower" the better. > Feel free to submit a complete patch including all dirs.
Here is is: * remove DefineEditTextVariableNameTest-Runner, since the source file disappeared * remove KLASH_DIRS = plugin/klash from top-level Makefile.am, it is allready in plugin/Makefile.am * use AM_CPPFLAGS instead of INCLUDES almost everywhere. * don't use AM_LDFLAGS when there is allready *_LDFLAGS for a library, and use a variable called *_LIBS added to *_LIBADD. * in backend/Makefile.am, don't duplicate render_handler_tri.cpp, and distribute header files. * in gui/Makefile.am, if USE_RENDERER_OPENGL add $(OPENGL_LIBS) * don't set AM_CXXFLAGS * add gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance(); to klash.cpp -- Pat
? cl_rpm.diff ? gnash-0.7.2.tar.gz ? doc/C/gnash.texi ? gui/NullGui.lo ? gui/gnash ? gui/gtk.lo ? gui/gtk_glue_agg.lo ? gui/gui.lo ? gui/kde.loT ? gui/libgnashgui.la ? libamf/.libs ? libamf/amf.lo ? libamf/libgnashamf.la ? libamf/rtmp.lo ? plugin/np_entry.lo ? plugin/npn_gate.lo ? plugin/npp_gate.lo ? plugin/klash/.libs ? plugin/klash/klash.moc ? plugin/klash/klash_part.lo ? plugin/klash/klash_part.moc ? plugin/klash/libklashpart.la ? testsuite/.deps ? testsuite/.libs ? testsuite/libtestsuite.la ? testsuite/libtestsuite_la-MovieTester.lo ? testsuite/actionscript.all/Boolean.swf ? testsuite/actionscript.all/Camera.swf ? testsuite/actionscript.all/Color.swf ? testsuite/actionscript.all/ContextMenu.swf ? testsuite/actionscript.all/CustomActions.swf ? testsuite/actionscript.all/Date.swf ? testsuite/actionscript.all/Error.swf ? testsuite/actionscript.all/Function.swf ? testsuite/actionscript.all/Global.swf ? testsuite/actionscript.all/Inheritance.swf ? testsuite/actionscript.all/LoadVars.swf ? testsuite/actionscript.all/LocalConnection.swf ? testsuite/actionscript.all/Microphone.swf ? testsuite/actionscript.all/Mouse.swf ? testsuite/actionscript.all/MovieClip.swf ? testsuite/actionscript.all/NetConnection.swf ? testsuite/actionscript.all/NetStream.swf ? testsuite/actionscript.all/Number.swf ? testsuite/actionscript.all/Object.swf ? testsuite/actionscript.all/Selection.swf ? testsuite/actionscript.all/SharedObject.swf ? testsuite/actionscript.all/Stage.swf ? testsuite/actionscript.all/String.swf ? testsuite/actionscript.all/System.swf ? testsuite/actionscript.all/TextSnapshot.swf ? testsuite/actionscript.all/Video.swf ? testsuite/actionscript.all/XML.swf ? testsuite/actionscript.all/XMLNode.swf ? testsuite/actionscript.all/array.swf ? testsuite/actionscript.all/delete.swf ? testsuite/actionscript.all/rtmp.swf ? testsuite/actionscript.all/site.exp ? testsuite/actionscript.all/with.swf ? testsuite/libbase/NoSeekFileTest ? testsuite/libbase/RcTest ? testsuite/libbase/gnash-dbg.log ? testsuite/libbase/site.exp ? testsuite/libbase/smart_ptrTest ? testsuite/misc-ming.all/ButtonEventsTest ? testsuite/misc-ming.all/ButtonEventsTest-Runner ? testsuite/misc-ming.all/DefineEditTextTest ? testsuite/misc-ming.all/DefineEditTextVariableNameTest ? testsuite/misc-ming.all/DefineEditTextVariableNameTest-Runner ? testsuite/misc-ming.all/PlaceObject2Test ? testsuite/misc-ming.all/RemoveObject2Test ? testsuite/misc-ming.all/RollOverOutTest ? testsuite/misc-ming.all/RollOverOutTest-Runner ? testsuite/misc-ming.all/gnash-dbg.log ? testsuite/misc-ming.all/site.exp ? testsuite/misc-ming.all/testrun.log ? testsuite/misc-ming.all/testrun.sum ? testsuite/movies.all/.deps ? testsuite/movies.all/Makefile ? testsuite/movies.all/Makefile.in ? testsuite/movies.all/site.exp ? testsuite/samples/.deps ? testsuite/samples/Makefile ? testsuite/samples/Makefile.in ? testsuite/samples/clip_as_button2-TestRunner ? testsuite/samples/gnash-dbg.log ? testsuite/samples/site.exp ? testsuite/samples/testrun.log ? testsuite/samples/testrun.sum ? testsuite/server/.deps ? testsuite/server/.libs ? testsuite/server/GetterSetterTest ? testsuite/server/Makefile ? testsuite/server/Makefile.in ? testsuite/server/MatrixTest ? testsuite/server/PropertyListTest ? testsuite/server/gnash-dbg.log ? testsuite/server/site.exp ? utilities/dumpshm Index: Makefile.am =================================================================== RCS file: /sources/gnash/gnash/Makefile.am,v retrieving revision 1.44.2.4 diff -u -3 -p -r1.44.2.4 Makefile.am --- Makefile.am 11 Nov 2006 17:05:00 -0000 1.44.2.4 +++ Makefile.am 13 Nov 2006 23:03:31 -0000 @@ -43,13 +43,7 @@ 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) +SUBDIRS = $(STD_DIRS) $(DOC_DIRS) $(PLUGIN_DIRS) man_MANS = doc/gnash.1 Index: backend/Makefile.am =================================================================== RCS file: /sources/gnash/gnash/backend/Makefile.am,v retrieving revision 1.44.2.3 diff -u -3 -p -r1.44.2.3 Makefile.am --- backend/Makefile.am 11 Nov 2006 12:33:17 -0000 1.44.2.3 +++ backend/Makefile.am 13 Nov 2006 23:03:31 -0000 @@ -20,11 +20,11 @@ AUTOMAKE_OPTIONS = -AM_CPPFLAGS = # -Wall +#AM_CPPFLAGS = # -Wall ## WARNING: make sure GLIB_LIBS appears first ## See: http://lists.gnu.org/archive/html/gnash-dev/2006-07/msg00076.html -AM_LDFLAGS = \ +libgnashbackend_LIBS = \ $(GLIB_LIBS) \ $(JPEG_LIBS) \ $(PNG_LIBS) \ @@ -39,7 +39,7 @@ AM_LDFLAGS = \ $(PTHREAD_LIBS) \ $(NULL) -INCLUDES = -I.. \ +AM_CPPFLAGS = -I.. \ -I$(top_srcdir) \ -I$(top_srcdir)/server \ -I$(top_srcdir)/server/parser \ @@ -67,48 +67,51 @@ noinst_HEADERS = \ #noinst_LTLIBRARIES = libgbackend.la lib_LTLIBRARIES = libgnashbackend.la +RENDER_SOURCES = render_handler_tri.cpp + if USE_RENDERER_CAIRO -RENDER_SOURCES = render_handler_cairo.cpp render_handler_tri.cpp -AM_LDFLAGS += $(CAIRO_LIBS) -INCLUDES += $(CAIRO_CFLAGS) +RENDER_SOURCES += render_handler_cairo.cpp render_handler_cairo.h +libgnashbackend_LIBS += $(CAIRO_LIBS) +AM_CPPFLAGS += $(CAIRO_CFLAGS) endif if USE_RENDERER_OPENGL -RENDER_SOURCES = render_handler_ogl.cpp render_handler_tri.cpp -AM_LDFLAGS += $(OPENGL_LIBS) # $(GLEXT_LIBS) -INCLUDES += $(OPENGL_CFLAGS) # $(GLEXT_CFLAGS) +RENDER_SOURCES += render_handler_ogl.cpp +libgnashbackend_LIBS += $(OPENGL_LIBS) # $(GLEXT_LIBS) +AM_CPPFLAGS += $(OPENGL_CFLAGS) # $(GLEXT_CFLAGS) endif if USE_SOUND_GST SOUND_SOURCES = sound_handler_gst.cpp -AM_LDFLAGS += $(GSTREAMER_LIBS) -AM_LDFLAGS += $(LIBXML_LIBS) -INCLUDES += $(GSTREAMER_CFLAGS) -INCLUDES += $(LIBXML_CFLAGS) +libgnashbackend_LIBS += $(GSTREAMER_LIBS) +libgnashbackend_LIBS += $(LIBXML_LIBS) +AM_CPPFLAGS += $(GSTREAMER_CFLAGS) +AM_CPPFLAGS += $(LIBXML_CFLAGS) endif if USE_SOUND_SDL SOUND_SOURCES = sound_handler_sdl.cpp sound_handler_sdl.h if USE_FFMPEG_ENGINE -AM_LDFLAGS += $(FFMPEG_LIBS) -INCLUDES += $(FFMPEG_CFLAGS) +libgnashbackend_LIBS += $(FFMPEG_LIBS) +AM_CPPFLAGS += $(FFMPEG_CFLAGS) endif if USE_MAD_ENGINE -AM_LDFLAGS += $(MAD_LIBS) -INCLUDES += $(MAD_CFLAGS) +libgnashbackend_LIBS += $(MAD_LIBS) +AM_CPPFLAGS += $(MAD_CFLAGS) endif endif if USE_RENDERER_AGG -RENDER_SOURCES = render_handler_tri.cpp render_handler_agg.cpp -AM_LDFLAGS += $(AGG_LIBS) -INCLUDES += $(AGG_CFLAGS) +RENDER_SOURCES += render_handler_agg.cpp render_handler_agg.h \ + render_handler_agg_bitmap.h render_handler_agg_style.h +libgnashbackend_LIBS += $(AGG_LIBS) +AM_CPPFLAGS += $(AGG_CFLAGS) endif libgnashbackend_la_LIBADD = \ $(top_builddir)/libbase/libgnashbase.la \ $(top_builddir)/server/libgnashserver.la \ - $(AM_LDFLAGS) + $(libgnashbackend_LIBS) libgnashbackend_la_SOURCES = \ $(RENDER_SOURCES) \ Index: gui/Makefile.am =================================================================== RCS file: /sources/gnash/gnash/gui/Makefile.am,v retrieving revision 1.39.2.9 diff -u -3 -p -r1.39.2.9 Makefile.am --- gui/Makefile.am 10 Nov 2006 22:01:42 -0000 1.39.2.9 +++ gui/Makefile.am 13 Nov 2006 23:03:31 -0000 @@ -21,7 +21,7 @@ AUTOMAKE_OPTIONS = -INCLUDES = -I.. \ +AM_CPPFLAGS = -I.. \ -I$(top_srcdir) \ -I$(top_srcdir)/server \ -I$(top_srcdir)/server/parser \ @@ -51,11 +51,12 @@ AM_LDFLAGS = \ if USE_RENDERER_OPENGL # { - INCLUDES += $(OPENGL_CFLAGS) + AM_CPPFLAGS += $(OPENGL_CFLAGS) + AM_LDFLAGS += $(OPENGL_LIBS) if USE_GUI_GTK # { if HAVE_GLEXT # { AM_LDFLAGS += $(GLEXT_LIBS) - INCLUDES += $(GLEXT_CFLAGS) + AM_CPPFLAGS += $(GLEXT_CFLAGS) GTK_OPENGL_SRCS = gtk_glue_gtkglext.cpp gtk_glue_gtkglext.h endif # HAVE_GLEXT } endif # USE_GUI_GTK } @@ -77,7 +78,7 @@ else # ! USE_RENDERER_OPENGL }{ endif # ! USE_RENDERER_OPENGL } if USE_RENDERER_CAIRO # { - INCLUDES += $(CAIRO_CFLAGS) + AM_CPPFLAGS += $(CAIRO_CFLAGS) AM_LDFLAGS += $(CAIRO_LIBS) GTK_CAIRO_SRCS = gtk_glue_cairo.cpp gtk_glue_cairo.h KDE_CAIRO_SRCS = #kde_glue_cairo.cpp kde_glue_cairo.h @@ -89,7 +90,7 @@ else # }{ endif #} if USE_RENDERER_AGG # { - INCLUDES += $(AGG_CFLAGS) + AM_CPPFLAGS += $(AGG_CFLAGS) AM_LDFLAGS += $(AGG_LIBS) GTK_AGG_SRCS = gtk_glue_agg.cpp gtk_glue_agg.h SDL_AGG_SRCS = sdl_agg_glue.cpp sdl_agg_glue.h @@ -100,7 +101,7 @@ endif # } if USE_GUI_GTK #{ AM_LDFLAGS += $(GTK2_LIBS) - INCLUDES += $(GTK2_CFLAGS) + AM_CPPFLAGS += $(GTK2_CFLAGS) GTK_SRCS = gtk.cpp gtksup.h gtk_glue.h $(GTK_CAIRO_SRCS) $(GTK_OPENGL_SRCS) $(GTK_AGG_SRCS) if USE_RENDERER_OPENGL #{ if HAVE_GLEXT #{ @@ -123,14 +124,14 @@ endif # } if USE_GUI_KDE # { KDE_SRCS = kde.cpp kdesup.h kde_glue.h $(KDE_CAIRO_SRCS) $(KDE_OPENGL_SRCS) - INCLUDES += -I$(kde_includes)/kio $(all_includes) + AM_CPPFLAGS += -I$(kde_includes)/kio $(all_includes) else # }{ KDE_SRCS = endif # } if USE_GUI_FB # { FB_SRCS = fb.cpp fbsup.h - INCLUDES += $(AGG_CFLAGS) + AM_CPPFLAGS += $(AGG_CFLAGS) else # }{ FB_SRCS = endif # } @@ -138,24 +139,24 @@ endif # } if USE_SOUND_SDL if USE_FFMPEG_ENGINE AM_LDFLAGS += $(FFMPEG_LIBS) -INCLUDES += $(FFMPEG_CFLAGS) +AM_CPPFLAGS += $(FFMPEG_CFLAGS) endif if USE_MAD_ENGINE AM_LDFLAGS += $(MAD_LIBS) -INCLUDES += $(MAD_CFLAGS) +AM_CPPFLAGS += $(MAD_CFLAGS) endif endif #if USE_GUI_FLTK # FLTK_SRCS = fltk.cpp fltksup.h -# INCLUDES += $(FLTK_INCLS) +# AM_CPPFLAGS += $(FLTK_INCLS) #else # FLTK_SRCS = #endif -AM_CPPFLAGS = $(INCLUDES) -DPKGDATADIR=\"$(pkgdatadir)\" +AM_CPPFLAGS += -DPKGDATADIR=\"$(pkgdatadir)\" AM_CPPFLAGS += -DRENDERER_CONFIG=\"$(RENDERER_CONFIG)\" AM_CPPFLAGS += -DGUI_CONFIG=\"$(GUI_CONFIG)\" AM_CPPFLAGS += -DSOUND_CONFIG=\"$(SOUND_CONFIG)\" @@ -200,8 +201,7 @@ GNASH_LIBS = \ gnash_SOURCES = gnash.cpp Player.cpp Player.h gnash_LDFLAGS = -module -avoid-version gnash_LDADD = \ - $(GNASH_LIBS) \ - libgnashgui.la + $(GNASH_LIBS) klash_SOURCES = gnash.cpp Player.cpp Player.h klash_CPPFLAGS = \ @@ -211,8 +211,7 @@ klash_LDFLAGS = -module -avoid-version klash_LDADD = \ $(LIB_KDECORE) \ $(LIB_KDEUI) \ - $(GNASH_LIBS) \ - libgnashgui.la + $(GNASH_LIBS) klash_DEPENDENCIES = libgnashgui.la Index: libamf/Makefile.am =================================================================== RCS file: /sources/gnash/gnash/libamf/Makefile.am,v retrieving revision 1.16.2.2 diff -u -3 -p -r1.16.2.2 Makefile.am --- libamf/Makefile.am 10 Nov 2006 22:01:42 -0000 1.16.2.2 +++ libamf/Makefile.am 13 Nov 2006 23:03:31 -0000 @@ -22,8 +22,8 @@ AUTOMAKE_OPTIONS = -AM_CXXFLAGS = $(CXXFLAGS) $(SDL_CFLAGS) $(INCLUDES) -AM_CPPFLAGS = +#AM_CXXFLAGS = $(CXXFLAGS) $(SDL_CFLAGS) $(AM_CPPFLAGS) +#AM_CPPFLAGS = AM_LDFLAGS = \ $(top_builddir)/libbase/libgnashbase.la \ $(OPENGL_LIBS) \ @@ -44,7 +44,7 @@ libgnashamf_la_SOURCES = amf.cpp rtmp.cp libgnashamf_la_LDFLAGS = -release @VERSION@ # noinst_HEADERS = amf.h amfutf8.h -INCLUDES = -I.. -I$(srcdir) \ +AM_CPPFLAGS = -I.. -I$(srcdir) \ -I$(top_srcdir)/server \ -I$(top_srcdir)/libbase \ $(LIBXML_CFLAGS) Index: libbase/Makefile.am =================================================================== RCS file: /sources/gnash/gnash/libbase/Makefile.am,v retrieving revision 1.45.2.2 diff -u -3 -p -r1.45.2.2 Makefile.am --- libbase/Makefile.am 10 Nov 2006 22:01:42 -0000 1.45.2.2 +++ libbase/Makefile.am 13 Nov 2006 23:03:31 -0000 @@ -21,7 +21,7 @@ AUTOMAKE_OPTIONS = EXTRA_DIST = -INCLUDES = -I.. -I$(srcdir) \ +AM_CPPFLAGS = -I.. -I$(srcdir) \ -I$(top_srcdir) \ -I$(top_srcdir)/server \ $(PTHREAD_CFLAGS) \ @@ -34,8 +34,8 @@ INCLUDES = -I.. -I$(srcdir) \ $(JPEG_CFLAGS) \ $(BOOST_CFLAGS) -AM_CXXFLAGS = $(INCLUDES) -AM_CPPFLAGS = #-Wall +# There is no AM_CPPFLAGS in CXXLINK, but no reason for CFLAGS in CXXLINK. +# AM_CXXFLAGS = $(AM_CPPFLAGS) lib_LTLIBRARIES = libgnashbase.la Index: libgeometry/Makefile.am =================================================================== RCS file: /sources/gnash/gnash/libgeometry/Makefile.am,v retrieving revision 1.19.2.2 diff -u -3 -p -r1.19.2.2 Makefile.am --- libgeometry/Makefile.am 10 Nov 2006 22:01:42 -0000 1.19.2.2 +++ libgeometry/Makefile.am 13 Nov 2006 23:03:31 -0000 @@ -22,8 +22,8 @@ AUTOMAKE_OPTIONS = -AM_CXXFLAGS = $(CXXFLAGS) $(SDL_CFLAGS) $(INCLUDES) -AM_CPPFLAGS = #-Wall +# AM_CXXFLAGS = $(CXXFLAGS) $(SDL_CFLAGS) $(AM_CPPFLAGS) +# AM_CPPFLAGS = #-Wall # AM_LDFLAGS = $(OPENGL_LIBNS) $(SDL_LIBS) # noinst_LTLIBRARIES = libgeometry.la @@ -33,7 +33,7 @@ lib_LTLIBRARIES = libgnashgeo.la # These headers get installed # include_HEADERS = log.h err.h proc.h serial.h xantrex.h outback.h -INCLUDES = -I.. -I$(srcdir) \ +AM_CPPFLAGS = -I.. -I$(srcdir) \ -I$(top_srcdir) \ -I$(top_srcdir)/libbase \ $(PTHREAD_CFLAGS) \ Index: packaging/redhat/gnash.spec =================================================================== RCS file: /sources/gnash/gnash/packaging/redhat/gnash.spec,v retrieving revision 1.11.2.6 diff -u -3 -p -r1.11.2.6 gnash.spec --- packaging/redhat/gnash.spec 7 Nov 2006 19:11:07 -0000 1.11.2.6 +++ packaging/redhat/gnash.spec 13 Nov 2006 23:03:31 -0000 @@ -67,7 +67,13 @@ make %{?_smp_mflags} rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT/%{_libdir}/*.la -rm $RPM_BUILD_ROOT/%{_libdir}/*.so +rm \ + $RPM_BUILD_ROOT/%{_libdir}/libgnashamf.so \ + $RPM_BUILD_ROOT/%{_libdir}/libgnashbackend.so \ + $RPM_BUILD_ROOT/%{_libdir}/libgnashbase.so \ + $RPM_BUILD_ROOT/%{_libdir}/libgnashgeo.so \ + $RPM_BUILD_ROOT/%{_libdir}/libgnashgui.so \ + $RPM_BUILD_ROOT/%{_libdir}/libgnashserver.so rm -rf $RPM_BUILD_ROOT/%{_localstatedir}/scrollkeeper rm -f $RPM_BUILD_ROOT%{_infodir}/dir @@ -97,7 +103,7 @@ scrollkeeper-update -q || : %{_bindir}/gnash %{_bindir}/gparser %{_bindir}/gprocessor -%{_libdir}/libgnash*.so.* +%{_libdir}/libgnash*-*.so %{_mandir}/man1/gnash* %{_infodir}/gnash* %{_datadir}/gnash/ Index: plugin/Makefile.am =================================================================== RCS file: /sources/gnash/gnash/plugin/Makefile.am,v retrieving revision 1.50.2.6 diff -u -3 -p -r1.50.2.6 Makefile.am --- plugin/Makefile.am 10 Nov 2006 23:40:15 -0000 1.50.2.6 +++ plugin/Makefile.am 13 Nov 2006 23:03:31 -0000 @@ -32,7 +32,11 @@ SUBDIRS = $(KLASH) # test mozilla-sdk plugindir = $(FIREFOX_PLUGINS) -INCLUDES = -I.. \ +# XP_UNIX This needs to get defined for npapi.h on unix platforms. +# PLUGIN_TRACE Enable this define to get debug prints whenever the plugin +# api gets control. +AM_CPPFLAGS = -DPLUGIN_TRACE -DXP_UNIX -DMOZ_X11 -DPREFIX=\""${prefix}"\" \ + -I.. \ -I$(srcdir) \ -I$(top_srcdir)/server \ -I$(top_srcdir)/server/parser \ @@ -44,11 +48,7 @@ INCLUDES = -I.. \ $(NULL) -AM_CXXFLAGS = $(INCLUDES) -# XP_UNIX This needs to get defined for npapi.h on unix platforms. -# PLUGIN_TRACE Enable this define to get debug prints whenever the plugin -# api gets control. -AM_CPPFLAGS = -DPLUGIN_TRACE -DXP_UNIX -DMOZ_X11 -DPREFIX=\""${prefix}"\" +# AM_CXXFLAGS = $(AM_CPPFLAGS) plugin_LTLIBRARIES = libgnashplugin.la Index: plugin/klash/Makefile.am =================================================================== RCS file: /sources/gnash/gnash/plugin/klash/Makefile.am,v retrieving revision 1.17.2.3 diff -u -3 -p -r1.17.2.3 Makefile.am --- plugin/klash/Makefile.am 2 Nov 2006 00:09:57 -0000 1.17.2.3 +++ plugin/klash/Makefile.am 13 Nov 2006 23:03:31 -0000 @@ -15,8 +15,6 @@ # 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.17.2.3 2006/11/02 00:09:57 rsavoye Exp $ AUTOMAKE_OPTIONS = @@ -58,22 +56,6 @@ confdir = $(kde_confdir) appsdatadir=$(kde_datadir)/klash dist_appsdata_DATA= pluginsinfo -AM_LDFLAGS = \ - $(KDE_LIBS) \ - $(LIBXML_LIBS) \ - $(PTHREAD_LIBS) - -AM_INCLUDES = -I.. \ - -I$(top_srcdir) \ - -I$(top_srcdir)/server \ - -I$(top_srcdir)/server/parser \ - -I$(top_srcdir)/libbase \ - -I$(top_srcdir)/backend \ - $(OPENGL_CFLAGS) \ - $(LIBXML_CFLAGS) \ - $(KDE_CFLAGS) - -CLEANFILES = klash_part.moc klash.moc dummy.cpp: echo > dummy.cpp @@ -85,10 +67,22 @@ bin_PROGRAMS = klash klash_SOURCES = klash.cpp klash_CPPFLAGS = \ - $(AM_INCLUDES) \ + -I.. \ + -I$(top_srcdir) \ + -I$(top_srcdir)/server \ + -I$(top_srcdir)/server/parser \ + -I$(top_srcdir)/libbase \ + -I$(top_srcdir)/backend \ + $(LIBXML_CFLAGS) \ + $(OPENGL_CFLAGS) \ + $(KDE_CFLAGS) \ -DUSE_KDE -klash_LDFLAGS = -klash_LDADD = $(AM_LDFLAGS) \ + +klash_LDADD = \ + $(KDE_LIBS) \ + $(OPENGL_LIBS) \ + $(LIBXML_LIBS) \ + $(PTHREAD_LIBS) \ ../../backend/libgnashbackend.la \ ../../server/libgnashserver.la \ ../../server/asobj/libgnashasobjs.la \ @@ -97,6 +91,8 @@ klash_LDADD = $(AM_LDFLAGS) \ klash_DEPENDENCIES = klash.moc BUILT_SOURCES = klash_part.moc klash.moc + +CLEANFILES = klash_part.moc klash.moc endif klash_part.moc: $(srcdir)/klash_part.h Index: plugin/klash/klash.cpp =================================================================== RCS file: /sources/gnash/gnash/plugin/klash/klash.cpp,v retrieving revision 1.17.2.6 diff -u -3 -p -r1.17.2.6 klash.cpp --- plugin/klash/klash.cpp 11 Nov 2006 10:25:23 -0000 1.17.2.6 +++ plugin/klash/klash.cpp 13 Nov 2006 23:03:31 -0000 @@ -259,6 +259,7 @@ main(int argc, char *argv[]) static struct timeval start; unsigned int ticks; + gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance(); // -1.0 tends to look good. tex_lod_bias = -1.2f; Index: plugin/mozilla-sdk/Makefile.am =================================================================== RCS file: /sources/gnash/gnash/plugin/mozilla-sdk/Makefile.am,v retrieving revision 1.12.2.1 diff -u -3 -p -r1.12.2.1 Makefile.am --- plugin/mozilla-sdk/Makefile.am 30 Oct 2006 14:28:47 -0000 1.12.2.1 +++ plugin/mozilla-sdk/Makefile.am 13 Nov 2006 23:03:31 -0000 @@ -20,12 +20,13 @@ AUTOMAKE_OPTIONS = dejagnu -INCLUDES = -I.. \ +AM_CPPFLAGS = -DPLUGIN_TRACE -DXP_UNIX \ + -I.. \ -I$(srcdir) \ -I$(srcdir)/include -AM_CXXFLAGS = $(CXXFLAGS) $(INCLUDES) -AM_CPPFLAGS = -DPLUGIN_TRACE -DXP_UNIX # $(FIREFOX_DEFS) +# AM_CXXFLAGS = $(CXXFLAGS) $(AM_CPPFLAGS) +# AM_CPPFLAGS = -DPLUGIN_TRACE -DXP_UNIX # $(FIREFOX_DEFS) # AM_LDFLAGS = $(FIREFOX_LIBS) # noinst_LTLIBRARIES = libmozsdk.la Index: server/Makefile.am =================================================================== RCS file: /sources/gnash/gnash/server/Makefile.am,v retrieving revision 1.80.2.5 diff -u -3 -p -r1.80.2.5 Makefile.am --- server/Makefile.am 13 Nov 2006 17:10:44 -0000 1.80.2.5 +++ server/Makefile.am 13 Nov 2006 23:03:31 -0000 @@ -22,8 +22,6 @@ AUTOMAKE_OPTIONS = -AM_CPPFLAGS = - SUBDIRS = asobj parser # noinst_LTLIBRARIES = libserver.la @@ -31,7 +29,7 @@ lib_LTLIBRARIES = libgnashserver.la # noinst_SCRIPTS = gen-files.sh # Only enable if we're configured with --enable-mp3 -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/backend \ -I$(top_srcdir)/server/swf \ -I$(top_srcdir)/server/asobj \ Index: server/asobj/Makefile.am =================================================================== RCS file: /sources/gnash/gnash/server/asobj/Makefile.am,v retrieving revision 1.12.2.3 diff -u -3 -p -r1.12.2.3 Makefile.am --- server/asobj/Makefile.am 13 Nov 2006 17:10:44 -0000 1.12.2.3 +++ server/asobj/Makefile.am 13 Nov 2006 23:03:31 -0000 @@ -22,12 +22,9 @@ AUTOMAKE_OPTIONS = -AM_CPPFLAGS = - noinst_LTLIBRARIES = libgnashasobjs.la -# Only enable if we're configured with --enable-mp3 -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/server \ -I$(top_srcdir)/server/swf \ -I$(top_srcdir)/server/parser \ Index: server/parser/Makefile.am =================================================================== RCS file: /sources/gnash/gnash/server/parser/Makefile.am,v retrieving revision 1.10.2.3 diff -u -3 -p -r1.10.2.3 Makefile.am --- server/parser/Makefile.am 13 Nov 2006 17:10:44 -0000 1.10.2.3 +++ server/parser/Makefile.am 13 Nov 2006 23:03:31 -0000 @@ -22,8 +22,6 @@ AUTOMAKE_OPTIONS = -AM_CPPFLAGS = - noinst_LTLIBRARIES = libgnashparser.la # Only enable if we're configured with --enable-mp3 @@ -31,7 +29,7 @@ noinst_LTLIBRARIES = libgnashparser.la # The 'backend' dir should not be required if we finally drop # rendering calls from the parser (see https://savannah.gnu.org/task/?5837) # -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/backend \ -I$(top_srcdir)/server \ -I$(top_srcdir)/server/swf \ Index: testsuite/actionscript.all/Makefile.am =================================================================== RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Makefile.am,v retrieving revision 1.40.2.1 diff -u -3 -p -r1.40.2.1 Makefile.am --- testsuite/actionscript.all/Makefile.am 30 Oct 2006 14:28:55 -0000 1.40.2.1 +++ testsuite/actionscript.all/Makefile.am 13 Nov 2006 23:03:31 -0000 @@ -25,7 +25,7 @@ AUTOMAKE_OPTIONS = dejagnu RUNTESTDEFAULTFLAGS = swf_exists.exp dist_noinst_SCRIPTS = gen-test.sh gen-index.sh -INCLUDES = -I.. \ +AM_CPPFLAGS = -I.. \ -I$(top_srcdir) \ -I$(top_srcdir)/libbase \ -I$(top_srcdir)/server \ Index: testsuite/libbase/Makefile.am =================================================================== RCS file: /sources/gnash/gnash/testsuite/libbase/Makefile.am,v retrieving revision 1.19.2.3 diff -u -3 -p -r1.19.2.3 Makefile.am --- testsuite/libbase/Makefile.am 11 Nov 2006 00:15:49 -0000 1.19.2.3 +++ testsuite/libbase/Makefile.am 13 Nov 2006 23:03:31 -0000 @@ -25,6 +25,8 @@ AM_LDFLAGS = \ $(top_builddir)/libbase/libgnashbase.la \ $(NULL) +# AM_CPPFLAGS isn't right here since per-program *_CPPFLAGS override global +# AM_CPPFLAGS INCLUDES = -I.. \ -I$(top_srcdir) \ -I$(top_srcdir)/libbase \ Index: testsuite/misc-ming.all/Makefile.am =================================================================== RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v retrieving revision 1.26.2.6 diff -u -3 -p -r1.26.2.6 Makefile.am --- testsuite/misc-ming.all/Makefile.am 13 Nov 2006 14:22:29 -0000 1.26.2.6 +++ testsuite/misc-ming.all/Makefile.am 13 Nov 2006 23:03:31 -0000 @@ -30,7 +30,7 @@ CLEANFILES = \ testrun.log -INCLUDES = -I.. \ +AM_CPPFLAGS = -I.. \ -I$(top_srcdir) \ -I$(top_srcdir)/libbase \ -I$(top_srcdir)/server \ @@ -46,7 +46,6 @@ check_PROGRAMS = \ definebitsjpeg2 \ DefineEditTextTest \ DefineEditTextVariableNameTest \ - DefineEditTextVariableNameTest-Runner \ RollOverOutTest-Runner \ ButtonEventsTest-Runner \ spritehier \ Index: testsuite/movies.all/Makefile.am =================================================================== RCS file: /sources/gnash/gnash/testsuite/movies.all/Makefile.am,v retrieving revision 1.1.2.2 diff -u -3 -p -r1.1.2.2 Makefile.am --- testsuite/movies.all/Makefile.am 6 Nov 2006 16:44:51 -0000 1.1.2.2 +++ testsuite/movies.all/Makefile.am 13 Nov 2006 23:03:31 -0000 @@ -30,7 +30,7 @@ CLEANFILES = \ testrun.log -INCLUDES = -I.. \ +AM_CPPFLAGS = -I.. \ -I$(top_srcdir) \ -I$(top_srcdir)/libbase \ -I$(top_srcdir)/server \ Index: testsuite/samples/Makefile.am =================================================================== RCS file: /sources/gnash/gnash/testsuite/samples/Makefile.am,v retrieving revision 1.1.2.3 diff -u -3 -p -r1.1.2.3 Makefile.am --- testsuite/samples/Makefile.am 2 Nov 2006 11:52:24 -0000 1.1.2.3 +++ testsuite/samples/Makefile.am 13 Nov 2006 23:03:31 -0000 @@ -30,7 +30,7 @@ CLEANFILES = \ testrun.log -INCLUDES = -I.. \ +AM_CPPFLAGS = -I.. \ -I$(top_srcdir) \ -I$(top_srcdir)/libbase \ -I$(top_srcdir)/server \ Index: testsuite/server/Makefile.am =================================================================== RCS file: /sources/gnash/gnash/testsuite/server/Makefile.am,v retrieving revision 1.11.2.1 diff -u -3 -p -r1.11.2.1 Makefile.am --- testsuite/server/Makefile.am 30 Oct 2006 14:28:55 -0000 1.11.2.1 +++ testsuite/server/Makefile.am 13 Nov 2006 23:03:31 -0000 @@ -21,7 +21,7 @@ AUTOMAKE_OPTIONS = dejagnu -INCLUDES = -I.. \ +AM_CPPFLAGS = -I.. \ -I$(srcdir) \ -I$(top_srcdir)/testsuite \ -I$(top_srcdir)/libbase \ Index: utilities/Makefile.am =================================================================== RCS file: /sources/gnash/gnash/utilities/Makefile.am,v retrieving revision 1.34.2.3 diff -u -3 -p -r1.34.2.3 Makefile.am --- utilities/Makefile.am 13 Nov 2006 11:47:04 -0000 1.34.2.3 +++ utilities/Makefile.am 13 Nov 2006 23:03:31 -0000 @@ -27,7 +27,7 @@ GNASH_LIBS = \ $(top_builddir)/server/libgnashserver.la \ $(top_builddir)/libbase/libgnashbase.la -AM_CPPFLAGS = # -Wall +#AM_CPPFLAGS = # -Wall ## WARNING: make sure GLIB_LIBS appears first ## See: http://lists.gnu.org/archive/html/gnash-dev/2006-07/msg00076.html @@ -37,7 +37,7 @@ AM_LDFLAGS = \ # $(GLIB_LIBS) \ # $(PTHREAD_LIBS) -INCLUDES = -I.. \ +AM_CPPFLAGS = -I.. \ -I$(top_srcdir) \ -I$(top_srcdir)/libbase \ -I$(top_srcdir)/server \ @@ -46,13 +46,13 @@ INCLUDES = -I.. \ $(LIBXML_CFLAGS) if USE_FFMPEG_ENGINE - INCLUDES += $(FFMPEG_INCLS) - AM_LDFLAGS += $(FFMPEG_LIBS) + AM_CPPFLAGS += $(FFMPEG_INCLS) + GNASH_LIBS += $(FFMPEG_LIBS) endif if USE_MAD_ENGINE - INCLUDES += $(MAD_INCLS) - AM_LDFLAGS += $(MAD_LIBS) + AM_CPPFLAGS += $(MAD_INCLS) + GNASH_LIBS += $(MAD_LIBS) endif bin_PROGRAMS = gparser gprocessor
_______________________________________________ Gnash-dev mailing list [email protected] http://lists.gnu.org/mailman/listinfo/gnash-dev
