commit 39215bca3439c434538a877b4cd2cf10fc8d3974 Author: Andrew Guertin Date: Wed Apr 13 06:04:29 2011 -0400 List headers in _SOURCES diff --git a/libbase/Makefile.am b/libbase/Makefile.am index a185e87..8f7ea8e 100644 --- a/libbase/Makefile.am +++ b/libbase/Makefile.am @@ -22,35 +22,83 @@ EXTRA_DIST = gnashrc.in gnashpluginrc.in libgnashbase_la_SOURCES = \ AMF.cpp \ + AMF.h \ arg_parser.cpp \ + arg_parser.h \ BitsReader.cpp \ + BitsReader.h \ ClockTime.cpp \ + ClockTime.h \ curl_adapter.cpp \ + dsodefs.h \ GC.cpp \ + GC.h \ + getclocktime.hpp \ + gettext.h \ + gmemory.h \ + GnashAlgorithm.h \ + GnashEnums.h \ + GnashException.h \ GnashFileUtilities.cpp \ + GnashFileUtilities.h \ GnashImage.cpp \ + GnashImage.h \ GnashImageJpeg.cpp \ + GnashImageJpeg.h \ + GnashNumeric.h \ + GnashSleep.h \ + GnashSystemFDHeaders.h \ + GnashSystemIOHeaders.h \ + GnashSystemNetHeaders.h \ IOChannel.cpp \ + IOChannel.h \ log.cpp \ + log.h \ memory.cpp \ NamingPolicy.cpp \ + NamingPolicy.h \ + NetworkAdapter.h \ noseek_fd_adapter.cpp \ + noseek_fd_adapter.h \ rc.cpp \ + rc.h \ RTMP.cpp \ + RTMP.h \ + SharedMem.h \ + SimpleBuffer.h \ Socket.cpp \ + Socket.h \ + Stats.h \ StreamProvider.cpp \ + StreamProvider.h \ + StringPredicates.h \ string_table.cpp \ + string_table.h \ SWFCtype.cpp \ + SWFCtype.h \ tu_file.cpp \ + tu_file.h \ URLAccessManager.cpp \ + URLAccessManager.h \ URL.cpp \ + URL.h \ utf8.cpp \ + utf8.h \ + utility.h \ WallClockTimer.cpp \ + WallClockTimer.h \ zlib_adapter.cpp \ + zlib_adapter.h \ $(NULL) if JEMALLOC -libgnashbase_la_SOURCES += jemalloc.c +libgnashbase_la_SOURCES += \ + jemalloc.c \ + jemalloc.h \ + jemalloc_gnash.h \ + jemalloc_rb.h \ + jemalloc_types.h \ + $(NULL) endif if ANDROID @@ -68,7 +116,12 @@ endif endif if ENABLE_EXTENSIONS -libgnashbase_la_SOURCES += extension.cpp sharedlib.cpp +libgnashbase_la_SOURCES += \ + extension.cpp \ + extension.h \ + sharedlib.cpp \ + sharedlib.h \ + $(NULL) endif if USE_PNG @@ -101,6 +154,7 @@ libgnashbase_la_SOURCES += \ if HAVE_VAAPI_GLX libgnashbase_la_SOURCES += \ + GnashTexture.h \ GnashVaapiTexture.cpp \ GnashVaapiTexture.h \ $(NULL) commit a86d21b11e455f516ee49ae1d6a6668016d95f8d Author: Andrew Guertin Date: Wed Apr 13 04:54:27 2011 -0400 Sort _SOURCES diff --git a/libbase/Makefile.am b/libbase/Makefile.am index b29d7b0..a185e87 100644 --- a/libbase/Makefile.am +++ b/libbase/Makefile.am @@ -21,32 +21,32 @@ sysconf_DATA = gnashrc gnashpluginrc EXTRA_DIST = gnashrc.in gnashpluginrc.in libgnashbase_la_SOURCES = \ + AMF.cpp \ + arg_parser.cpp \ + BitsReader.cpp \ + ClockTime.cpp \ + curl_adapter.cpp \ + GC.cpp \ + GnashFileUtilities.cpp \ GnashImage.cpp \ - SWFCtype.cpp \ GnashImageJpeg.cpp \ - GnashFileUtilities.cpp \ - AMF.cpp \ - RTMP.cpp \ - log.cpp \ + IOChannel.cpp \ + log.cpp \ memory.cpp \ + NamingPolicy.cpp \ + noseek_fd_adapter.cpp \ rc.cpp \ + RTMP.cpp \ + Socket.cpp \ + StreamProvider.cpp \ string_table.cpp \ + SWFCtype.cpp \ tu_file.cpp \ - IOChannel.cpp \ - Socket.cpp \ - ClockTime.cpp \ - NamingPolicy.cpp \ - WallClockTimer.cpp \ + URLAccessManager.cpp \ + URL.cpp \ utf8.cpp \ - curl_adapter.cpp \ - noseek_fd_adapter.cpp \ + WallClockTimer.cpp \ zlib_adapter.cpp \ - URL.cpp \ - GC.cpp \ - BitsReader.cpp \ - arg_parser.cpp \ - URLAccessManager.cpp \ - StreamProvider.cpp \ $(NULL) if JEMALLOC commit 4f782c90cef0d28a455da324f2cfdf3e1f042ddb Author: Andrew Guertin Date: Wed Apr 13 04:49:41 2011 -0400 Move (most) conditional headers into _SOURCES diff --git a/libbase/Makefile.am b/libbase/Makefile.am index 756bee0..b29d7b0 100644 --- a/libbase/Makefile.am +++ b/libbase/Makefile.am @@ -72,39 +72,36 @@ libgnashbase_la_SOURCES += extension.cpp sharedlib.cpp endif if USE_PNG -libgnashbase_la_SOURCES += GnashImagePng.cpp +libgnashbase_la_SOURCES += \ + GnashImagePng.cpp \ + GnashImagePng.h \ + $(NULL) endif if USE_GIF -libgnashbase_la_SOURCES += GnashImageGif.cpp +libgnashbase_la_SOURCES += \ + GnashImageGif.cpp \ + GnashImageGif.h \ + $(NULL) endif if BUILD_OGL_RENDERER - libgnashbase_la_SOURCES += \ +libgnashbase_la_SOURCES += \ GnashTexture.cpp \ - $(NULL) - - noinst_HEADERS += \ GnashTexture.h \ $(NULL) endif if HAVE_VAAPI - libgnashbase_la_SOURCES += \ +libgnashbase_la_SOURCES += \ GnashVaapiImage.cpp \ - $(NULL) - - noinst_HEADERS += \ GnashVaapiImage.h \ GnashVaapiImageProxy.h \ $(NULL) if HAVE_VAAPI_GLX - libgnashbase_la_SOURCES += \ +libgnashbase_la_SOURCES += \ GnashVaapiTexture.cpp \ - $(NULL) - - noinst_HEADERS += \ GnashVaapiTexture.h \ $(NULL) endif @@ -148,8 +145,6 @@ if HAIKU libgnashbase_la_LIBADD += $(HAIKU_LIBS) endif -noinst_HEADERS = - inst_HEADERS = \ accumulator.h \ SimpleBuffer.h \ @@ -183,13 +178,6 @@ inst_HEADERS = \ StreamProvider.h \ $(NULL) -if USE_PNG -noinst_HEADERS += GnashImagePng.h -endif -if USE_GIF -noinst_HEADERS += GnashImageGif.h -endif - if ENABLE_EXTENSIONS inst_HEADERS += extension.h sharedlib.h endif commit 1bb163e631371f1288dee3c590990e5398d1b84d Author: Andrew Guertin Date: Wed Apr 13 04:45:39 2011 -0400 Condense libgnashbase_la_LIBADD diff --git a/libbase/Makefile.am b/libbase/Makefile.am index 22f35ed..756bee0 100644 --- a/libbase/Makefile.am +++ b/libbase/Makefile.am @@ -141,11 +141,9 @@ libgnashbase_la_LIBADD = \ $(BOOST_LIBS) \ $(OPENGL_LIBS) \ $(PTHREAD_LIBS) \ + $(LTDL_LIBS) \ $(NULL) - -libgnashbase_la_LIBADD += $(LTDL_LIBS) - if HAIKU libgnashbase_la_LIBADD += $(HAIKU_LIBS) endif commit 16a8256770f92550ef2cf7e90a26912954cae2d0 Author: Andrew Guertin Date: Wed Apr 13 04:36:52 2011 -0400 Add jemalloc to _SOURCES the same way as everything else diff --git a/libbase/Makefile.am b/libbase/Makefile.am index 0152bb1..22f35ed 100644 --- a/libbase/Makefile.am +++ b/libbase/Makefile.am @@ -21,7 +21,6 @@ sysconf_DATA = gnashrc gnashpluginrc EXTRA_DIST = gnashrc.in gnashpluginrc.in libgnashbase_la_SOURCES = \ - $(MALLOC) \ GnashImage.cpp \ SWFCtype.cpp \ GnashImageJpeg.cpp \ @@ -50,6 +49,10 @@ libgnashbase_la_SOURCES = \ StreamProvider.cpp \ $(NULL) +if JEMALLOC +libgnashbase_la_SOURCES += jemalloc.c +endif + if ANDROID libgnashbase_la_SOURCES += SharedMemHaiku.cpp else @@ -147,16 +150,6 @@ if HAIKU libgnashbase_la_LIBADD += $(HAIKU_LIBS) endif -# Maybe use jemalloc, which handles memory fragmentation for -# ECAMscript languages better than the regular system malloc. -# This is controlled by the --enable-jemalloc (disabled by default) -# configure option. -if JEMALLOC -MALLOC = jemalloc.c -else -MALLOC = -endif - noinst_HEADERS = inst_HEADERS = \ commit 7244294dd49d8f0acb8006963606cfd77ea60b50 Author: Andrew Guertin Date: Wed Apr 13 04:34:47 2011 -0400 Whitespace, useless comment, duplicated code diff --git a/libbase/Makefile.am b/libbase/Makefile.am index 3c2c354..0152bb1 100644 --- a/libbase/Makefile.am +++ b/libbase/Makefile.am @@ -108,12 +108,9 @@ endif endif - - # this is where Gnash plugins get installed pluginsdir = $(prefix)/lib/gnash/plugins - libgnashbase_la_CPPFLAGS = -DPLUGINSDIR=\"$(pluginsdir)\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \ $(PTHREAD_CFLAGS) \ @@ -131,8 +128,6 @@ if ANDROID libgnashbase_la_CPPFLAGS += $(ANDROID_NDK)/usr/include endif -# These headers get installed - libgnashbase_la_LIBADD = \ $(JPEG_LIBS) \ $(PNG_LIBS) \ @@ -152,10 +147,6 @@ if HAIKU libgnashbase_la_LIBADD += $(HAIKU_LIBS) endif -if WIN32 - libgnashbase_la_LIBADD += -lws2_32 -lwinmm -endif - # Maybe use jemalloc, which handles memory fragmentation for # ECAMscript languages better than the regular system malloc. # This is controlled by the --enable-jemalloc (disabled by default) commit c94da7daa6c34feb851760e0b1edee8328db153f Author: Andrew Guertin Date: Wed Apr 13 04:32:30 2011 -0400 Move all setting of libgnashbase_la_SOURCES together diff --git a/libbase/Makefile.am b/libbase/Makefile.am index 8255719..3c2c354 100644 --- a/libbase/Makefile.am +++ b/libbase/Makefile.am @@ -20,41 +20,6 @@ pkglib_LTLIBRARIES = libgnashbase.la sysconf_DATA = gnashrc gnashpluginrc EXTRA_DIST = gnashrc.in gnashpluginrc.in -# this is where Gnash plugins get installed -pluginsdir = $(prefix)/lib/gnash/plugins - - -libgnashbase_la_CPPFLAGS = -DPLUGINSDIR=\"$(pluginsdir)\" \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ - $(PTHREAD_CFLAGS) \ - $(PNG_CFLAGS) \ - $(GIF_CFLAGS) \ - $(CURL_CFLAGS) \ - $(Z_CFLAGS) \ - $(JPEG_CFLAGS) \ - $(BOOST_CFLAGS) \ - $(OPENGL_CFLAGS) \ - $(LTDL_CFLAGS) \ - $(NULL) - -if ANDROID -libgnashbase_la_CPPFLAGS += $(ANDROID_NDK)/usr/include -endif - -# These headers get installed - -libgnashbase_la_LIBADD = \ - $(JPEG_LIBS) \ - $(PNG_LIBS) \ - $(GIF_LIBS) \ - $(Z_LIBS) \ - $(CURL_LIBS) \ - $(LIBINTL) \ - $(BOOST_LIBS) \ - $(OPENGL_LIBS) \ - $(PTHREAD_LIBS) \ - $(NULL) - libgnashbase_la_SOURCES = \ $(MALLOC) \ GnashImage.cpp \ @@ -85,7 +50,6 @@ libgnashbase_la_SOURCES = \ StreamProvider.cpp \ $(NULL) - if ANDROID libgnashbase_la_SOURCES += SharedMemHaiku.cpp else @@ -112,6 +76,76 @@ if USE_GIF libgnashbase_la_SOURCES += GnashImageGif.cpp endif +if BUILD_OGL_RENDERER + libgnashbase_la_SOURCES += \ + GnashTexture.cpp \ + $(NULL) + + noinst_HEADERS += \ + GnashTexture.h \ + $(NULL) +endif + +if HAVE_VAAPI + libgnashbase_la_SOURCES += \ + GnashVaapiImage.cpp \ + $(NULL) + + noinst_HEADERS += \ + GnashVaapiImage.h \ + GnashVaapiImageProxy.h \ + $(NULL) + +if HAVE_VAAPI_GLX + libgnashbase_la_SOURCES += \ + GnashVaapiTexture.cpp \ + $(NULL) + + noinst_HEADERS += \ + GnashVaapiTexture.h \ + $(NULL) +endif +endif + + + + +# this is where Gnash plugins get installed +pluginsdir = $(prefix)/lib/gnash/plugins + + +libgnashbase_la_CPPFLAGS = -DPLUGINSDIR=\"$(pluginsdir)\" \ + -DSYSCONFDIR=\"$(sysconfdir)\" \ + $(PTHREAD_CFLAGS) \ + $(PNG_CFLAGS) \ + $(GIF_CFLAGS) \ + $(CURL_CFLAGS) \ + $(Z_CFLAGS) \ + $(JPEG_CFLAGS) \ + $(BOOST_CFLAGS) \ + $(OPENGL_CFLAGS) \ + $(LTDL_CFLAGS) \ + $(NULL) + +if ANDROID +libgnashbase_la_CPPFLAGS += $(ANDROID_NDK)/usr/include +endif + +# These headers get installed + +libgnashbase_la_LIBADD = \ + $(JPEG_LIBS) \ + $(PNG_LIBS) \ + $(GIF_LIBS) \ + $(Z_LIBS) \ + $(CURL_LIBS) \ + $(LIBINTL) \ + $(BOOST_LIBS) \ + $(OPENGL_LIBS) \ + $(PTHREAD_LIBS) \ + $(NULL) + + libgnashbase_la_LIBADD += $(LTDL_LIBS) if HAIKU @@ -212,36 +246,6 @@ inst_HEADERS += $(EXTENSIONS_API) libgnashbase_la_LDFLAGS = -release $(VERSION) libgnashbase_la_DEPENDENCIES = -if BUILD_OGL_RENDERER - libgnashbase_la_SOURCES += \ - GnashTexture.cpp \ - $(NULL) - - noinst_HEADERS += \ - GnashTexture.h \ - $(NULL) -endif - -if HAVE_VAAPI - libgnashbase_la_SOURCES += \ - GnashVaapiImage.cpp \ - $(NULL) - - noinst_HEADERS += \ - GnashVaapiImage.h \ - GnashVaapiImageProxy.h \ - $(NULL) - -if HAVE_VAAPI_GLX - libgnashbase_la_SOURCES += \ - GnashVaapiTexture.cpp \ - $(NULL) - - noinst_HEADERS += \ - GnashVaapiTexture.h \ - $(NULL) -endif - if HAVE_VAAPI libgnashbase_la_CPPFLAGS += \ -I$(top_srcdir)/libvaapi \ @@ -255,7 +259,6 @@ if HAVE_VAAPI $(top_builddir)/libvaapi/libgnashvaapi.la \ $(NULL) endif -endif if WIN32 libgnashbase_la_LDFLAGS += -no-undefined commit 98633695598f27b96e13c9f3ef9904fbd512129f Author: Andrew Guertin Date: Wed Apr 13 04:27:53 2011 -0400 Move gnashrc and gnashpluginrc things to the bottom diff --git a/libbase/Makefile.am b/libbase/Makefile.am index 7220975..8255719 100644 --- a/libbase/Makefile.am +++ b/libbase/Makefile.am @@ -104,20 +104,6 @@ if ENABLE_EXTENSIONS libgnashbase_la_SOURCES += extension.cpp sharedlib.cpp endif -edit = sed \ - -e 's|@address@hidden|$(DEFAULT_FLASH_PLATFORM_ID)|g' \ - -e 's|@address@hidden|$(DEFAULT_FLASH_MAJOR_VERSION)|g' \ - -e 's|@address@hidden|$(DEFAULT_FLASH_MINOR_VERSION)|g' \ - -e 's|@address@hidden|$(DEFAULT_FLASH_REV_NUMBER)|g' \ - -e 's|@address@hidden|$(DEFAULT_STREAMS_TIMEOUT)|g' \ - -e 's|@address@hidden|$(DEFAULT_SOL_SAFEDIR)|g' - -gnashrc: gnashrc.in Makefile - $(edit) '$(srcdir)/address@hidden' >$@ - -gnashpluginrc: gnashpluginrc.in - $(edit) '$(srcdir)/address@hidden' >$@ - if USE_PNG libgnashbase_la_SOURCES += GnashImagePng.cpp endif @@ -280,6 +266,20 @@ if ENABLE_PCH AM_CXXFLAGS = $(PCH_FLAGS) endif +edit = sed \ + -e 's|@address@hidden|$(DEFAULT_FLASH_PLATFORM_ID)|g' \ + -e 's|@address@hidden|$(DEFAULT_FLASH_MAJOR_VERSION)|g' \ + -e 's|@address@hidden|$(DEFAULT_FLASH_MINOR_VERSION)|g' \ + -e 's|@address@hidden|$(DEFAULT_FLASH_REV_NUMBER)|g' \ + -e 's|@address@hidden|$(DEFAULT_STREAMS_TIMEOUT)|g' \ + -e 's|@address@hidden|$(DEFAULT_SOL_SAFEDIR)|g' + +gnashrc: gnashrc.in Makefile + $(edit) '$(srcdir)/address@hidden' >$@ + +gnashpluginrc: gnashpluginrc.in + $(edit) '$(srcdir)/address@hidden' >$@ + CLEANFILES = gnashrc gnashpluginrc # Remove libtool .la files commit f80f854fddbd10e6c854f8c22755c7c1c963b65a Author: Andrew Guertin Date: Wed Apr 13 04:25:43 2011 -0400 Move declarations of what's getting installed to the top diff --git a/libbase/Makefile.am b/libbase/Makefile.am index 3748516..7220975 100644 --- a/libbase/Makefile.am +++ b/libbase/Makefile.am @@ -16,14 +16,13 @@ AUTOMAKE_OPTIONS = foreign -EXTRA_DIST = gnashrc.in gnashpluginrc.in - +pkglib_LTLIBRARIES = libgnashbase.la sysconf_DATA = gnashrc gnashpluginrc +EXTRA_DIST = gnashrc.in gnashpluginrc.in # this is where Gnash plugins get installed pluginsdir = $(prefix)/lib/gnash/plugins -pkglib_LTLIBRARIES = libgnashbase.la libgnashbase_la_CPPFLAGS = -DPLUGINSDIR=\"$(pluginsdir)\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \ commit 14897b909e74e55c3287c53e17a90762468431df Author: Andrew Guertin Date: Sat Apr 2 07:56:47 2011 -0400 List appropriate headers in libgnashvaapi_la_SOURCES diff --git a/libvaapi/Makefile.am b/libvaapi/Makefile.am index 8584166..7d5283e 100644 --- a/libvaapi/Makefile.am +++ b/libvaapi/Makefile.am @@ -35,31 +35,26 @@ libgnashvaapi_la_LIBADD = \ $(NULL) libgnashvaapi_la_SOURCES = \ - vaapi_utils.cpp \ - VaapiContext.cpp \ - VaapiDisplay.cpp \ - VaapiGlobalContext.cpp \ - VaapiImage.cpp \ - VaapiImageFormat.cpp \ - VaapiSubpicture.cpp \ - VaapiSurface.cpp \ - VaapiSurfaceProxy.cpp \ - $(NULL) - -noinst_HEADERS = \ vaapi_common.h \ + vaapi_utils.cpp \ vaapi_utils.h \ + VaapiContext.cpp \ VaapiContext.h \ + VaapiDisplay.cpp \ VaapiDisplay.h \ VaapiDisplayX11.h \ - VaapiDisplayGLX.h \ VaapiException.h \ + VaapiGlobalContext.cpp \ VaapiGlobalContext.h \ + VaapiImage.cpp \ VaapiImage.h \ + VaapiImageFormat.cpp \ VaapiImageFormat.h \ + VaapiSubpicture.cpp \ VaapiSubpicture.h \ + VaapiSurface.cpp \ VaapiSurface.h \ - VaapiSurfaceGLX.h \ + VaapiSurfaceProxy.cpp \ VaapiSurfaceProxy.h \ $(NULL) @@ -73,7 +68,9 @@ libgnashvaapi_la_LIBADD += \ $(NULL) libgnashvaapi_la_SOURCES += \ + VaapiDisplayGLX.h \ VaapiSurfaceGLX.cpp \ + VaapiSurfaceGLX.h \ $(NULL) endif