[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog Makefile.am backend/Makefile.am... [relea
|
From: |
Sandro Santilli |
|
Subject: |
[Gnash-commit] gnash ChangeLog Makefile.am backend/Makefile.am... [release_0_7_2] |
|
Date: |
Tue, 14 Nov 2006 08:34:24 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch: release_0_7_2
Changes by: Sandro Santilli <strk> 06/11/14 08:34:23
Modified files:
. : ChangeLog Makefile.am
backend : Makefile.am
gui : Makefile.am
libamf : Makefile.am
libbase : Makefile.am
libgeometry : Makefile.am
packaging/redhat: gnash.spec
plugin : Makefile.am
plugin/klash : Makefile.am
plugin/mozilla-sdk: Makefile.am
server : Makefile.am
server/asobj : Makefile.am
server/parser : Makefile.am
testsuite/actionscript.all: Makefile.am
testsuite/libbase: Makefile.am
testsuite/misc-ming.all: Makefile.am
testsuite/movies.all: Makefile.am
testsuite/samples: Makefile.am
testsuite/server: Makefile.am
utilities : Makefile.am
Log message:
Patch by Patrice Dumas <address@hidden>:
* 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
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.1412.2.167&r2=1.1412.2.168
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.44.2.4&r2=1.44.2.5
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/Makefile.am?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.44.2.3&r2=1.44.2.4
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.39.2.9&r2=1.39.2.10
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/Makefile.am?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.16.2.2&r2=1.16.2.3
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/Makefile.am?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.45.2.2&r2=1.45.2.3
http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/Makefile.am?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.19.2.2&r2=1.19.2.3
http://cvs.savannah.gnu.org/viewcvs/gnash/packaging/redhat/gnash.spec?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.11.2.6&r2=1.11.2.7
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/Makefile.am?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.50.2.6&r2=1.50.2.7
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/Makefile.am?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.17.2.3&r2=1.17.2.4
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/mozilla-sdk/Makefile.am?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.12.2.1&r2=1.12.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Makefile.am?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.80.2.5&r2=1.80.2.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Makefile.am?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.12.2.3&r2=1.12.2.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/Makefile.am?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.10.2.3&r2=1.10.2.4
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Makefile.am?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.40.2.1&r2=1.40.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libbase/Makefile.am?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.19.2.3&r2=1.19.2.4
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.26.2.6&r2=1.26.2.7
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/movies.all/Makefile.am?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/samples/Makefile.am?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/server/Makefile.am?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.11.2.1&r2=1.11.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/Makefile.am?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.34.2.3&r2=1.34.2.4
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1412.2.167
retrieving revision 1.1412.2.168
diff -u -b -r1.1412.2.167 -r1.1412.2.168
--- ChangeLog 14 Nov 2006 08:17:41 -0000 1.1412.2.167
+++ ChangeLog 14 Nov 2006 08:34:22 -0000 1.1412.2.168
@@ -1,3 +1,15 @@
+2006-11-14 Patrice Dumas <address@hidden>
+
+ * 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
+
2006-11-14 Sandro Santilli <address@hidden>
* plugin/klash/klash.cpp: fetch dbglogfile before use
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.44.2.4
retrieving revision 1.44.2.5
diff -u -b -r1.44.2.4 -r1.44.2.5
--- Makefile.am 11 Nov 2006 17:05:00 -0000 1.44.2.4
+++ Makefile.am 14 Nov 2006 08:34:22 -0000 1.44.2.5
@@ -16,7 +16,7 @@
#
#
-# $Id: Makefile.am,v 1.44.2.4 2006/11/11 17:05:00 strk Exp $
+# $Id: Makefile.am,v 1.44.2.5 2006/11/14 08:34:22 strk Exp $
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = 1.6.0
@@ -43,13 +43,7 @@
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
retrieving revision 1.44.2.4
diff -u -b -r1.44.2.3 -r1.44.2.4
--- backend/Makefile.am 11 Nov 2006 12:33:17 -0000 1.44.2.3
+++ backend/Makefile.am 14 Nov 2006 08:34:22 -0000 1.44.2.4
@@ -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 @@
$(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_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
retrieving revision 1.39.2.10
diff -u -b -r1.39.2.9 -r1.39.2.10
--- gui/Makefile.am 10 Nov 2006 22:01:42 -0000 1.39.2.9
+++ gui/Makefile.am 14 Nov 2006 08:34:22 -0000 1.39.2.10
@@ -17,11 +17,11 @@
#
-# $Id: Makefile.am,v 1.39.2.9 2006/11/10 22:01:42 nihilus Exp $
+# $Id: Makefile.am,v 1.39.2.10 2006/11/14 08:34:22 strk Exp $
AUTOMAKE_OPTIONS =
-INCLUDES = -I.. \
+AM_CPPFLAGS = -I.. \
-I$(top_srcdir) \
-I$(top_srcdir)/server \
-I$(top_srcdir)/server/parser \
@@ -51,11 +51,12 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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_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_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
retrieving revision 1.16.2.3
diff -u -b -r1.16.2.2 -r1.16.2.3
--- libamf/Makefile.am 10 Nov 2006 22:01:42 -0000 1.16.2.2
+++ libamf/Makefile.am 14 Nov 2006 08:34:22 -0000 1.16.2.3
@@ -18,12 +18,12 @@
#
#
-# $Id: Makefile.am,v 1.16.2.2 2006/11/10 22:01:42 nihilus Exp $
+# $Id: Makefile.am,v 1.16.2.3 2006/11/14 08:34:22 strk Exp $
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_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
retrieving revision 1.45.2.3
diff -u -b -r1.45.2.2 -r1.45.2.3
--- libbase/Makefile.am 10 Nov 2006 22:01:42 -0000 1.45.2.2
+++ libbase/Makefile.am 14 Nov 2006 08:34:22 -0000 1.45.2.3
@@ -21,7 +21,7 @@
EXTRA_DIST =
-INCLUDES = -I.. -I$(srcdir) \
+AM_CPPFLAGS = -I.. -I$(srcdir) \
-I$(top_srcdir) \
-I$(top_srcdir)/server \
$(PTHREAD_CFLAGS) \
@@ -34,8 +34,8 @@
$(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
retrieving revision 1.19.2.3
diff -u -b -r1.19.2.2 -r1.19.2.3
--- libgeometry/Makefile.am 10 Nov 2006 22:01:42 -0000 1.19.2.2
+++ libgeometry/Makefile.am 14 Nov 2006 08:34:23 -0000 1.19.2.3
@@ -18,12 +18,12 @@
#
#
-# $Id: Makefile.am,v 1.19.2.2 2006/11/10 22:01:42 nihilus Exp $
+# $Id: Makefile.am,v 1.19.2.3 2006/11/14 08:34:23 strk Exp $
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 @@
# 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
retrieving revision 1.11.2.7
diff -u -b -r1.11.2.6 -r1.11.2.7
--- packaging/redhat/gnash.spec 7 Nov 2006 19:11:07 -0000 1.11.2.6
+++ packaging/redhat/gnash.spec 14 Nov 2006 08:34:23 -0000 1.11.2.7
@@ -67,7 +67,13 @@
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 @@
%{_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
retrieving revision 1.50.2.7
diff -u -b -r1.50.2.6 -r1.50.2.7
--- plugin/Makefile.am 10 Nov 2006 23:40:15 -0000 1.50.2.6
+++ plugin/Makefile.am 14 Nov 2006 08:34:23 -0000 1.50.2.7
@@ -15,7 +15,7 @@
# 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.6 2006/11/10 23:40:15 nihilus Exp $
+# $Id: Makefile.am,v 1.50.2.7 2006/11/14 08:34:23 strk Exp $
AUTOMAKE_OPTIONS =
@@ -32,7 +32,11 @@
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 @@
$(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
retrieving revision 1.17.2.4
diff -u -b -r1.17.2.3 -r1.17.2.4
--- plugin/klash/Makefile.am 2 Nov 2006 00:09:57 -0000 1.17.2.3
+++ plugin/klash/Makefile.am 14 Nov 2006 08:34:23 -0000 1.17.2.4
@@ -15,9 +15,7 @@
# 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 $
+# $Id: Makefile.am,v 1.17.2.4 2006/11/14 08:34:23 strk Exp $
AUTOMAKE_OPTIONS =
@@ -58,22 +56,6 @@
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 @@
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_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/mozilla-sdk/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/mozilla-sdk/Makefile.am,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -b -r1.12.2.1 -r1.12.2.2
--- plugin/mozilla-sdk/Makefile.am 30 Oct 2006 14:28:47 -0000 1.12.2.1
+++ plugin/mozilla-sdk/Makefile.am 14 Nov 2006 08:34:23 -0000 1.12.2.2
@@ -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
retrieving revision 1.80.2.6
diff -u -b -r1.80.2.5 -r1.80.2.6
--- server/Makefile.am 13 Nov 2006 17:10:44 -0000 1.80.2.5
+++ server/Makefile.am 14 Nov 2006 08:34:23 -0000 1.80.2.6
@@ -18,12 +18,10 @@
#
#
-# $Id: Makefile.am,v 1.80.2.5 2006/11/13 17:10:44 strk Exp $
+# $Id: Makefile.am,v 1.80.2.6 2006/11/14 08:34:23 strk Exp $
AUTOMAKE_OPTIONS =
-AM_CPPFLAGS =
-
SUBDIRS = asobj parser
# noinst_LTLIBRARIES = libserver.la
@@ -31,7 +29,7 @@
# 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
retrieving revision 1.12.2.4
diff -u -b -r1.12.2.3 -r1.12.2.4
--- server/asobj/Makefile.am 13 Nov 2006 17:10:44 -0000 1.12.2.3
+++ server/asobj/Makefile.am 14 Nov 2006 08:34:23 -0000 1.12.2.4
@@ -18,16 +18,13 @@
#
#
-# $Id: Makefile.am,v 1.12.2.3 2006/11/13 17:10:44 strk Exp $
+# $Id: Makefile.am,v 1.12.2.4 2006/11/14 08:34:23 strk Exp $
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
retrieving revision 1.10.2.4
diff -u -b -r1.10.2.3 -r1.10.2.4
--- server/parser/Makefile.am 13 Nov 2006 17:10:44 -0000 1.10.2.3
+++ server/parser/Makefile.am 14 Nov 2006 08:34:23 -0000 1.10.2.4
@@ -18,12 +18,10 @@
#
#
-# $Id: Makefile.am,v 1.10.2.3 2006/11/13 17:10:44 strk Exp $
+# $Id: Makefile.am,v 1.10.2.4 2006/11/14 08:34:23 strk Exp $
AUTOMAKE_OPTIONS =
-AM_CPPFLAGS =
-
noinst_LTLIBRARIES = libgnashparser.la
# Only enable if we're configured with --enable-mp3
@@ -31,7 +29,7 @@
# 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
retrieving revision 1.40.2.2
diff -u -b -r1.40.2.1 -r1.40.2.2
--- testsuite/actionscript.all/Makefile.am 30 Oct 2006 14:28:55 -0000
1.40.2.1
+++ testsuite/actionscript.all/Makefile.am 14 Nov 2006 08:34:23 -0000
1.40.2.2
@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-# $Id: Makefile.am,v 1.40.2.1 2006/10/30 14:28:55 rsavoye Exp $
+# $Id: Makefile.am,v 1.40.2.2 2006/11/14 08:34:23 strk Exp $
AUTOMAKE_OPTIONS = dejagnu
@@ -25,7 +25,7 @@
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
retrieving revision 1.19.2.4
diff -u -b -r1.19.2.3 -r1.19.2.4
--- testsuite/libbase/Makefile.am 11 Nov 2006 00:15:49 -0000 1.19.2.3
+++ testsuite/libbase/Makefile.am 14 Nov 2006 08:34:23 -0000 1.19.2.4
@@ -25,6 +25,8 @@
$(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
retrieving revision 1.26.2.7
diff -u -b -r1.26.2.6 -r1.26.2.7
--- testsuite/misc-ming.all/Makefile.am 13 Nov 2006 14:22:29 -0000 1.26.2.6
+++ testsuite/misc-ming.all/Makefile.am 14 Nov 2006 08:34:23 -0000 1.26.2.7
@@ -30,7 +30,7 @@
testrun.log
-INCLUDES = -I.. \
+AM_CPPFLAGS = -I.. \
-I$(top_srcdir) \
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/server \
Index: testsuite/movies.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/movies.all/Makefile.am,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- testsuite/movies.all/Makefile.am 6 Nov 2006 16:44:51 -0000 1.1.2.2
+++ testsuite/movies.all/Makefile.am 14 Nov 2006 08:34:23 -0000 1.1.2.3
@@ -30,7 +30,7 @@
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
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- testsuite/samples/Makefile.am 2 Nov 2006 11:52:24 -0000 1.1.2.3
+++ testsuite/samples/Makefile.am 14 Nov 2006 08:34:23 -0000 1.1.2.4
@@ -30,7 +30,7 @@
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
retrieving revision 1.11.2.2
diff -u -b -r1.11.2.1 -r1.11.2.2
--- testsuite/server/Makefile.am 30 Oct 2006 14:28:55 -0000 1.11.2.1
+++ testsuite/server/Makefile.am 14 Nov 2006 08:34:23 -0000 1.11.2.2
@@ -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
retrieving revision 1.34.2.4
diff -u -b -r1.34.2.3 -r1.34.2.4
--- utilities/Makefile.am 13 Nov 2006 11:47:04 -0000 1.34.2.3
+++ utilities/Makefile.am 14 Nov 2006 08:34:23 -0000 1.34.2.4
@@ -27,7 +27,7 @@
$(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 @@
# $(GLIB_LIBS) \
# $(PTHREAD_LIBS)
-INCLUDES = -I.. \
+AM_CPPFLAGS = -I.. \
-I$(top_srcdir) \
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/server \
@@ -46,13 +46,13 @@
$(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
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog Makefile.am backend/Makefile.am... [release_0_7_2],
Sandro Santilli <=