[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-
|
From: |
Benjamin Wolsey |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-487-g37ba60d |
|
Date: |
Sat, 02 Apr 2011 08:32:13 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".
The branch, master has been updated
via 37ba60ddd38716514d2399583272868dcb3e3575 (commit)
via 5b296ff7bfd2f3b4731545efa90263b0ba48dcf4 (commit)
via ce72b1d1b5ea6a4d6d0a47a18d08d181fc41ac10 (commit)
via 025f6d787bfd2cc8eb2c5a32f672e48f26e221fa (commit)
via 9fc9334294e74255c36c0c43c0f01e842d6667c7 (commit)
via e38f8eefe8eb0ae8923a945d40719b1dcbfc8689 (commit)
via 538ba752210c40cfa5bdd79ed9ff95b0094885a7 (commit)
via fb218d030b3532a69c2cb1f65a6a6afaa5ff31e0 (commit)
via 17531561f77863bbc62ac78752f8f917f86f4879 (commit)
via bc436656d96adeb98b2f27c924bda25c92efff45 (commit)
via 6c5b73a647ef4e03cabf2e0c2fe6290779db250c (commit)
via fefd575617b721d9b6b2a2c2ffa08c14fe836fa5 (commit)
from 21468b79d0ff820cc48e8f54b667c03df81e9621 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=37ba60ddd38716514d2399583272868dcb3e3575
commit 37ba60ddd38716514d2399583272868dcb3e3575
Author: Benjamin Wolsey <address@hidden>
Date: Sat Apr 2 09:33:50 2011 +0200
Don't link to or include things without reason.
diff --git a/libbase/Makefile.am b/libbase/Makefile.am
index 32eeb84..dfc54e7 100644
--- a/libbase/Makefile.am
+++ b/libbase/Makefile.am
@@ -30,10 +30,7 @@ libgnashbase_la_CPPFLAGS = -DPLUGINSDIR=\"$(pluginsdir)\" \
$(PTHREAD_CFLAGS) \
$(PNG_CFLAGS) \
$(GIF_CFLAGS) \
- $(GLIB_CFLAGS) \
- $(GSTREAMER_CFLAGS) \
$(CURL_CFLAGS) \
- $(OPENGL_CFLAGS) \
$(Z_CFLAGS) \
$(JPEG_CFLAGS) \
$(BOOST_CFLAGS) \
@@ -52,7 +49,6 @@ libgnashbase_la_LIBADD = \
$(GIF_LIBS) \
$(Z_LIBS) \
$(CURL_LIBS) \
- $(OPENGL_LIBS) \
$(LIBINTL) \
$(BOOST_LIBS) \
$(PTHREAD_LIBS) \
http://git.savannah.gnu.org/cgit//commit/?id=5b296ff7bfd2f3b4731545efa90263b0ba48dcf4
commit 5b296ff7bfd2f3b4731545efa90263b0ba48dcf4
Author: Benjamin Wolsey <address@hidden>
Date: Sat Apr 2 09:33:10 2011 +0200
Don't use CFLAGS unnecessarily.
diff --git a/libcore/parser/Makefile.am b/libcore/parser/Makefile.am
index b0fb02d..d334fab 100644
--- a/libcore/parser/Makefile.am
+++ b/libcore/parser/Makefile.am
@@ -38,9 +38,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/libmedia \
-I$(top_srcdir)/libsound \
- $(GLIB_CFLAGS) \
$(BOOST_CFLAGS) \
- $(FREETYPE2_CFLAGS) \
$(NULL)
libgnashparser_la_SOURCES = \
http://git.savannah.gnu.org/cgit//commit/?id=ce72b1d1b5ea6a4d6d0a47a18d08d181fc41ac10
commit ce72b1d1b5ea6a4d6d0a47a18d08d181fc41ac10
Author: Benjamin Wolsey <address@hidden>
Date: Sat Apr 2 09:28:37 2011 +0200
Don't link to libs unnecessarily.
diff --git a/utilities/Makefile.am b/utilities/Makefile.am
index 3c4895a..2753692 100644
--- a/utilities/Makefile.am
+++ b/utilities/Makefile.am
@@ -32,16 +32,10 @@ GNASH_LIBS = \
$(top_builddir)/librender/libgnashrender.la \
$(NULL)
-## WARNING: make sure GLIB_LIBS appears first
-## See: http://lists.gnu.org/archive/html/gnash-dev/2006-07/msg00076.html
AM_LDFLAGS = \
$(LIBINTL) \
$(LIBADD_DL) \
- $(CURL_LIBS) \
- $(JPEG_LIBS) \
- $(PNG_LIBS) \
$(BOOST_LIBS) \
- $(PYTHON_LIBS) \
$(NULL)
# bzip2 is a dependency of some libraries with mingw32
http://git.savannah.gnu.org/cgit//commit/?id=025f6d787bfd2cc8eb2c5a32f672e48f26e221fa
commit 025f6d787bfd2cc8eb2c5a32f672e48f26e221fa
Author: Benjamin Wolsey <address@hidden>
Date: Sat Apr 2 09:27:16 2011 +0200
Don't link to libglib unless using gtk. Don't link
to other libraries unnecessarily.
diff --git a/gui/Makefile.am b/gui/Makefile.am
index a2f385f..a7ab3be 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -80,10 +80,7 @@ AM_CPPFLAGS = \
-DLOCALEDIR=\"$(localedir)\" \
-DPLUGINSDIR=\"$(pluginsdir)\" \
-DLIBAVCODEC_IDENT=\"$(LIBAVCODEC_IDENT)\" \
- $(GLIB_CFLAGS) \
- $(LIRC_CFLAGS) \
$(BOOST_CFLAGS) \
- $(PYTHON_LIBS) \
$(NULL)
GTK_CFLAGS = \
@@ -95,12 +92,12 @@ GTK_CFLAGS = \
$(CAIRO_CFLAGS)
GTK_LIBS = \
+ $(GLIB_LIBS) \
$(GTK2_LIBS) \
$(GLEXT_LIBS) \
$(CAIRO_LIBS) \
$(PANGO_LIBS) \
$(ATK_LIBS) \
- $(GLIB_LIBS) \
$(EXPAT_LIBS) \
$(X11_LIBS) \
$(Z_LIBS)
@@ -108,15 +105,8 @@ GTK_LIBS = \
# The following will be filled up later
GUI_CPPFLAGS =
-## WARNING: make sure GLIB_LIBS appears first
-## See: http://lists.gnu.org/archive/html/gnash-dev/2006-07/msg00076.html
AM_LDFLAGS = \
- $(GLIB_LIBS) \
- $(CURL_LIBS) \
- $(JPEG_LIBS) \
- $(PNG_LIBS) \
$(INTLLIBS) \
- $(TS_LIBS) \
$(BOOST_LIBS) \
$(NULL)
@@ -133,9 +123,6 @@ if WIN32
LIB_FLAGS += --enable-auto-import
endif
-# endif # DYNAMIC_GUI
-
-
if USE_FFMPEG_ENGINE
AM_LDFLAGS += $(FFMPEG_LIBS) $(LIBVA_LIBS) $(LIBVA_X11_LIBS)
AM_CPPFLAGS += $(FFMPEG_CFLAGS)
@@ -147,14 +134,6 @@ AM_CPPFLAGS += $(GSTREAMER_CFLAGS)
AM_LDFLAGS += $(GST_STUFF)
endif
-# if USE_GUI_FLTK
-# FLTK_SRCS = fltk.cpp fltksup.h $(FLTK_AGG_SRCS) $(FLTK_CAIRO_SRCS)
-# AM_CPPFLAGS += $(FLTK2_CFLAGS) $(X11_CFLAGS)
-# AM_LDFLAGS += $(FLTK2_LIBS) $(XFT_LIBS) $(X11_LIBS)
-# else
-# FLTK_SRCS =
-# endif
-
AM_CPPFLAGS += -DPKGDATADIR="\"$(pkgdatadir)\""
AM_CPPFLAGS += -DRENDERER_CONFIG="\"$(RENDERER_CONFIG)\""
AM_CPPFLAGS += -DHWACCEL_CONFIG="\"$(HWACCEL_CONFIG)\""
http://git.savannah.gnu.org/cgit//commit/?id=9fc9334294e74255c36c0c43c0f01e842d6667c7
commit 9fc9334294e74255c36c0c43c0f01e842d6667c7
Author: Benjamin Wolsey <address@hidden>
Date: Sat Apr 2 09:19:43 2011 +0200
Drop unneeded CFLAGS.
diff --git a/libcore/vm/Makefile.am b/libcore/vm/Makefile.am
index 0f5e717..b940fce 100644
--- a/libcore/vm/Makefile.am
+++ b/libcore/vm/Makefile.am
@@ -32,9 +32,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/libmedia \
-I$(top_srcdir)/libsound \
- $(GLIB_CFLAGS) \
$(BOOST_CFLAGS) \
- $(FFMPEG_CFLAGS) \
$(NULL)
libgnashvm_la_SOURCES = \
http://git.savannah.gnu.org/cgit//commit/?id=e38f8eefe8eb0ae8923a945d40719b1dcbfc8689
commit e38f8eefe8eb0ae8923a945d40719b1dcbfc8689
Author: Benjamin Wolsey <address@hidden>
Date: Sat Apr 2 09:18:06 2011 +0200
There are no OGG_CFLAGS.
diff --git a/Makefile.am b/Makefile.am
index 327b85d..b504388 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -221,8 +221,6 @@ endif
if USE_FFMPEG_ENGINE
@echo " FFMPEG_CFLAGS is $(FFMPEG_CFLAGS)"
@echo " FFMPEG_LIBS is $(FFMPEG_LIBS)"
- @echo " OGG_CFLAGS is $(OGG_CFLAGS)"
- @echo " OGG_LIBS is $(OGG_LIBS)"
endif
if HAVE_SPEEX
@echo " SPEEX_CFLAGS is $(SPEEX_CFLAGS)"
diff --git a/testsuite/actionscript.all/Makefile.am
b/testsuite/actionscript.all/Makefile.am
index dea50b9..14f4158 100644
--- a/testsuite/actionscript.all/Makefile.am
+++ b/testsuite/actionscript.all/Makefile.am
@@ -62,7 +62,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/testsuite \
$(OPENGL_CFLAGS) \
$(MP3_CFLAGS) \
- $(OGG_CFLAGS) \
$(MING_CFLAGS) \
$(SDL_CFLAGS) \
$(NULL)
http://git.savannah.gnu.org/cgit//commit/?id=538ba752210c40cfa5bdd79ed9ff95b0094885a7
commit 538ba752210c40cfa5bdd79ed9ff95b0094885a7
Author: Benjamin Wolsey <address@hidden>
Date: Sat Apr 2 09:15:57 2011 +0200
Don't include everything imaginable.
diff --git a/librender/Makefile.am b/librender/Makefile.am
index 9ceedb5..32f27ae 100644
--- a/librender/Makefile.am
+++ b/librender/Makefile.am
@@ -25,8 +25,6 @@ AUTOMAKE_OPTIONS =
# this is where Gnash plugins get installed
pluginsdir = $(libdir)/gnash/plugins
-## WARNING: make sure GLIB_LIBS appears first
-## See: http://lists.gnu.org/archive/html/gnash-dev/2006-07/msg00076.html
AM_CPPFLAGS = -I.. \
-I$(srcdir) \
-I$(top_srcdir) \
@@ -35,14 +33,6 @@ AM_CPPFLAGS = -I.. \
-I$(top_srcdir)/libcore/swf \
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/librender \
- $(SDL_CFLAGS) \
- $(PANGO_CFLAGS) \
- $(GLIB_CFLAGS) \
- $(ATK_CFLAGS) \
- $(DMALLOC_CFLAGS) \
- $(PNG_CFLAGS) \
- $(JPEG_CFLAGS) \
- $(OGG_CFLAGS) \
$(BOOST_CFLAGS) \
$(OPENGL_CFLAGS) \
$(AGG_CFLAGS) \
http://git.savannah.gnu.org/cgit//commit/?id=fb218d030b3532a69c2cb1f65a6a6afaa5ff31e0
commit fb218d030b3532a69c2cb1f65a6a6afaa5ff31e0
Author: Benjamin Wolsey <address@hidden>
Date: Sat Apr 2 09:13:17 2011 +0200
Drop obsolete linker flag.
diff --git a/libsound/Makefile.am b/libsound/Makefile.am
index 3bd0de8..5e2ef65 100644
--- a/libsound/Makefile.am
+++ b/libsound/Makefile.am
@@ -23,7 +23,6 @@ pkglib_LTLIBRARIES = libgnashsound.la
libgnashsound_la_CPPFLAGS = \
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/libmedia \
- $(DMALLOC_CFLAGS) \
$(BOOST_CFLAGS) \
$(SDL_CFLAGS) \
$(NULL)
http://git.savannah.gnu.org/cgit//commit/?id=17531561f77863bbc62ac78752f8f917f86f4879
commit 17531561f77863bbc62ac78752f8f917f86f4879
Author: Benjamin Wolsey <address@hidden>
Date: Sat Apr 2 09:12:58 2011 +0200
Don't link to everything imaginable.
diff --git a/libmedia/Makefile.am b/libmedia/Makefile.am
index afdc777..4be42c3 100644
--- a/libmedia/Makefile.am
+++ b/libmedia/Makefile.am
@@ -29,13 +29,6 @@ pkglib_LTLIBRARIES = libgnashmedia.la
libgnashmedia_la_CPPFLAGS = \
-I$(top_srcdir)/libbase \
- $(OPENGL_CFLAGS) \
- $(PNG_CFLAGS) \
- $(GLIB_CFLAGS) \
- $(CURL_CFLAGS) \
- $(Z_CFLAGS) \
- $(JPEG_CFLAGS) \
- $(GIF_CFLAGS) \
$(BOOST_CFLAGS) \
$(NULL)
@@ -43,19 +36,8 @@ if ANDROID
libgnashmedia_la_CPPFLAGS += $(ANDROID_NDK)/usr/include
endif
-
-# These headers get installed
-# include_HEADERS = log.h err.h
-
libgnashmedia_la_LIBADD = \
$(top_builddir)/libbase/libgnashbase.la \
- $(FFMPEG_LIBS) \
- $(PNG_LIBS) \
- $(JPEG_LIBS) \
- $(GIF_LIBS) \
- $(Z_LIBS) \
- $(CURL_LIBS) \
- $(OPENGL_LIBS) \
$(BOOST_LIBS) \
$(NULL)
http://git.savannah.gnu.org/cgit//commit/?id=bc436656d96adeb98b2f27c924bda25c92efff45
commit bc436656d96adeb98b2f27c924bda25c92efff45
Author: Benjamin Wolsey <address@hidden>
Date: Sat Apr 2 09:08:48 2011 +0200
Don't use pthread cflags except in libbase.
diff --git a/extensions/fileio/Makefile.am b/extensions/fileio/Makefile.am
index a7fbfc7..29d54d1 100644
--- a/extensions/fileio/Makefile.am
+++ b/extensions/fileio/Makefile.am
@@ -36,7 +36,6 @@ INCLUDES = \
-I$(top_srcdir)/libcore/parser \
-I$(top_srcdir)/libcore/asobj \
$(BOOST_CFLAGS) \
- $(PTHREAD_CFLAGS) \
$(NULL)
AM_LDFLAGS = \
diff --git a/extensions/gtk2/Makefile.am b/extensions/gtk2/Makefile.am
index 02cb286..e5bc749 100644
--- a/extensions/gtk2/Makefile.am
+++ b/extensions/gtk2/Makefile.am
@@ -35,7 +35,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/libcore/asobj \
$(SDL_CFLAGS) \
$(BOOST_CFLAGS) \
- $(PTHREAD_CFLAGS) \
$(GTK2_CFLAGS) \
$(GLEXT_CFLAGS) \
$(GLIB_CFLAGS) \
diff --git a/gui/Makefile.am b/gui/Makefile.am
index 1c94936..a2f385f 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -84,7 +84,6 @@ AM_CPPFLAGS = \
$(LIRC_CFLAGS) \
$(BOOST_CFLAGS) \
$(PYTHON_LIBS) \
- $(PTHREAD_CFLAGS) \
$(NULL)
GTK_CFLAGS = \
diff --git a/gui/dump/Makefile.am b/gui/dump/Makefile.am
index 5fcce56..dc23651 100644
--- a/gui/dump/Makefile.am
+++ b/gui/dump/Makefile.am
@@ -51,7 +51,6 @@ AM_CPPFLAGS = \
$(LIRC_CFLAGS) \
$(BOOST_CFLAGS) \
$(PYTHON_LIBS) \
- $(PTHREAD_CFLAGS) \
$(NULL)
AM_CPPFLAGS += -DPKGDATADIR="\"$(pkgdatadir)\""
diff --git a/gui/fb/Makefile.am b/gui/fb/Makefile.am
index 5359a12..487f09e 100644
--- a/gui/fb/Makefile.am
+++ b/gui/fb/Makefile.am
@@ -49,7 +49,6 @@ AM_CPPFLAGS = \
$(LIRC_CFLAGS) \
$(BOOST_CFLAGS) \
$(PYTHON_LIBS) \
- $(PTHREAD_CFLAGS) \
$(NULL)
AM_CPPFLAGS += -DPKGDATADIR="\"$(pkgdatadir)\""
diff --git a/libcore/Makefile.am b/libcore/Makefile.am
index 696a9f1..5ec61fa 100644
--- a/libcore/Makefile.am
+++ b/libcore/Makefile.am
@@ -42,7 +42,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/libmedia \
-I$(top_srcdir)/libsound \
- $(PTHREAD_CFLAGS) \
$(GLIB_CFLAGS) \
$(BOOST_CFLAGS) \
$(FREETYPE2_CFLAGS) \
diff --git a/libcore/parser/Makefile.am b/libcore/parser/Makefile.am
index 48d8f39..b0fb02d 100644
--- a/libcore/parser/Makefile.am
+++ b/libcore/parser/Makefile.am
@@ -39,7 +39,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/libmedia \
-I$(top_srcdir)/libsound \
$(GLIB_CFLAGS) \
- $(PTHREAD_CFLAGS) \
$(BOOST_CFLAGS) \
$(FREETYPE2_CFLAGS) \
$(NULL)
diff --git a/libcore/vm/Makefile.am b/libcore/vm/Makefile.am
index 2d06949..0f5e717 100644
--- a/libcore/vm/Makefile.am
+++ b/libcore/vm/Makefile.am
@@ -33,7 +33,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/libmedia \
-I$(top_srcdir)/libsound \
$(GLIB_CFLAGS) \
- $(PTHREAD_CFLAGS) \
$(BOOST_CFLAGS) \
$(FFMPEG_CFLAGS) \
$(NULL)
diff --git a/libmedia/Makefile.am b/libmedia/Makefile.am
index b40c623..afdc777 100644
--- a/libmedia/Makefile.am
+++ b/libmedia/Makefile.am
@@ -29,7 +29,6 @@ pkglib_LTLIBRARIES = libgnashmedia.la
libgnashmedia_la_CPPFLAGS = \
-I$(top_srcdir)/libbase \
- $(PTHREAD_CFLAGS) \
$(OPENGL_CFLAGS) \
$(PNG_CFLAGS) \
$(GLIB_CFLAGS) \
diff --git a/librender/Makefile.am b/librender/Makefile.am
index 7498b73..9ceedb5 100644
--- a/librender/Makefile.am
+++ b/librender/Makefile.am
@@ -35,7 +35,6 @@ AM_CPPFLAGS = -I.. \
-I$(top_srcdir)/libcore/swf \
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/librender \
- $(PTHREAD_CFLAGS) \
$(SDL_CFLAGS) \
$(PANGO_CFLAGS) \
$(GLIB_CFLAGS) \
diff --git a/libsound/Makefile.am b/libsound/Makefile.am
index 83eac76..3bd0de8 100644
--- a/libsound/Makefile.am
+++ b/libsound/Makefile.am
@@ -23,7 +23,6 @@ pkglib_LTLIBRARIES = libgnashsound.la
libgnashsound_la_CPPFLAGS = \
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/libmedia \
- $(PTHREAD_CFLAGS) \
$(DMALLOC_CFLAGS) \
$(BOOST_CFLAGS) \
$(SDL_CFLAGS) \
diff --git a/testsuite/libbase.all/Makefile.am
b/testsuite/libbase.all/Makefile.am
index f0c0a81..3566f65 100644
--- a/testsuite/libbase.all/Makefile.am
+++ b/testsuite/libbase.all/Makefile.am
@@ -29,7 +29,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/testsuite \
$(MING_CFLAGS) \
$(BOOST_CFLAGS) \
- $(PTHREAD_CFLAGS) \
$(DEJAGNU_CFLAGS) \
$(NULL)
diff --git a/testsuite/libmedia.all/Makefile.am
b/testsuite/libmedia.all/Makefile.am
index b1e1e2c..8f0c7d4 100644
--- a/testsuite/libmedia.all/Makefile.am
+++ b/testsuite/libmedia.all/Makefile.am
@@ -44,7 +44,6 @@ INCLUDES = \
-DLOCALEDIR=\"$(localedir)\" \
$(BOOST_CFLAGS) \
$(DEJAGNU_CFLAGS) \
- $(PTHREAD_CFLAGS) \
$(GSTREAMER_CFLAGS) \
$(GSTAPP_CFLAGS) \
$(GSTINTERFACES_CFLAGS)
diff --git a/utilities/Makefile.am b/utilities/Makefile.am
index 0d3fc47..3c4895a 100644
--- a/utilities/Makefile.am
+++ b/utilities/Makefile.am
@@ -69,7 +69,6 @@ AM_CPPFLAGS = \
$(GSTREAMER_PLUGINS_BASE_CFLAGS) \
$(GLIB_CFLAGS) \
$(BOOST_CFLAGS) \
- $(PTHREAD_CFLAGS) \
$(NULL)
if WIN32
http://git.savannah.gnu.org/cgit//commit/?id=6c5b73a647ef4e03cabf2e0c2fe6290779db250c
commit 6c5b73a647ef4e03cabf2e0c2fe6290779db250c
Author: Benjamin Wolsey <address@hidden>
Date: Sat Apr 2 09:00:25 2011 +0200
Link pthread libs only in libbase.
diff --git a/cygnal/Makefile.am b/cygnal/Makefile.am
index bc93059..14b5876 100644
--- a/cygnal/Makefile.am
+++ b/cygnal/Makefile.am
@@ -58,7 +58,6 @@ AM_LDFLAGS = \
$(CURL_LIBS) \
$(BOOST_LIBS) \
$(BOOST_CYGNAL_LIBS) \
- $(PTHREAD_LIBS) \
$(NULL)
localedir = $(datadir)/locale
diff --git a/cygnal/cgi-bin/echo/Makefile.am b/cygnal/cgi-bin/echo/Makefile.am
index 40a447a..29e9f5c 100644
--- a/cygnal/cgi-bin/echo/Makefile.am
+++ b/cygnal/cgi-bin/echo/Makefile.am
@@ -29,7 +29,6 @@ GNASH_LIBS = \
../../libamf/libgnashamf.la \
../../libnet/libgnashnet.la \
$(BOOST_LIBS) \
- $(PTHREAD_LIBS) \
$(NULL)
INCLUDES = \
diff --git a/cygnal/cgi-bin/fitcDemo/Makefile.am
b/cygnal/cgi-bin/fitcDemo/Makefile.am
index 6f6be4f..400f191 100644
--- a/cygnal/cgi-bin/fitcDemo/Makefile.am
+++ b/cygnal/cgi-bin/fitcDemo/Makefile.am
@@ -28,7 +28,6 @@ GNASH_LIBS = \
$(top_builddir)/libcore/libgnashcore.la \
$(top_builddir)/libamf/libgnashamf.la \
$(top_builddir)/libnet/libgnashnet.la \
- $(PTHREAD_LIBS) \
$(BOOST_CFLAGS) \
$(NULL)
diff --git a/cygnal/cgi-bin/oflaDemo/Makefile.am
b/cygnal/cgi-bin/oflaDemo/Makefile.am
index 8a57e65..bc7595f 100644
--- a/cygnal/cgi-bin/oflaDemo/Makefile.am
+++ b/cygnal/cgi-bin/oflaDemo/Makefile.am
@@ -29,7 +29,6 @@ GNASH_LIBS = \
../../libamf/libgnashamf.la \
../../libnet/libgnashnet.la \
$(BOOST_LIBS) \
- $(PTHREAD_LIBS) \
$(NULL)
INCLUDES = \
diff --git a/cygnal/libnet/Makefile.am b/cygnal/libnet/Makefile.am
index 5bfdc6d..3a867b1 100644
--- a/cygnal/libnet/Makefile.am
+++ b/cygnal/libnet/Makefile.am
@@ -33,7 +33,6 @@ AM_LDFLAGS = \
$(LIBADD_DL) \
$(BOOST_LIBS) \
$(BOOST_CYGNAL_LIBS) \
- $(PTHREAD_LIBS) \
$(NULL)
libgnashnet_la_LDFLAGS = -release $(VERSION) $(AM_LDFLAGS)
diff --git a/cygnal/testsuite/cygnal.all/Makefile.am
b/cygnal/testsuite/cygnal.all/Makefile.am
index 60a33fe..79c89d8 100644
--- a/cygnal/testsuite/cygnal.all/Makefile.am
+++ b/cygnal/testsuite/cygnal.all/Makefile.am
@@ -36,7 +36,7 @@ AM_LDFLAGS = \
$(top_builddir)/libnet/libgnashnet.la \
$(top_builddir)/cygnal/libcygnal.la \
$(BOOST_LIBS) \
- $(PTHREAD_LIBS)
+ $(NULL)
localedir = $(datadir)/locale
diff --git a/cygnal/testsuite/libamf.all/Makefile.am
b/cygnal/testsuite/libamf.all/Makefile.am
index eeabd7f..59347b9 100644
--- a/cygnal/testsuite/libamf.all/Makefile.am
+++ b/cygnal/testsuite/libamf.all/Makefile.am
@@ -28,7 +28,6 @@ AM_LDFLAGS = \
$(CURL_LIBS) \
$(BOOST_LIBS) \
$(DEJAGNU_CFLAGS) \
- $(PTHREAD_LIBS) \
$(NULL)
AM_CPPFLAGS = -DSRCDIR=\"$(srcdir)\"
diff --git a/cygnal/testsuite/libnet.all/Makefile.am
b/cygnal/testsuite/libnet.all/Makefile.am
index fb829e0..e9ab950 100644
--- a/cygnal/testsuite/libnet.all/Makefile.am
+++ b/cygnal/testsuite/libnet.all/Makefile.am
@@ -31,7 +31,7 @@ AM_LDFLAGS = \
$(top_builddir)/libsound/libgnashsound.la \
$(BOOST_LIBS) \
$(DEJAGNU_CFLAGS) \
- $(PTHREAD_LIBS)
+ $(NULL)
localedir = $(datadir)/locale
diff --git a/extensions/dbus/Makefile.am b/extensions/dbus/Makefile.am
index 954268c..ea79595 100644
--- a/extensions/dbus/Makefile.am
+++ b/extensions/dbus/Makefile.am
@@ -39,7 +39,6 @@ dbus_la_LIBADD = $(LIBADD_DL) \
$(top_builddir)/libbase/libgnashbase.la \
$(top_builddir)/libcore/libgnashcore.la \
$(BOOST_LIBS) \
- $(PTHREAD_LIBS) \
$(NULL)
check_PROGRAMS = # SharedTest
diff --git a/extensions/dejagnu/Makefile.am b/extensions/dejagnu/Makefile.am
index 7424c61..4bdc46b 100644
--- a/extensions/dejagnu/Makefile.am
+++ b/extensions/dejagnu/Makefile.am
@@ -37,7 +37,6 @@ AM_LDFLAGS = \
$(top_builddir)/libbase/libgnashbase.la \
$(top_builddir)/libcore/libgnashcore.la \
$(BOOST_LIBS) \
- $(PTHREAD_LIBS) \
$(NULL)
dejagnu_la_SOURCES = dejagnu.cpp dejagnu.h
diff --git a/extensions/fileio/Makefile.am b/extensions/fileio/Makefile.am
index ea39a17..a7fbfc7 100644
--- a/extensions/fileio/Makefile.am
+++ b/extensions/fileio/Makefile.am
@@ -43,7 +43,6 @@ AM_LDFLAGS = \
$(top_builddir)/libbase/libgnashbase.la \
$(top_builddir)/libcore/libgnashcore.la \
$(BOOST_LIBS) \
- $(PTHREAD_LIBS) \
$(NULL)
fileio_la_SOURCES = fileio.cpp fileio.h
diff --git a/extensions/gtk2/Makefile.am b/extensions/gtk2/Makefile.am
index f4e10e6..02cb286 100644
--- a/extensions/gtk2/Makefile.am
+++ b/extensions/gtk2/Makefile.am
@@ -55,7 +55,6 @@ AM_LDFLAGS = \
$(GLIB_LIBS) \
$(EXPAT_LIBS) \
$(BOOST_LIBS) \
- $(PTHREAD_LIBS) \
$(NULL)
gtkext_la_SOURCES = gtkext.cpp gtkext.h
diff --git a/extensions/lirc/Makefile.am b/extensions/lirc/Makefile.am
index 40f7d62..875bc05 100644
--- a/extensions/lirc/Makefile.am
+++ b/extensions/lirc/Makefile.am
@@ -40,7 +40,6 @@ lirc_la_LDFLAGS = -module -avoid-version -no-undefined
lirc_la_LIBADD = $(LIBADD_DL) \
$(top_builddir)/libbase/libgnashbase.la \
$(top_builddir)/libcore/libgnashcore.la \
- $(PTHREAD_LIBS) \
$(NULL)
check_PROGRAMS = # SharedTest
diff --git a/extensions/mysql/Makefile.am b/extensions/mysql/Makefile.am
index b73d4a5..33af7a8 100644
--- a/extensions/mysql/Makefile.am
+++ b/extensions/mysql/Makefile.am
@@ -38,7 +38,6 @@ AM_LDFLAGS = \
$(MYSQL_LIBS) \
$(top_builddir)/libcore/libgnashcore.la \
$(BOOST_LIBS) \
- $(PTHREAD_LIBS) \
$(NULL)
mysql_la_SOURCES = mysql_db.cpp mysql_db.h
diff --git a/gui/Makefile.am b/gui/Makefile.am
index 82f89d0..1c94936 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -119,7 +119,6 @@ AM_LDFLAGS = \
$(INTLLIBS) \
$(TS_LIBS) \
$(BOOST_LIBS) \
- $(PTHREAD_LIBS) \
$(NULL)
diff --git a/gui/dump/Makefile.am b/gui/dump/Makefile.am
index 77e4614..5fcce56 100644
--- a/gui/dump/Makefile.am
+++ b/gui/dump/Makefile.am
@@ -72,7 +72,6 @@ AM_LDFLAGS = \
$(INTLLIBS) \
$(TS_LIBS) \
$(BOOST_LIBS) \
- $(PTHREAD_LIBS) \
$(NULL)
if USE_FFMPEG_ENGINE
diff --git a/gui/fb/Makefile.am b/gui/fb/Makefile.am
index 5f30e1f..5359a12 100644
--- a/gui/fb/Makefile.am
+++ b/gui/fb/Makefile.am
@@ -69,7 +69,6 @@ AM_LDFLAGS = \
$(INTLLIBS) \
$(TS_LIBS) \
$(BOOST_LIBS) \
- $(PTHREAD_LIBS) \
$(NULL)
if USE_FFMPEG_ENGINE
diff --git a/libcore/Makefile.am b/libcore/Makefile.am
index 0ce4fd7..696a9f1 100644
--- a/libcore/Makefile.am
+++ b/libcore/Makefile.am
@@ -281,7 +281,6 @@ libgnashcore_la_LIBADD = \
$(top_builddir)/libsound/libgnashsound.la \
$(top_builddir)/libbase/libgnashbase.la \
$(BOOST_LIBS) \
- $(PTHREAD_LIBS) \
$(FREETYPE2_LIBS) \
$(FONTCONFIG_LIBS) \
$(NULL)
diff --git a/libmedia/Makefile.am b/libmedia/Makefile.am
index 1f30135..b40c623 100644
--- a/libmedia/Makefile.am
+++ b/libmedia/Makefile.am
@@ -58,7 +58,6 @@ libgnashmedia_la_LIBADD = \
$(CURL_LIBS) \
$(OPENGL_LIBS) \
$(BOOST_LIBS) \
- $(PTHREAD_LIBS) \
$(NULL)
libgnashmedia_la_SOURCES = \
diff --git a/libsound/Makefile.am b/libsound/Makefile.am
index d14e271..83eac76 100644
--- a/libsound/Makefile.am
+++ b/libsound/Makefile.am
@@ -33,7 +33,6 @@ libgnashsound_la_LIBADD = \
$(top_builddir)/libmedia/libgnashmedia.la \
$(top_builddir)/libbase/libgnashbase.la \
$(BOOST_LIBS) \
- $(PTHREAD_LIBS) \
$(SDL_LIBS) \
$(NULL)
diff --git a/libvaapi/Makefile.am b/libvaapi/Makefile.am
index 350e0d2..c6300c6 100644
--- a/libvaapi/Makefile.am
+++ b/libvaapi/Makefile.am
@@ -29,7 +29,6 @@ libgnashvaapi_la_CPPFLAGS = \
libgnashvaapi_la_LIBADD = \
$(X11_LIBS) \
$(BOOST_LIBS) \
- $(PTHREAD_LIBS) \
$(FFMPEG_LIBS) \
$(LIBVA_LIBS) \
$(LIBVA_X11_LIBS) \
diff --git a/testsuite/libmedia.all/Makefile.am
b/testsuite/libmedia.all/Makefile.am
index b629f9b..b1e1e2c 100644
--- a/testsuite/libmedia.all/Makefile.am
+++ b/testsuite/libmedia.all/Makefile.am
@@ -30,7 +30,6 @@ AM_LDFLAGS = \
$(GSTREAMER_APP_LIBS) \
$(GSTREAMER_LIBS) \
$(BOOST_LIBS) \
- $(PTHREAD_LIBS) \
$(NULL)
localedir = $(datadir)/locale
diff --git a/testsuite/network.all/Makefile.am
b/testsuite/network.all/Makefile.am
index 103166d..27e3d6a 100644
--- a/testsuite/network.all/Makefile.am
+++ b/testsuite/network.all/Makefile.am
@@ -57,7 +57,6 @@ AM_LDFLAGS =
$(MING_LIBS) \
$(OPENGL_LIBS) \
$(BOOST_LIBS) \
- $(PTHREAD_LIBS)
$(NULL)
if BUILD_SSL
diff --git a/utilities/Makefile.am b/utilities/Makefile.am
index ec16ea1..0d3fc47 100644
--- a/utilities/Makefile.am
+++ b/utilities/Makefile.am
@@ -42,7 +42,6 @@ AM_LDFLAGS = \
$(PNG_LIBS) \
$(BOOST_LIBS) \
$(PYTHON_LIBS) \
- $(PTHREAD_LIBS) \
$(NULL)
# bzip2 is a dependency of some libraries with mingw32
@@ -158,8 +157,6 @@ mudflap:
clean-hook:
-rm -f core.*
-#gdebug.swf: gdebug.as gdebcmds.as
-
# Wrap a single .as tests in dejagnu_so importer.
# At play time, if the relative url '../ming-misc.all/Dejagnu.swf'
# takes to the Dejagnu.swf shared library we'll get visual traces,
http://git.savannah.gnu.org/cgit//commit/?id=fefd575617b721d9b6b2a2c2ffa08c14fe836fa5
commit fefd575617b721d9b6b2a2c2ffa08c14fe836fa5
Author: Benjamin Wolsey <address@hidden>
Date: Sat Apr 2 08:48:53 2011 +0200
Move thread id code to the only place it should be used;
it should be dropped when support for boost 1.34 is dropped.
diff --git a/libbase/log.cpp b/libbase/log.cpp
index cd3a795..fa24a7a 100644
--- a/libbase/log.cpp
+++ b/libbase/log.cpp
@@ -33,12 +33,16 @@
#include <unistd.h> // for getpid
-#include "utility.h"
#include "GnashAlgorithm.h"
using std::cout;
using std::endl;
+namespace {
+ // TODO: drop this and use boost::this_thread::id instead.
+ inline unsigned long int /* pthread_t */ get_thread_id(void);
+}
+
namespace gnash {
// Convert each byte into its hex representation
@@ -322,6 +326,47 @@ LogFile::removeLog()
} // end of gnash namespace
+/// Used in logging.
+#ifdef HAVE_PTHREADS
+#include <pthread.h>
+#else
+# ifdef _WIN32
+extern "C" unsigned long int /* DWORD WINAPI */ GetCurrentThreadId(void);
+# else
+#include <sys/types.h>
+#include <unistd.h>
+# endif
+#endif
+
+namespace {
+
+inline unsigned long int /* pthread_t */ get_thread_id(void)
+{
+#ifdef HAVE_PTHREADS
+# ifdef __APPLE_CC__
+ return reinterpret_cast<unsigned long int>(pthread_self());
+# else
+ // This isn't a proper style C++ cast, but FreeBSD has a problem with
+ // static_cast for this as pthread_self() returns a pointer. We can
+ // use that too, this ID is only used for the log file to keep output
+ // from seperare threads clear.
+# ifdef _WIN32
+ return GetCurrentThreadId();
+#else
+ return (unsigned long int)pthread_self();
+#endif
+# endif
+#else
+# ifdef _WIN32
+ return GetCurrentThreadId();
+# else
+ return static_cast<unsigned long int>(getpid());
+# endif
+#endif
+
+}
+
+} // anonymous namespace
// Local Variables:
// mode: C++
diff --git a/libbase/utility.h b/libbase/utility.h
index b11fc89..9691277 100644
--- a/libbase/utility.h
+++ b/libbase/utility.h
@@ -31,10 +31,6 @@
#include <string>
#include <typeinfo>
-#ifdef HAVE_PTHREADS
-#include <pthread.h>
-#endif
-
#if defined(__GNUC__) && __GNUC__ > 2
# include <cxxabi.h>
#endif
@@ -111,45 +107,6 @@ std::string typeName(const T& inst)
return typeName;
}
-/// Used in logging.
-#ifdef HAVE_PTHREADS
-#else
-# ifdef _WIN32
-} // end namespace gnash
-extern "C" unsigned long int /* DWORD WINAPI */ GetCurrentThreadId(void);
-namespace gnash {
-# else
-/* getpid() */
-#include <sys/types.h>
-#include <unistd.h>
-# endif
-#endif
-
-inline unsigned long int /* pthread_t */ get_thread_id(void)
-{
-#ifdef HAVE_PTHREADS
-# ifdef __APPLE_CC__
- return reinterpret_cast<unsigned long int>(pthread_self());
-# else
- // This isn't a proper style C++ cast, but FreeBSD has a problem with
- // static_cast for this as pthread_self() returns a pointer. We can
- // use that too, this ID is only used for the log file to keep output
- // from seperare threads clear.
-# ifdef _WIN32
- return GetCurrentThreadId();
-#else
- return (unsigned long int)pthread_self();
-#endif
-# endif
-#else
-# ifdef _WIN32
- return GetCurrentThreadId();
-# else
- return static_cast<unsigned long int>(getpid());
-# endif
-#endif
-}
-
} // namespace gnash
// Handy macro to quiet compiler warnings about unused parameters/variables.
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 2 -
cygnal/Makefile.am | 1 -
cygnal/cgi-bin/echo/Makefile.am | 1 -
cygnal/cgi-bin/fitcDemo/Makefile.am | 1 -
cygnal/cgi-bin/oflaDemo/Makefile.am | 1 -
cygnal/libnet/Makefile.am | 1 -
cygnal/testsuite/cygnal.all/Makefile.am | 2 +-
cygnal/testsuite/libamf.all/Makefile.am | 1 -
cygnal/testsuite/libnet.all/Makefile.am | 2 +-
extensions/dbus/Makefile.am | 1 -
extensions/dejagnu/Makefile.am | 1 -
extensions/fileio/Makefile.am | 2 -
extensions/gtk2/Makefile.am | 2 -
extensions/lirc/Makefile.am | 1 -
extensions/mysql/Makefile.am | 1 -
gui/Makefile.am | 25 +----------------
gui/dump/Makefile.am | 2 -
gui/fb/Makefile.am | 2 -
libbase/Makefile.am | 4 --
libbase/log.cpp | 47 ++++++++++++++++++++++++++++++-
libbase/utility.h | 43 ----------------------------
libcore/Makefile.am | 2 -
libcore/parser/Makefile.am | 3 --
libcore/vm/Makefile.am | 3 --
libmedia/Makefile.am | 20 -------------
librender/Makefile.am | 11 -------
libsound/Makefile.am | 3 --
libvaapi/Makefile.am | 1 -
testsuite/actionscript.all/Makefile.am | 1 -
testsuite/libbase.all/Makefile.am | 1 -
testsuite/libmedia.all/Makefile.am | 2 -
testsuite/network.all/Makefile.am | 1 -
utilities/Makefile.am | 10 ------
33 files changed, 49 insertions(+), 152 deletions(-)
hooks/post-receive
--
Gnash
- [Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-487-g37ba60d,
Benjamin Wolsey <=