[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r11021: work around circular depende
|
From: |
rob |
|
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r11021: work around circular dependencies till we figure out a better long-term fix. |
|
Date: |
Sun, 07 Jun 2009 10:20:44 -0600 |
|
User-agent: |
Bazaar (1.13.1) |
------------------------------------------------------------
revno: 11021
committer: address@hidden
branch nick: trunk
timestamp: Sun 2009-06-07 10:20:44 -0600
message:
work around circular dependencies till we figure out a better long-term fix.
added:
libcore/asobj/flash.am
modified:
configure.ac
libcore/Makefile.am
libcore/asobj/flash/accessibility/accessibility.am
libcore/asobj/flash/desktop/desktop.am
libcore/asobj/flash/display/display.am
libcore/asobj/flash/errors/errors.am
libcore/asobj/flash/events/events.am
libcore/asobj/flash/external/external.am
libcore/asobj/flash/filters/filters.am
libcore/asobj/flash/geom/geom.am
libcore/asobj/flash/media/media.am
libcore/asobj/flash/net/net.am
libcore/asobj/flash/printing/printing.am
libcore/asobj/flash/sampler/sampler.am
libcore/asobj/flash/system/system.am
libcore/asobj/flash/text/text.am
libcore/asobj/flash/ui/ui.am
libcore/asobj/flash/utils/utils.am
libcore/asobj/flash/xml/xml.am
utilities/Makefile.am
------------------------------------------------------------
revno: 11015.2.1
committer: address@hidden
branch nick: asobj
timestamp: Sat 2009-06-06 16:54:57 -0600
message:
convert Makefile.am to a fragment.
added:
libcore/asobj/flash.am
------------------------------------------------------------
revno: 11015.2.2
committer: address@hidden
branch nick: asobj
timestamp: Sat 2009-06-06 16:55:39 -0600
message:
build libasobj with libcore to work around circular dependencies.
modified:
configure.ac
libcore/Makefile.am
libcore/asobj/flash/accessibility/accessibility.am
libcore/asobj/flash/desktop/desktop.am
libcore/asobj/flash/display/display.am
libcore/asobj/flash/errors/errors.am
libcore/asobj/flash/events/events.am
libcore/asobj/flash/external/external.am
libcore/asobj/flash/filters/filters.am
libcore/asobj/flash/geom/geom.am
libcore/asobj/flash/media/media.am
libcore/asobj/flash/net/net.am
libcore/asobj/flash/printing/printing.am
libcore/asobj/flash/sampler/sampler.am
libcore/asobj/flash/system/system.am
libcore/asobj/flash/text/text.am
libcore/asobj/flash/ui/ui.am
libcore/asobj/flash/utils/utils.am
libcore/asobj/flash/xml/xml.am
utilities/Makefile.am
------------------------------------------------------------
revno: 11015.2.3
committer: address@hidden
branch nick: asobj
timestamp: Sat 2009-06-06 17:27:19 -0600
message:
build all libcore and asobjs in the same library to workaround circular
dependencies.
modified:
libcore/Makefile.am
libcore/asobj/flash.am
utilities/Makefile.am
=== modified file 'configure.ac'
--- a/configure.ac 2009-06-01 22:43:09 +0000
+++ b/configure.ac 2009-06-06 22:55:39 +0000
@@ -2238,7 +2238,6 @@
libsound/Makefile
libbase/Makefile
libcore/Makefile
-libcore/asobj/Makefile
libcore/vm/Makefile
libcore/parser/Makefile
libnet/Makefile
=== modified file 'libcore/Makefile.am'
--- a/libcore/Makefile.am 2009-06-03 13:34:35 +0000
+++ b/libcore/Makefile.am 2009-06-06 23:27:19 +0000
@@ -17,7 +17,7 @@
AUTOMAKE_OPTIONS =
-SUBDIRS = asobj parser vm
+SUBDIRS = parser vm
# noinst_LTLIBRARIES = libserver.la
pkglib_LTLIBRARIES = libgnashcore.la
@@ -256,6 +256,12 @@
asNamespace.h \
$(NULL)
+# These makefile fragments build the ActionScript library for
+# Gnash, and supports both AS2 as well as AS3, so we always
+# want to build.
+include $(srcdir)/asobj/flash.am
+libgnashcore_la_SOURCES += $(libgnashasobjs_la_SOURCES)
+
if SDKINSTALL
noinst_HEADERS += $(EXTENSIONS_API)
else
@@ -267,7 +273,6 @@
$(top_builddir)/libbase/libgnashbase.la \
$(top_builddir)/libamf/libgnashamf.la \
$(top_builddir)/libnet/libgnashnet.la \
- $(top_builddir)/libcore/asobj/libgnashasobjs.la \
$(top_builddir)/libcore/parser/libgnashparser.la \
$(top_builddir)/libcore/vm/libgnashvm.la \
$(BOOST_LIBS) \
@@ -310,7 +315,7 @@
endif
else
libgnashcore_la_LIBADD += $(top_builddir)/libmedia/libgnashmedia.la \
- $(top_builddir)/libsound/libgnashsound.la
+ $(top_builddir)/libsound/libgnashsound.la
endif
# Rebuild with GCC 4.x Mudflap support
=== added file 'libcore/asobj/flash.am'
--- a/libcore/asobj/flash.am 1970-01-01 00:00:00 +0000
+++ b/libcore/asobj/flash.am 2009-06-06 23:27:19 +0000
@@ -0,0 +1,161 @@
+## Process this file with automake to generate Makefile.in
+#
+# Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+VPATH += $(srcdir)/asobj/
+
+# The built sources get filled in by each subdirectory's .am
+# Makefile fragment. These are the geerated headers that contain
+# the array of function pointers to each _init() function in each
+# class. The header file is generated at build time.
+BUILT_SOURCES =
+
+# pkglib_LTLIBRARIES += libgnashasobjs.la
+
+libgnashasobjs_la_SOURCES = \
+ AsBroadcaster.cpp \
+ Array_as.cpp \
+ Boolean_as.cpp \
+ Camera.cpp \
+ Color_as.cpp \
+ ContextMenu.cpp \
+ CustomActions.cpp\
+ Date_as.cpp \
+ Error_as.cpp \
+ Global.cpp \
+ int_as.cpp \
+ Key_as.cpp \
+ LoadVars_as.cpp \
+ LocalConnection_as.cpp\
+ Math_as.cpp \
+ Microphone.cpp \
+ NetConnection_as.cpp \
+ NetStream_as.cpp \
+ Number_as.cpp \
+ PlayHead.cpp \
+ Selection_as.cpp \
+ SharedObject_as.cpp\
+ Namespace_as.cpp \
+ Sound_as.cpp \
+ Stage_as.cpp \
+ System_as.cpp \
+ TextFormat_as.cpp \
+ TextSnapshot_as.cpp \
+ MovieClipLoader.cpp\
+ String_as.cpp \
+ XML_as.cpp \
+ XMLSocket_as.cpp \
+ LoadableObject.cpp \
+ Object.cpp
+
+noinst_HEADERS += \
+ AsBroadcaster.h \
+ Boolean_as.h \
+ Camera.h \
+ Color_as.h \
+ ContextMenu.h \
+ CustomActions.h \
+ Date_as.h \
+ Error_as.h \
+ Math_as.h \
+ Global.h\
+ int_as.h \
+ Key_as.h \
+ LoadVars_as.h \
+ LocalConnection_as.h\
+ Microphone.h \
+ MovieClipLoader.h \
+ NetConnection_as.h \
+ NetStream_as.h \
+ Number_as.h \
+ PlayHead.h \
+ Selection_as.h \
+ SharedObject_as.h \
+ Sound_as.h \
+ Stage_as.h \
+ System_as.h \
+ TextFormat_as.h \
+ TextSnapshot_as.h \
+ String_as.h \
+ XML_as.h \
+ XMLSocket_as.h \
+ LoadableObject.h \
+ Namespace_as.h \
+ Object.h
+
+EXTENSIONS_API += \
+ asobj/Array_as.h \
+ asobj/Key_as.h \
+ $(NULL)
+
+CLEANFILES = *classes.h
+
+# libgnashasobjs_la_LIBADD = \
+# $(top_builddir)/libamf/libgnashamf.la \
+# $(top_builddir)/libnet/libgnashnet.la \
+# $(top_builddir)/libbase/libgnashbase.la
+
+# if USE_FFMPEG_ENGINE
+# AM_CPPFLAGS += $(FFMPEG_CFLAGS) \
+# $(SDL_CFLAGS) \
+# -I$(top_srcdir)/libmedia/ffmpeg
+# libgnashasobjs_la_LIBADD += $(FFMPEG_LIBS) \
+# $(SDL_LIBS)
+# endif
+
+# if USE_GST_ENGINE
+# AM_CPPFLAGS += $(GSTREAMER_CFLAGS) \
+# -I$(top_srcdir)/libmedia/gst
+# libgnashasobjs_la_LIBADD += $(GSTREAMER_LIBS) \
+# $(SDL_LIBS)
+# endif
+
+# These makefile fragments build the ActionScript library for
+# Gnash, and supports both AS2 as well as AS3, so we always
+# want to build.
+include $(srcdir)/asobj/flash/accessibility/accessibility.am
+include $(srcdir)/asobj/flash/desktop/desktop.am
+include $(srcdir)/asobj/flash/display/display.am
+include $(srcdir)/asobj/flash/errors/errors.am
+include $(srcdir)/asobj/flash/events/events.am
+include $(srcdir)/asobj/flash/external/external.am
+include $(srcdir)/asobj/flash/filters/filters.am
+include $(srcdir)/asobj/flash/geom/geom.am
+include $(srcdir)/asobj/flash/media/media.am
+include $(srcdir)/asobj/flash/net/net.am
+include $(srcdir)/asobj/flash/printing/printing.am
+include $(srcdir)/asobj/flash/sampler/sampler.am
+include $(srcdir)/asobj/flash/system/system.am
+include $(srcdir)/asobj/flash/text/text.am
+include $(srcdir)/asobj/flash/utils/utils.am
+include $(srcdir)/asobj/flash/ui/ui.am
+include $(srcdir)/asobj/flash/xml/xml.am
+
+libgnashasobjs_la_SOURCES += \
+ asobj/flash/flash_pkg.cpp \
+ $(NULL)
+
+noinst_HEADERS += \
+ asobj/flash/flash_pkg.h \
+ asobj/flash/flashclasses.h \
+ $(NULL)
+
+#libgnashasobjs_la_LDFLAGS = -release $(VERSION) -no-undefined -export-dynamic
+
+# if WIN32
+# libgnashasobjs_la_LDFLAGS = -no-undefined
+# endif
+
=== modified file 'libcore/asobj/flash/accessibility/accessibility.am'
--- a/libcore/asobj/flash/accessibility/accessibility.am 2009-06-07
00:49:02 +0000
+++ b/libcore/asobj/flash/accessibility/accessibility.am 2009-06-07
16:20:44 +0000
@@ -17,17 +17,17 @@
ACCESSIBILITYdir = $(includedir)/gnash
-ACCESSIBILITY_SOURCES = flash/accessibility/accessibility_pkg.cpp
-ACCESSIBILITY_HEADERS = flash/accessibility/accessibility_pkg.h
+ACCESSIBILITY_SOURCES = asobj/flash/accessibility/accessibility_pkg.cpp
+ACCESSIBILITY_HEADERS = asobj/flash/accessibility/accessibility_pkg.h
if BUILD_ACCESSIBILITY_PROPERTIES_AS3
-ACCESSIBILITY_SOURCES += flash/accessibility/AccessibilityProperties_as.cpp
-ACCESSIBILITY_HEADERS += flash/accessibility/AccessibilityProperties_as.h
+ACCESSIBILITY_SOURCES +=
asobj/flash/accessibility/AccessibilityProperties_as.cpp
+ACCESSIBILITY_HEADERS += asobj/flash/accessibility/AccessibilityProperties_as.h
endif
if BUILD_ACCESSIBILITY_AS3
-ACCESSIBILITY_SOURCES += flash/accessibility/Accessibility_as.cpp
-ACCESSIBILITY_HEADERS += flash/accessibility/Accessibility_as.h
+ACCESSIBILITY_SOURCES += asobj/flash/accessibility/Accessibility_as.cpp
+ACCESSIBILITY_HEADERS += asobj/flash/accessibility/Accessibility_as.h
endif
libgnashasobjs_la_SOURCES += $(ACCESSIBILITY_SOURCES)
=== modified file 'libcore/asobj/flash/desktop/desktop.am'
--- a/libcore/asobj/flash/desktop/desktop.am 2009-06-07 00:49:02 +0000
+++ b/libcore/asobj/flash/desktop/desktop.am 2009-06-07 16:20:44 +0000
@@ -17,22 +17,22 @@
DESKTOPdir = $(includedir)/gnash
-DESKTOP_SOURCES = flash/desktop/desktop_pkg.cpp
-DESKTOP_HEADERS = flash/desktop/desktop_pkg.h
+DESKTOP_SOURCES = asobj/flash/desktop/desktop_pkg.cpp
+DESKTOP_HEADERS = asobj/flash/desktop/desktop_pkg.h
if BUILD_CLIPBOARDFORMATS_AS3
-DESKTOP_SOURCES += flash/desktop/ClipboardFormats_as.cpp
-DESKTOP_HEADERS += flash/desktop/ClipboardFormats_as.h
+DESKTOP_SOURCES += asobj/flash/desktop/ClipboardFormats_as.cpp
+DESKTOP_HEADERS += asobj/flash/desktop/ClipboardFormats_as.h
endif
if BUILD_CLIPBOARDTRANSFERMODE_AS3
-DESKTOP_SOURCES += flash/desktop/ClipboardTransferMode_as.cpp
-DESKTOP_HEADERS += flash/desktop/ClipboardTransferMode_as.h
+DESKTOP_SOURCES += asobj/flash/desktop/ClipboardTransferMode_as.cpp
+DESKTOP_HEADERS += asobj/flash/desktop/ClipboardTransferMode_as.h
endif
if BUILD_CLIPBOARD_AS3
-DESKTOP_SOURCES += flash/desktop/Clipboard_as.cpp
-DESKTOP_HEADERS += flash/desktop/Clipboard_as.h
+DESKTOP_SOURCES += asobj/flash/desktop/Clipboard_as.cpp
+DESKTOP_HEADERS += asobj/flash/desktop/Clipboard_as.h
endif
libgnashasobjs_la_SOURCES += $(DESKTOP_SOURCES)
=== modified file 'libcore/asobj/flash/display/display.am'
--- a/libcore/asobj/flash/display/display.am 2009-06-07 00:49:02 +0000
+++ b/libcore/asobj/flash/display/display.am 2009-06-07 16:20:44 +0000
@@ -17,176 +17,176 @@
DISPLAYdir = $(includedir)/gnash
-DISPLAY_SOURCES = flash/display/display_pkg.cpp
-DISPLAY_HEADERS = flash/display/display_pkg.h
+DISPLAY_SOURCES = asobj/flash/display/display_pkg.cpp
+DISPLAY_HEADERS = asobj/flash/display/display_pkg.h
DISPLAY_SOURCES_AS2 =
DISPLAY_HEADERS_AS2 =
if BUILD_AVM1MOVIE_AS3
-DISPLAY_SOURCES += flash/display/AVM1Movie_as.cpp
-DISPLAY_HEADERS += flash/display/AVM1Movie_as.h
+DISPLAY_SOURCES += asobj/flash/display/AVM1Movie_as.cpp
+DISPLAY_HEADERS += asobj/flash/display/AVM1Movie_as.h
endif
if BUILD_ACTIONSCRIPTVERSION_AS3
-DISPLAY_SOURCES += flash/display/ActionScriptVersion_as.cpp
-DISPLAY_HEADERS += flash/display/ActionScriptVersion_as.h
+DISPLAY_SOURCES += asobj/flash/display/ActionScriptVersion_as.cpp
+DISPLAY_HEADERS += asobj/flash/display/ActionScriptVersion_as.h
endif
if BUILD_BITMAPDATACHANNEL_AS3
-DISPLAY_SOURCES += flash/display/BitmapDataChannel_as.cpp
-DISPLAY_HEADERS += flash/display/BitmapDataChannel_as.h
+DISPLAY_SOURCES += asobj/flash/display/BitmapDataChannel_as.cpp
+DISPLAY_HEADERS += asobj/flash/display/BitmapDataChannel_as.h
endif
if BUILD_BITMAPDATA_AS3
-DISPLAY_SOURCES_AS2 += flash/display/BitmapData_as.cpp
-DISPLAY_HEADERS_AS2 += flash/display/BitmapData_as.h
+DISPLAY_SOURCES_AS2 += asobj/flash/display/BitmapData_as.cpp
+DISPLAY_HEADERS_AS2 += asobj/flash/display/BitmapData_as.h
endif
# if BUILD_BITMAP_AS3
-# DISPLAY_SOURCES += flash/display/Bitmap_as.cpp
-DISPLAY_HEADERS += flash/display/Bitmap_as.h
+# DISPLAY_SOURCES += asobj/flash/display/Bitmap_as.cpp
+DISPLAY_HEADERS += asobj/flash/display/Bitmap_as.h
# endif
if BUILD_BLENDMODE_AS3
-DISPLAY_SOURCES += flash/display/BlendMode_as.cpp
-DISPLAY_HEADERS += flash/display/BlendMode_as.h
+DISPLAY_SOURCES += asobj/flash/display/BlendMode_as.cpp
+DISPLAY_HEADERS += asobj/flash/display/BlendMode_as.h
endif
if BUILD_CAPSSTYLE_AS3
-DISPLAY_SOURCES += flash/display/CapsStyle_as.cpp
-DISPLAY_HEADERS += flash/display/CapsStyle_as.h
+DISPLAY_SOURCES += asobj/flash/display/CapsStyle_as.cpp
+DISPLAY_HEADERS += asobj/flash/display/CapsStyle_as.h
endif
if BUILD_DISPLAYOBJECTCONTAINER_AS3
-DISPLAY_SOURCES += flash/display/DisplayObjectContainer_as.cpp
-DISPLAY_HEADERS += flash/display/DisplayObjectContainer_as.h
+DISPLAY_SOURCES += asobj/flash/display/DisplayObjectContainer_as.cpp
+DISPLAY_HEADERS += asobj/flash/display/DisplayObjectContainer_as.h
endif
if BUILD_DISPLAYOBJECT_AS3
-DISPLAY_SOURCES += flash/display/DisplayObject_as.cpp
-DISPLAY_HEADERS += flash/display/DisplayObject_as.h
+DISPLAY_SOURCES += asobj/flash/display/DisplayObject_as.cpp
+DISPLAY_HEADERS += asobj/flash/display/DisplayObject_as.h
endif
if BUILD_FRAMELABEL_AS3
-DISPLAY_SOURCES += flash/display/FrameLabel_as.cpp
-DISPLAY_HEADERS += flash/display/FrameLabel_as.h
+DISPLAY_SOURCES += asobj/flash/display/FrameLabel_as.cpp
+DISPLAY_HEADERS += asobj/flash/display/FrameLabel_as.h
endif
if BUILD_GRADIENTTYPE_AS3
-DISPLAY_SOURCES += flash/display/GradientType_as.cpp
-DISPLAY_HEADERS += flash/display/GradientType_as.h
+DISPLAY_SOURCES += asobj/flash/display/GradientType_as.cpp
+DISPLAY_HEADERS += asobj/flash/display/GradientType_as.h
endif
if BUILD_GRAPHICS_AS3
-DISPLAY_SOURCES += flash/display/Graphics_as.cpp
-DISPLAY_HEADERS += flash/display/Graphics_as.h
+DISPLAY_SOURCES += asobj/flash/display/Graphics_as.cpp
+DISPLAY_HEADERS += asobj/flash/display/Graphics_as.h
endif
if BUILD_IBITMAPDRAWABLE_AS3
-DISPLAY_SOURCES += flash/display/IBitmapDrawable_as.cpp
-DISPLAY_HEADERS += flash/display/IBitmapDrawable_as.h
+DISPLAY_SOURCES += asobj/flash/display/IBitmapDrawable_as.cpp
+DISPLAY_HEADERS += asobj/flash/display/IBitmapDrawable_as.h
endif
if BUILD_INTERACTIVEOBJECT_AS3
-DISPLAY_SOURCES += flash/display/InteractiveObject_as.cpp
-DISPLAY_HEADERS += flash/display/InteractiveObject_as.h
+DISPLAY_SOURCES += asobj/flash/display/InteractiveObject_as.cpp
+DISPLAY_HEADERS += asobj/flash/display/InteractiveObject_as.h
endif
if BUILD_INTERPOLATIONMETHOD_AS3
-DISPLAY_SOURCES += flash/display/InterpolationMethod_as.cpp
-DISPLAY_HEADERS += flash/display/InterpolationMethod_as.h
+DISPLAY_SOURCES += asobj/flash/display/InterpolationMethod_as.cpp
+DISPLAY_HEADERS += asobj/flash/display/InterpolationMethod_as.h
endif
if BUILD_JOINTSTYLE_AS3
-DISPLAY_SOURCES += flash/display/JointStyle_as.cpp
-DISPLAY_HEADERS += flash/display/JointStyle_as.h
+DISPLAY_SOURCES += asobj/flash/display/JointStyle_as.cpp
+DISPLAY_HEADERS += asobj/flash/display/JointStyle_as.h
endif
if BUILD_LINESCALEMODE_AS3
-DISPLAY_SOURCES += flash/display/LineScaleMode_as.cpp
-DISPLAY_HEADERS += flash/display/LineScaleMode_as.h
+DISPLAY_SOURCES += asobj/flash/display/LineScaleMode_as.cpp
+DISPLAY_HEADERS += asobj/flash/display/LineScaleMode_as.h
endif
if BUILD_LOADERINFO_AS3
-DISPLAY_SOURCES += flash/display/LoaderInfo_as.cpp
-DISPLAY_HEADERS += flash/display/LoaderInfo_as.h
+DISPLAY_SOURCES += asobj/flash/display/LoaderInfo_as.cpp
+DISPLAY_HEADERS += asobj/flash/display/LoaderInfo_as.h
endif
if BUILD_LOADER_AS3
-DISPLAY_SOURCES += flash/display/Loader_as.cpp
-DISPLAY_HEADERS += flash/display/Loader_as.h
+DISPLAY_SOURCES += asobj/flash/display/Loader_as.cpp
+DISPLAY_HEADERS += asobj/flash/display/Loader_as.h
endif
if BUILD_MORPHSHAPE_AS3
-DISPLAY_SOURCES += flash/display/MorphShape_as.cpp
-DISPLAY_HEADERS += flash/display/MorphShape_as.h
+DISPLAY_SOURCES += asobj/flash/display/MorphShape_as.cpp
+DISPLAY_HEADERS += asobj/flash/display/MorphShape_as.h
endif
# FIXME: already exists
-# DISPLAY_SOURCES += flash/display/MovieClip_as.cpp
-DISPLAY_HEADERS += flash/display/MovieClip_as.h
+# DISPLAY_SOURCES += asobj/flash/display/MovieClip_as.cpp
+DISPLAY_HEADERS += asobj/flash/display/MovieClip_as.h
# endif
if BUILD_PIXELSNAPPING_AS3
-DISPLAY_SOURCES += flash/display/PixelSnapping_as.cpp
-DISPLAY_HEADERS += flash/display/PixelSnapping_as.h
+DISPLAY_SOURCES += asobj/flash/display/PixelSnapping_as.cpp
+DISPLAY_HEADERS += asobj/flash/display/PixelSnapping_as.h
endif
if BUILD_SWFVERSION_AS3
-DISPLAY_SOURCES += flash/display/SWFVersion_as.cpp
-DISPLAY_HEADERS += flash/display/SWFVersion_as.h
+DISPLAY_SOURCES += asobj/flash/display/SWFVersion_as.cpp
+DISPLAY_HEADERS += asobj/flash/display/SWFVersion_as.h
endif
if BUILD_SCENE_AS3
-DISPLAY_SOURCES += flash/display/Scene_as.cpp
-DISPLAY_HEADERS += flash/display/Scene_as.h
+DISPLAY_SOURCES += asobj/flash/display/Scene_as.cpp
+DISPLAY_HEADERS += asobj/flash/display/Scene_as.h
endif
if BUILD_SHAPE_AS3
-DISPLAY_SOURCES += flash/display/Shape_as.cpp
-DISPLAY_HEADERS += flash/display/Shape_as.h
+DISPLAY_SOURCES += asobj/flash/display/Shape_as.cpp
+DISPLAY_HEADERS += asobj/flash/display/Shape_as.h
endif
if BUILD_SIMPLEBUTTON_AS3
-DISPLAY_SOURCES += flash/display/SimpleButton_as.cpp
-DISPLAY_HEADERS += flash/display/SimpleButton_as.h
+DISPLAY_SOURCES += asobj/flash/display/SimpleButton_as.cpp
+DISPLAY_HEADERS += asobj/flash/display/SimpleButton_as.h
endif
if BUILD_SPREADMETHOD_AS3
-DISPLAY_SOURCES += flash/display/SpreadMethod_as.cpp
-DISPLAY_HEADERS += flash/display/SpreadMethod_as.h
+DISPLAY_SOURCES += asobj/flash/display/SpreadMethod_as.cpp
+DISPLAY_HEADERS += asobj/flash/display/SpreadMethod_as.h
endif
if BUILD_SPRITE_AS3
-DISPLAY_SOURCES += flash/display/Sprite_as.cpp
-DISPLAY_HEADERS += flash/display/Sprite_as.h
+DISPLAY_SOURCES += asobj/flash/display/Sprite_as.cpp
+DISPLAY_HEADERS += asobj/flash/display/Sprite_as.h
endif
if BUILD_STAGEALIGN_AS3
-DISPLAY_SOURCES += flash/display/StageAlign_as.cpp
-DISPLAY_HEADERS += flash/display/StageAlign_as.h
+DISPLAY_SOURCES += asobj/flash/display/StageAlign_as.cpp
+DISPLAY_HEADERS += asobj/flash/display/StageAlign_as.h
endif
if BUILD_STAGEDISPLAYSTATE_AS3
-DISPLAY_SOURCES += flash/display/StageDisplayState_as.cpp
-DISPLAY_HEADERS += flash/display/StageDisplayState_as.h
+DISPLAY_SOURCES += asobj/flash/display/StageDisplayState_as.cpp
+DISPLAY_HEADERS += asobj/flash/display/StageDisplayState_as.h
endif
if BUILD_STAGEQUALITY_AS3
-DISPLAY_SOURCES += flash/display/StageQuality_as.cpp
-DISPLAY_HEADERS += flash/display/StageQuality_as.h
+DISPLAY_SOURCES += asobj/flash/display/StageQuality_as.cpp
+DISPLAY_HEADERS += asobj/flash/display/StageQuality_as.h
endif
if BUILD_STAGESCALEMODE_AS3
-DISPLAY_SOURCES += flash/display/StageScaleMode_as.cpp
-DISPLAY_HEADERS += flash/display/StageScaleMode_as.h
+DISPLAY_SOURCES += asobj/flash/display/StageScaleMode_as.cpp
+DISPLAY_HEADERS += asobj/flash/display/StageScaleMode_as.h
endif
# FIXME: already exists
# if BUILD_STAGE_AS3
-# DISPLAY_SOURCES += flash/display/Stage_as.cpp
-DISPLAY_HEADERS += flash/display/Stage_as.h
+# DISPLAY_SOURCES += asobj/flash/display/Stage_as.cpp
+DISPLAY_HEADERS += asobj/flash/display/Stage_as.h
# endif
libgnashasobjs_la_SOURCES += $(DISPLAY_SOURCES) $(DISPLAY_SOURCES_AS2)
=== modified file 'libcore/asobj/flash/errors/errors.am'
--- a/libcore/asobj/flash/errors/errors.am 2009-06-07 00:49:02 +0000
+++ b/libcore/asobj/flash/errors/errors.am 2009-06-07 16:20:44 +0000
@@ -17,44 +17,42 @@
ERRORSdir = $(includedir)/gnash
-#AM_CPPFLAGS += -I$(ERRORSdir)
-
-ERRORS_SOURCES = flash/errors/errors_pkg.cpp
-ERRORS_HEADERS = flash/errors/errors_pkg.h
+ERRORS_SOURCES = asobj/flash/errors/errors_pkg.cpp
+ERRORS_HEADERS = asobj/flash/errors/errors_pkg.h
if BUILD_EOFERROR_AS3
-ERRORS_SOURCES += flash/errors/EOFError_as.cpp
-ERRORS_HEADERS += flash/errors/EOFError_as.h
+ERRORS_SOURCES += asobj/flash/errors/EOFError_as.cpp
+ERRORS_HEADERS += asobj/flash/errors/EOFError_as.h
endif
if BUILD_IOERROR_AS3
-ERRORS_SOURCES += flash/errors/IOError_as.cpp
-ERRORS_HEADERS += flash/errors/IOError_as.h
+ERRORS_SOURCES += asobj/flash/errors/IOError_as.cpp
+ERRORS_HEADERS += asobj/flash/errors/IOError_as.h
endif
if BUILD_ILLEGALOPERATIONERROR_AS3
-ERRORS_SOURCES += flash/errors/IllegalOperationError_as.cpp
-ERRORS_HEADERS += flash/errors/IllegalOperationError_as.h
+ERRORS_SOURCES += asobj/flash/errors/IllegalOperationError_as.cpp
+ERRORS_HEADERS += asobj/flash/errors/IllegalOperationError_as.h
endif
if BUILD_INVALIDSWFERROR_AS3
-ERRORS_SOURCES += flash/errors/InvalidSWFError_as.cpp
-ERRORS_HEADERS += flash/errors/InvalidSWFError_as.h
+ERRORS_SOURCES += asobj/flash/errors/InvalidSWFError_as.cpp
+ERRORS_HEADERS += asobj/flash/errors/InvalidSWFError_as.h
endif
if BUILD_MEMORYERROR_AS3
-ERRORS_SOURCES += flash/errors/MemoryError_as.cpp
-ERRORS_HEADERS += flash/errors/MemoryError_as.h
+ERRORS_SOURCES += asobj/flash/errors/MemoryError_as.cpp
+ERRORS_HEADERS += asobj/flash/errors/MemoryError_as.h
endif
if BUILD_SCRIPTTIMEOUTERROR_AS3
-ERRORS_SOURCES += flash/errors/ScriptTimeoutError_as.cpp
-ERRORS_HEADERS += flash/errors/ScriptTimeoutError_as.h
+ERRORS_SOURCES += asobj/flash/errors/ScriptTimeoutError_as.cpp
+ERRORS_HEADERS += asobj/flash/errors/ScriptTimeoutError_as.h
endif
if BUILD_STACKOVERFLOWERROR_AS3
-ERRORS_SOURCES += flash/errors/StackOverflowError_as.cpp
-ERRORS_HEADERS += flash/errors/StackOverflowError_as.h
+ERRORS_SOURCES += asobj/flash/errors/StackOverflowError_as.cpp
+ERRORS_HEADERS += asobj/flash/errors/StackOverflowError_as.h
endif
libgnashasobjs_la_SOURCES += $(ERRORS_SOURCES)
=== modified file 'libcore/asobj/flash/events/events.am'
--- a/libcore/asobj/flash/events/events.am 2009-06-07 00:49:02 +0000
+++ b/libcore/asobj/flash/events/events.am 2009-06-07 16:20:44 +0000
@@ -17,122 +17,122 @@
EVENTSdir = $(includedir)/gnash
-EVENTS_SOURCES = flash/events/events_pkg.cpp
-EVENTS_HEADERS = flash/events/events_pkg.h
+EVENTS_SOURCES = asobj/flash/events/events_pkg.cpp
+EVENTS_HEADERS = asobj/flash/events/events_pkg.h
if BUILD_ACTIVITYEVENT_AS3
-EVENTS_SOURCES += flash/events/ActivityEvent_as.cpp
-EVENTS_HEADERS += flash/events/ActivityEvent_as.h
+EVENTS_SOURCES += asobj/flash/events/ActivityEvent_as.cpp
+EVENTS_HEADERS += asobj/flash/events/ActivityEvent_as.h
endif
if BUILD_ASYNCERROREVENT_AS3
-EVENTS_SOURCES += flash/events/AsyncErrorEvent_as.cpp
-EVENTS_HEADERS += flash/events/AsyncErrorEvent_as.h
+EVENTS_SOURCES += asobj/flash/events/AsyncErrorEvent_as.cpp
+EVENTS_HEADERS += asobj/flash/events/AsyncErrorEvent_as.h
endif
if BUILD_CONTEXTMENUEVENT_AS3
-EVENTS_SOURCES += flash/events/ContextMenuEvent_as.cpp
-EVENTS_HEADERS += flash/events/ContextMenuEvent_as.h
+EVENTS_SOURCES += asobj/flash/events/ContextMenuEvent_as.cpp
+EVENTS_HEADERS += asobj/flash/events/ContextMenuEvent_as.h
endif
if BUILD_DATAEVENT_AS3
-EVENTS_SOURCES += flash/events/DataEvent_as.cpp
-EVENTS_HEADERS += flash/events/DataEvent_as.h
+EVENTS_SOURCES += asobj/flash/events/DataEvent_as.cpp
+EVENTS_HEADERS += asobj/flash/events/DataEvent_as.h
endif
if BUILD_ERROREVENT_AS3
-EVENTS_SOURCES += flash/events/ErrorEvent_as.cpp
-EVENTS_HEADERS += flash/events/ErrorEvent_as.h
+EVENTS_SOURCES += asobj/flash/events/ErrorEvent_as.cpp
+EVENTS_HEADERS += asobj/flash/events/ErrorEvent_as.h
endif
if BUILD_EVENTDISPATCHER_AS3
-EVENTS_SOURCES += flash/events/EventDispatcher_as.cpp
-EVENTS_HEADERS += flash/events/EventDispatcher_as.h
+EVENTS_SOURCES += asobj/flash/events/EventDispatcher_as.cpp
+EVENTS_HEADERS += asobj/flash/events/EventDispatcher_as.h
endif
if BUILD_EVENTPHASE_AS3
-EVENTS_SOURCES += flash/events/EventPhase_as.cpp
-EVENTS_HEADERS += flash/events/EventPhase_as.h
+EVENTS_SOURCES += asobj/flash/events/EventPhase_as.cpp
+EVENTS_HEADERS += asobj/flash/events/EventPhase_as.h
endif
if BUILD_EVENT_AS3
-EVENTS_SOURCES += flash/events/Event_as.cpp
-EVENTS_HEADERS += flash/events/Event_as.h
+EVENTS_SOURCES += asobj/flash/events/Event_as.cpp
+EVENTS_HEADERS += asobj/flash/events/Event_as.h
endif
if BUILD_FOCUSEVENT_AS3
-EVENTS_SOURCES += flash/events/FocusEvent_as.cpp
-EVENTS_HEADERS += flash/events/FocusEvent_as.h
+EVENTS_SOURCES += asobj/flash/events/FocusEvent_as.cpp
+EVENTS_HEADERS += asobj/flash/events/FocusEvent_as.h
endif
if BUILD_FULLSCREENEVENT_AS3
-EVENTS_SOURCES += flash/events/FullScreenEvent_as.cpp
-EVENTS_HEADERS += flash/events/FullScreenEvent_as.h
+EVENTS_SOURCES += asobj/flash/events/FullScreenEvent_as.cpp
+EVENTS_HEADERS += asobj/flash/events/FullScreenEvent_as.h
endif
if BUILD_HTTPSTATUSEVENT_AS3
-EVENTS_SOURCES += flash/events/HTTPStatusEvent_as.cpp
-EVENTS_HEADERS += flash/events/HTTPStatusEvent_as.h
+EVENTS_SOURCES += asobj/flash/events/HTTPStatusEvent_as.cpp
+EVENTS_HEADERS += asobj/flash/events/HTTPStatusEvent_as.h
endif
if BUILD_IEVENTDISPATCHER_AS3
-EVENTS_SOURCES += flash/events/IEventDispatcher_as.cpp
-EVENTS_HEADERS += flash/events/IEventDispatcher_as.h
+EVENTS_SOURCES += asobj/flash/events/IEventDispatcher_as.cpp
+EVENTS_HEADERS += asobj/flash/events/IEventDispatcher_as.h
endif
if BUILD_IMEEVENT_AS3
-EVENTS_SOURCES += flash/events/IMEEvent_as.cpp
-EVENTS_HEADERS += flash/events/IMEEvent_as.h
+EVENTS_SOURCES += asobj/flash/events/IMEEvent_as.cpp
+EVENTS_HEADERS += asobj/flash/events/IMEEvent_as.h
endif
if BUILD_IOERROREVENT_AS3
-EVENTS_SOURCES += flash/events/IOErrorEvent_as.cpp
-EVENTS_HEADERS += flash/events/IOErrorEvent_as.h
+EVENTS_SOURCES += asobj/flash/events/IOErrorEvent_as.cpp
+EVENTS_HEADERS += asobj/flash/events/IOErrorEvent_as.h
endif
if BUILD_KEYBOARDEVENT_AS3
-EVENTS_SOURCES += flash/events/KeyboardEvent_as.cpp
-EVENTS_HEADERS += flash/events/KeyboardEvent_as.h
+EVENTS_SOURCES += asobj/flash/events/KeyboardEvent_as.cpp
+EVENTS_HEADERS += asobj/flash/events/KeyboardEvent_as.h
endif
if BUILD_MOUSEEVENT_AS3
-EVENTS_SOURCES += flash/events/MouseEvent_as.cpp
-EVENTS_HEADERS += flash/events/MouseEvent_as.h
+EVENTS_SOURCES += asobj/flash/events/MouseEvent_as.cpp
+EVENTS_HEADERS += asobj/flash/events/MouseEvent_as.h
endif
if BUILD_NETSTATUSEVENT_AS3
-EVENTS_SOURCES += flash/events/NetStatusEvent_as.cpp
-EVENTS_HEADERS += flash/events/NetStatusEvent_as.h
+EVENTS_SOURCES += asobj/flash/events/NetStatusEvent_as.cpp
+EVENTS_HEADERS += asobj/flash/events/NetStatusEvent_as.h
endif
if BUILD_PROGRESSEVENT_AS3
-EVENTS_SOURCES += flash/events/ProgressEvent_as.cpp
-EVENTS_HEADERS += flash/events/ProgressEvent_as.h
+EVENTS_SOURCES += asobj/flash/events/ProgressEvent_as.cpp
+EVENTS_HEADERS += asobj/flash/events/ProgressEvent_as.h
endif
if BUILD_SECURITYERROREVENT_AS3
-EVENTS_SOURCES += flash/events/SecurityErrorEvent_as.cpp
-EVENTS_HEADERS += flash/events/SecurityErrorEvent_as.h
+EVENTS_SOURCES += asobj/flash/events/SecurityErrorEvent_as.cpp
+EVENTS_HEADERS += asobj/flash/events/SecurityErrorEvent_as.h
endif
if BUILD_STATUSEVENT_AS3
-EVENTS_SOURCES += flash/events/StatusEvent_as.cpp
-EVENTS_HEADERS += flash/events/StatusEvent_as.h
+EVENTS_SOURCES += asobj/flash/events/StatusEvent_as.cpp
+EVENTS_HEADERS += asobj/flash/events/StatusEvent_as.h
endif
if BUILD_SYNCEVENT_AS3
-EVENTS_SOURCES += flash/events/SyncEvent_as.cpp
-EVENTS_HEADERS += flash/events/SyncEvent_as.h
+EVENTS_SOURCES += asobj/flash/events/SyncEvent_as.cpp
+EVENTS_HEADERS += asobj/flash/events/SyncEvent_as.h
endif
if BUILD_TEXTEVENT_AS3
-EVENTS_SOURCES += flash/events/TextEvent_as.cpp
-EVENTS_HEADERS += flash/events/TextEvent_as.h
+EVENTS_SOURCES += asobj/flash/events/TextEvent_as.cpp
+EVENTS_HEADERS += asobj/flash/events/TextEvent_as.h
endif
if BUILD_TIMEREVENT_AS3
-EVENTS_SOURCES += flash/events/TimerEvent_as.cpp
-EVENTS_HEADERS += flash/events/TimerEvent_as.h
+EVENTS_SOURCES += asobj/flash/events/TimerEvent_as.cpp
+EVENTS_HEADERS += asobj/flash/events/TimerEvent_as.h
endif
libgnashasobjs_la_SOURCES += $(EVENTS_SOURCES)
=== modified file 'libcore/asobj/flash/external/external.am'
--- a/libcore/asobj/flash/external/external.am 2009-06-07 00:49:02 +0000
+++ b/libcore/asobj/flash/external/external.am 2009-06-07 16:20:44 +0000
@@ -17,14 +17,12 @@
EXTERNALdir = $(includedir)/gnash
-#AM_CPPFLAGS += -I$(EXTERNALdir)
-
-EXTERNAL_SOURCES = flash/external/external_pkg.cpp
-EXTERNAL_HEADERS = flash/external/external_pkg.h
+EXTERNAL_SOURCES = asobj/flash/external/external_pkg.cpp
+EXTERNAL_HEADERS = asobj/flash/external/external_pkg.h
if BUILD_EXTERNALINTERFACE_AS3
-EXTERNAL_SOURCES += flash/external/ExternalInterface_as.cpp
-EXTERNAL_HEADERS += flash/external/ExternalInterface_as.h
+EXTERNAL_SOURCES += asobj/flash/external/ExternalInterface_as.cpp
+EXTERNAL_HEADERS += asobj/flash/external/ExternalInterface_as.h
endif
libgnashasobjs_la_SOURCES += $(EXTERNAL_SOURCES)
=== modified file 'libcore/asobj/flash/filters/filters.am'
--- a/libcore/asobj/flash/filters/filters.am 2009-06-07 00:49:02 +0000
+++ b/libcore/asobj/flash/filters/filters.am 2009-06-07 16:20:44 +0000
@@ -17,72 +17,72 @@
FILTERSdir = $(includedir)/gnash
-FILTERS_SOURCES = flash/filters/filters_pkg.cpp
-FILTERS_HEADERS = flash/filters/filters_pkg.h
+FILTERS_SOURCES = asobj/flash/filters/filters_pkg.cpp
+FILTERS_HEADERS = asobj/flash/filters/filters_pkg.h
if BUILD_BEVELFILTER_AS3
-FILTERS_SOURCES += flash/filters/BevelFilter_as.cpp
-FILTERS_HEADERS += flash/filters/BevelFilter_as.h
+FILTERS_SOURCES += asobj/flash/filters/BevelFilter_as.cpp
+FILTERS_HEADERS += asobj/flash/filters/BevelFilter_as.h
endif
if BUILD_BITMAPFILTERQUALITY_AS3
-FILTERS_SOURCES += flash/filters/BitmapFilterQuality_as.cpp
-FILTERS_HEADERS += flash/filters/BitmapFilterQuality_as.h
+FILTERS_SOURCES += asobj/flash/filters/BitmapFilterQuality_as.cpp
+FILTERS_HEADERS += asobj/flash/filters/BitmapFilterQuality_as.h
endif
if BUILD_BITMAPFILTERTYPE_AS3
-FILTERS_SOURCES += flash/filters/BitmapFilterType_as.cpp
-FILTERS_HEADERS += flash/filters/BitmapFilterType_as.h
+FILTERS_SOURCES += asobj/flash/filters/BitmapFilterType_as.cpp
+FILTERS_HEADERS += asobj/flash/filters/BitmapFilterType_as.h
endif
if BUILD_BITMAPFILTER_AS3
-FILTERS_SOURCES += flash/filters/BitmapFilter_as.cpp
-FILTERS_HEADERS += flash/filters/BitmapFilter_as.h
+FILTERS_SOURCES += asobj/flash/filters/BitmapFilter_as.cpp
+FILTERS_HEADERS += asobj/flash/filters/BitmapFilter_as.h
endif
if BUILD_BLURFILTER_AS3
-FILTERS_SOURCES += flash/filters/BlurFilter_as.cpp
-FILTERS_HEADERS += flash/filters/BlurFilter_as.h
+FILTERS_SOURCES += asobj/flash/filters/BlurFilter_as.cpp
+FILTERS_HEADERS += asobj/flash/filters/BlurFilter_as.h
endif
if BUILD_COLORMATRIXFILTER_AS3
-FILTERS_SOURCES += flash/filters/ColorMatrixFilter_as.cpp
-FILTERS_HEADERS += flash/filters/ColorMatrixFilter_as.h
+FILTERS_SOURCES += asobj/flash/filters/ColorMatrixFilter_as.cpp
+FILTERS_HEADERS += asobj/flash/filters/ColorMatrixFilter_as.h
endif
if BUILD_CONVOLUTIONFILTER_AS3
-FILTERS_SOURCES += flash/filters/ConvolutionFilter_as.cpp
-FILTERS_HEADERS += flash/filters/ConvolutionFilter_as.h
+FILTERS_SOURCES += asobj/flash/filters/ConvolutionFilter_as.cpp
+FILTERS_HEADERS += asobj/flash/filters/ConvolutionFilter_as.h
endif
if BUILD_DISPLACEMENTMAPFILTERMODE_AS3
-FILTERS_SOURCES += flash/filters/DisplacementMapFilterMode_as.cpp
-FILTERS_HEADERS += flash/filters/DisplacementMapFilterMode_as.h
+FILTERS_SOURCES += asobj/flash/filters/DisplacementMapFilterMode_as.cpp
+FILTERS_HEADERS += asobj/flash/filters/DisplacementMapFilterMode_as.h
endif
if BUILD_DISPLACEMENTMAPFILTER_AS3
-FILTERS_SOURCES += flash/filters/DisplacementMapFilter_as.cpp
-FILTERS_HEADERS += flash/filters/DisplacementMapFilter_as.h
+FILTERS_SOURCES += asobj/flash/filters/DisplacementMapFilter_as.cpp
+FILTERS_HEADERS += asobj/flash/filters/DisplacementMapFilter_as.h
endif
if BUILD_DROPSHADOWFILTER_AS3
-FILTERS_SOURCES += flash/filters/DropShadowFilter_as.cpp
-FILTERS_HEADERS += flash/filters/DropShadowFilter_as.h
+FILTERS_SOURCES += asobj/flash/filters/DropShadowFilter_as.cpp
+FILTERS_HEADERS += asobj/flash/filters/DropShadowFilter_as.h
endif
if BUILD_GLOWFILTER_AS3
-FILTERS_SOURCES += flash/filters/GlowFilter_as.cpp
-FILTERS_HEADERS += flash/filters/GlowFilter_as.h
+FILTERS_SOURCES += asobj/flash/filters/GlowFilter_as.cpp
+FILTERS_HEADERS += asobj/flash/filters/GlowFilter_as.h
endif
if BUILD_GRADIENTBEVELFILTER_AS3
-FILTERS_SOURCES += flash/filters/GradientBevelFilter_as.cpp
-FILTERS_HEADERS += flash/filters/GradientBevelFilter_as.h
+FILTERS_SOURCES += asobj/flash/filters/GradientBevelFilter_as.cpp
+FILTERS_HEADERS += asobj/flash/filters/GradientBevelFilter_as.h
endif
if BUILD_GRADIENTGLOWFILTER_AS3
-FILTERS_SOURCES += flash/filters/GradientGlowFilter_as.cpp
-FILTERS_HEADERS += flash/filters/GradientGlowFilter_as.h
+FILTERS_SOURCES += asobj/flash/filters/GradientGlowFilter_as.cpp
+FILTERS_HEADERS += asobj/flash/filters/GradientGlowFilter_as.h
endif
libgnashasobjs_la_SOURCES += $(FILTERS_SOURCES)
=== modified file 'libcore/asobj/flash/geom/geom.am'
--- a/libcore/asobj/flash/geom/geom.am 2009-06-07 00:49:02 +0000
+++ b/libcore/asobj/flash/geom/geom.am 2009-06-07 16:20:44 +0000
@@ -17,32 +17,32 @@
GEOMdir = $(includedir)/gnash
-GEOM_SOURCES = flash/geom/geom_pkg.cpp
-GEOM_HEADERS = flash/geom/geom_pkg.h
+GEOM_SOURCES = asobj/flash/geom/geom_pkg.cpp
+GEOM_HEADERS = asobj/flash/geom/geom_pkg.h
if BUILD_COLORTRANSFORM_AS3
-GEOM_SOURCES += flash/geom/ColorTransform_as.cpp
-GEOM_HEADERS += flash/geom/ColorTransform_as.h
+GEOM_SOURCES += asobj/flash/geom/ColorTransform_as.cpp
+GEOM_HEADERS += asobj/flash/geom/ColorTransform_as.h
endif
if BUILD_MATRIX_AS3
-GEOM_SOURCES += flash/geom/Matrix_as.cpp
-GEOM_HEADERS += flash/geom/Matrix_as.h
+GEOM_SOURCES += asobj/flash/geom/Matrix_as.cpp
+GEOM_HEADERS += asobj/flash/geom/Matrix_as.h
endif
if BUILD_POINT_AS3
-GEOM_SOURCES += flash/geom/Point_as.cpp
-GEOM_HEADERS += flash/geom/Point_as.h
+GEOM_SOURCES += asobj/flash/geom/Point_as.cpp
+GEOM_HEADERS += asobj/flash/geom/Point_as.h
endif
if BUILD_RECTANGLE_AS3
-GEOM_SOURCES += flash/geom/Rectangle_as.cpp
-GEOM_HEADERS += flash/geom/Rectangle_as.h
+GEOM_SOURCES += asobj/flash/geom/Rectangle_as.cpp
+GEOM_HEADERS += asobj/flash/geom/Rectangle_as.h
endif
if BUILD_TRANSFORM_AS3
-GEOM_SOURCES += flash/geom/Transform_as.cpp
-GEOM_HEADERS += flash/geom/Transform_as.h
+GEOM_SOURCES += asobj/flash/geom/Transform_as.cpp
+GEOM_HEADERS += asobj/flash/geom/Transform_as.h
endif
libgnashasobjs_la_SOURCES += $(GEOM_SOURCES)
=== modified file 'libcore/asobj/flash/media/media.am'
--- a/libcore/asobj/flash/media/media.am 2009-06-07 00:49:02 +0000
+++ b/libcore/asobj/flash/media/media.am 2009-06-07 16:20:44 +0000
@@ -17,55 +17,55 @@
MEDIAdir = $(includedir)/gnash
-MEDIA_SOURCES = flash/media/media_pkg.cpp
-MEDIA_HEADERS = flash/media/media_pkg.h
+MEDIA_SOURCES = asobj/flash/media/media_pkg.cpp
+MEDIA_HEADERS = asobj/flash/media/media_pkg.h
# FIXME: already exists
if BUILD_CAMERA_AS3
-# MEDIA_SOURCES += flash/media/Camera_as.cpp
-MEDIA_HEADERS += flash/media/Camera_as.h
+# MEDIA_SOURCES += asobj/flash/media/Camera_as.cpp
+MEDIA_HEADERS += asobj/flash/media/Camera_as.h
endif
if BUILD_ID3INFO_AS3
-MEDIA_SOURCES += flash/media/ID3Info_as.cpp
-MEDIA_HEADERS += flash/media/ID3Info_as.h
+MEDIA_SOURCES += asobj/flash/media/ID3Info_as.cpp
+MEDIA_HEADERS += asobj/flash/media/ID3Info_as.h
endif
# FIXME: already exists
if BUILD_MICROPHONE_AS3
-# MEDIA_SOURCES += flash/media/Microphone_as.cpp
-MEDIA_HEADERS += flash/media/Microphone_as.h
+# MEDIA_SOURCES += asobj/flash/media/Microphone_as.cpp
+MEDIA_HEADERS += asobj/flash/media/Microphone_as.h
endif
if BUILD_SOUNDCHANNEL_AS3
-MEDIA_SOURCES += flash/media/SoundChannel_as.cpp
-MEDIA_HEADERS += flash/media/SoundChannel_as.h
+MEDIA_SOURCES += asobj/flash/media/SoundChannel_as.cpp
+MEDIA_HEADERS += asobj/flash/media/SoundChannel_as.h
endif
if BUILD_SOUNDLOADERCONTEXT_AS3
-MEDIA_SOURCES += flash/media/SoundLoaderContext_as.cpp
-MEDIA_HEADERS += flash/media/SoundLoaderContext_as.h
+MEDIA_SOURCES += asobj/flash/media/SoundLoaderContext_as.cpp
+MEDIA_HEADERS += asobj/flash/media/SoundLoaderContext_as.h
endif
if BUILD_SOUNDMIXER_AS3
-MEDIA_SOURCES += flash/media/SoundMixer_as.cpp
-MEDIA_HEADERS += flash/media/SoundMixer_as.h
+MEDIA_SOURCES += asobj/flash/media/SoundMixer_as.cpp
+MEDIA_HEADERS += asobj/flash/media/SoundMixer_as.h
endif
if BUILD_SOUNDTRANSFORM_AS3
-MEDIA_SOURCES += flash/media/SoundTransform_as.cpp
-MEDIA_HEADERS += flash/media/SoundTransform_as.h
+MEDIA_SOURCES += asobj/flash/media/SoundTransform_as.cpp
+MEDIA_HEADERS += asobj/flash/media/SoundTransform_as.h
endif
if BUILD_SOUND_AS3
-# MEDIA_SOURCES += flash/media/Sound_as.cpp
-MEDIA_HEADERS += flash/media/Sound_as.h
+# MEDIA_SOURCES += asobj/flash/media/Sound_as.cpp
+MEDIA_HEADERS += asobj/flash/media/Sound_as.h
endif
# FIXME: already exists
if BUILD_VIDEO_AS3
-# MEDIA_SOURCES += flash/media/Video_as.cpp
-MEDIA_HEADERS += flash/media/Video_as.h
+# MEDIA_SOURCES += asobj/flash/media/Video_as.cpp
+MEDIA_HEADERS += asobj/flash/media/Video_as.h
endif
libgnashasobjs_la_SOURCES += $(MEDIA_SOURCES)
=== modified file 'libcore/asobj/flash/net/net.am'
--- a/libcore/asobj/flash/net/net.am 2009-06-07 00:49:02 +0000
+++ b/libcore/asobj/flash/net/net.am 2009-06-07 16:20:44 +0000
@@ -17,117 +17,117 @@
NETdir = $(includedir)/gnash
-NET_SOURCES = flash/net/net_pkg.cpp
-NET_HEADERS = flash/net/net_pkg.h
+NET_SOURCES = asobj/flash/net/net_pkg.cpp
+NET_HEADERS = asobj/flash/net/net_pkg.h
NET_SOURCES_AS2 =
NET_HEADERS_AS2 =
if BUILD_FILEFILTER_AS3
-NET_SOURCES += flash/net/FileFilter_as.cpp
-NET_HEADERS += flash/net/FileFilter_as.h
+NET_SOURCES += asobj/flash/net/FileFilter_as.cpp
+NET_HEADERS += asobj/flash/net/FileFilter_as.h
endif
if BUILD_FILEREFERENCELIST_AS3
-NET_SOURCES_AS2 += flash/net/FileReferenceList_as.cpp
-NET_HEADERS_AS2 += flash/net/FileReferenceList_as.h
+NET_SOURCES_AS2 += asobj/flash/net/FileReferenceList_as.cpp
+NET_HEADERS_AS2 += asobj/flash/net/FileReferenceList_as.h
endif
if BUILD_FILEREFERENCE_AS3
-NET_SOURCES_AS2 += flash/net/FileReference_as.cpp
-NET_HEADERS_AS2 += flash/net/FileReference_as.h
+NET_SOURCES_AS2 += asobj/flash/net/FileReference_as.cpp
+NET_HEADERS_AS2 += asobj/flash/net/FileReference_as.h
endif
if BUILD_IDYNAMICPROPERTYOUTPUT_AS3
-NET_SOURCES += flash/net/IDynamicPropertyOutput_as.cpp
-NET_HEADERS += flash/net/IDynamicPropertyOutput_as.h
+NET_SOURCES += asobj/flash/net/IDynamicPropertyOutput_as.cpp
+NET_HEADERS += asobj/flash/net/IDynamicPropertyOutput_as.h
endif
if BUILD_IDYNAMICPROPERTYWRITER_AS3
-NET_SOURCES += flash/net/IDynamicPropertyWriter_as.cpp
-NET_HEADERS += flash/net/IDynamicPropertyWriter_as.h
+NET_SOURCES += asobj/flash/net/IDynamicPropertyWriter_as.cpp
+NET_HEADERS += asobj/flash/net/IDynamicPropertyWriter_as.h
endif
if BUILD_LOCALCONNECTION_AS3
-# NET_SOURCES += flash/net/LocalConnection_as.cpp
-NET_HEADERS += flash/net/LocalConnection_as.h
+# NET_SOURCES += asobj/flash/net/LocalConnection_as.cpp
+NET_HEADERS += asobj/flash/net/LocalConnection_as.h
endif
if BUILD_NETCONNECTION_AS3
-# NET_SOURCES += flash/net/NetConnection_as.cpp
-NET_HEADERS += flash/net/NetConnection_as.h
+# NET_SOURCES += asobj/flash/net/NetConnection_as.cpp
+NET_HEADERS += asobj/flash/net/NetConnection_as.h
endif
if BUILD_NETSTREAM_AS3
-# NET_SOURCES += flash/net/NetStream_as.cpp
-NET_HEADERS += flash/net/NetStream_as.h
+# NET_SOURCES += asobj/flash/net/NetStream_as.cpp
+NET_HEADERS += asobj/flash/net/NetStream_as.h
endif
if BUILD_OBJECTENCODING_AS3
-NET_SOURCES += flash/net/ObjectEncoding_as.cpp
-NET_HEADERS += flash/net/ObjectEncoding_as.h
+NET_SOURCES += asobj/flash/net/ObjectEncoding_as.cpp
+NET_HEADERS += asobj/flash/net/ObjectEncoding_as.h
endif
if BUILD_RESPONDER_AS3
-NET_SOURCES += flash/net/Responder_as.cpp
-NET_HEADERS += flash/net/Responder_as.h
+NET_SOURCES += asobj/flash/net/Responder_as.cpp
+NET_HEADERS += asobj/flash/net/Responder_as.h
endif
if BUILD_SHAREDOBJECTFLUSHSTATUS_AS3
-NET_SOURCES += flash/net/SharedObjectFlushStatus_as.cpp
-NET_HEADERS += flash/net/SharedObjectFlushStatus_as.h
+NET_SOURCES += asobj/flash/net/SharedObjectFlushStatus_as.cpp
+NET_HEADERS += asobj/flash/net/SharedObjectFlushStatus_as.h
endif
FIXME: already exists
if BUILD_SHAREDOBJECT_AS3
-# NET_SOURCES += flash/net/SharedObject_as.cpp
-NET_HEADERS += flash/net/SharedObject_as.h
+# NET_SOURCES += asobj/flash/net/SharedObject_as.cpp
+NET_HEADERS += asobj/flash/net/SharedObject_as.h
endif
if BUILD_SOCKET_AS3
-NET_SOURCES += flash/net/Socket_as.cpp
-NET_HEADERS += flash/net/Socket_as.h
+NET_SOURCES += asobj/flash/net/Socket_as.cpp
+NET_HEADERS += asobj/flash/net/Socket_as.h
endif
if BUILD_URLLOADERDATAFORMAT_AS3
-# NET_SOURCES += flash/net/URLLoaderDataFormat_as.cpp
-NET_HEADERS += flash/net/URLLoaderDataFormat_as.h
+# NET_SOURCES += asobj/flash/net/URLLoaderDataFormat_as.cpp
+NET_HEADERS += asobj/flash/net/URLLoaderDataFormat_as.h
endif
if BUILD_URLLOADER_AS3
-NET_SOURCES += flash/net/URLLoader_as.cpp
-NET_HEADERS += flash/net/URLLoader_as.h
+NET_SOURCES += asobj/flash/net/URLLoader_as.cpp
+NET_HEADERS += asobj/flash/net/URLLoader_as.h
endif
if BUILD_URLREQUESTHEADER_AS3
-NET_SOURCES += flash/net/URLRequestHeader_as.cpp
-NET_HEADERS += flash/net/URLRequestHeader_as.h
+NET_SOURCES += asobj/flash/net/URLRequestHeader_as.cpp
+NET_HEADERS += asobj/flash/net/URLRequestHeader_as.h
endif
if BUILD_URLREQUESTMETHOD_AS3
-NET_SOURCES += flash/net/URLRequestMethod_as.cpp
-NET_HEADERS += flash/net/URLRequestMethod_as.h
+NET_SOURCES += asobj/flash/net/URLRequestMethod_as.cpp
+NET_HEADERS += asobj/flash/net/URLRequestMethod_as.h
endif
if BUILD_URLREQUEST_AS3
-# NET_SOURCES += flash/net/URLRequest_as.cpp
-NET_HEADERS += flash/net/URLRequest_as.h
+# NET_SOURCES += asobj/flash/net/URLRequest_as.cpp
+NET_HEADERS += asobj/flash/net/URLRequest_as.h
endif
if BUILD_URLSTREAM_AS3
-NET_SOURCES += flash/net/URLStream_as.cpp
-NET_HEADERS += flash/net/URLStream_as.h
+NET_SOURCES += asobj/flash/net/URLStream_as.cpp
+NET_HEADERS += asobj/flash/net/URLStream_as.h
endif
if BUILD_URLVARIABLES_AS3
-# NET_SOURCES += flash/net/URLVariables_as.cpp
-NET_HEADERS += flash/net/URLVariables_as.h
+# NET_SOURCES += asobj/flash/net/URLVariables_as.cpp
+NET_HEADERS += asobj/flash/net/URLVariables_as.h
endif
# FIXME: already exists
if BUILD_XMLSOCKET_AS3
-# NET_SOURCES += flash/net/XMLSocket_as.cpp
-NET_HEADERS += flash/net/XMLSocket_as.h
+# NET_SOURCES += asobj/flash/net/XMLSocket_as.cpp
+NET_HEADERS += asobj/flash/net/XMLSocket_as.h
endif
libgnashasobjs_la_SOURCES += $(NET_SOURCES) $(NET_SOURCES_AS2)
=== modified file 'libcore/asobj/flash/printing/printing.am'
--- a/libcore/asobj/flash/printing/printing.am 2009-06-07 00:49:02 +0000
+++ b/libcore/asobj/flash/printing/printing.am 2009-06-07 16:20:44 +0000
@@ -17,22 +17,22 @@
PRINTINGdir = $(includedir)/gnash
-PRINTING_SOURCES = flash/printing/printing_pkg.cpp
-PRINTING_HEADERS = flash/printing/printing_pkg.h
+PRINTING_SOURCES = asobj/flash/printing/printing_pkg.cpp
+PRINTING_HEADERS = asobj/flash/printing/printing_pkg.h
if BUILD_PRINTJOBOPTIONS_AS3
-PRINTING_SOURCES += flash/printing/PrintJobOptions_as.cpp
-PRINTING_HEADERS += flash/printing/PrintJobOptions_as.h
+PRINTING_SOURCES += asobj/flash/printing/PrintJobOptions_as.cpp
+PRINTING_HEADERS += asobj/flash/printing/PrintJobOptions_as.h
endif
if BUILD_PRINTJOBORIENTATION_AS3
-PRINTING_SOURCES += flash/printing/PrintJobOrientation_as.cpp
-PRINTING_HEADERS += flash/printing/PrintJobOrientation_as.h
+PRINTING_SOURCES += asobj/flash/printing/PrintJobOrientation_as.cpp
+PRINTING_HEADERS += asobj/flash/printing/PrintJobOrientation_as.h
endif
if BUILD_PRINTJOB_AS3
-PRINTING_SOURCES += flash/printing/PrintJob_as.cpp
-PRINTING_HEADERS += flash/printing/PrintJob_as.h
+PRINTING_SOURCES += asobj/flash/printing/PrintJob_as.cpp
+PRINTING_HEADERS += asobj/flash/printing/PrintJob_as.h
endif
libgnashasobjs_la_SOURCES += $(PRINTING_SOURCES)
=== modified file 'libcore/asobj/flash/sampler/sampler.am'
--- a/libcore/asobj/flash/sampler/sampler.am 2009-06-07 00:49:02 +0000
+++ b/libcore/asobj/flash/sampler/sampler.am 2009-06-07 16:20:44 +0000
@@ -17,27 +17,27 @@
SAMPLERdir = $(includedir)/gnash
-SAMPLER_SOURCES = flash/sampler/sampler_pkg.cpp
-SAMPLER_HEADERS = flash/sampler/sampler_pkg.h
+SAMPLER_SOURCES = asobj/flash/sampler/sampler_pkg.cpp
+SAMPLER_HEADERS = asobj/flash/sampler/sampler_pkg.h
if BUILD_DELETEOBJECTSAMPLE_AS3
-SAMPLER_SOURCES += flash/sampler/DeleteObjectSample_as.cpp
-SAMPLER_HEADERS += flash/sampler/DeleteObjectSample_as.h
+SAMPLER_SOURCES += asobj/flash/sampler/DeleteObjectSample_as.cpp
+SAMPLER_HEADERS += asobj/flash/sampler/DeleteObjectSample_as.h
endif
if BUILD_NEWOBJECTSAMPLE_AS3
-SAMPLER_SOURCES += flash/sampler/NewObjectSample_as.cpp
-SAMPLER_HEADERS += flash/sampler/NewObjectSample_as.h
+SAMPLER_SOURCES += asobj/flash/sampler/NewObjectSample_as.cpp
+SAMPLER_HEADERS += asobj/flash/sampler/NewObjectSample_as.h
endif
if BUILD_SAMPLE_AS3
-SAMPLER_SOURCES += flash/sampler/Sample_as.cpp
-SAMPLER_HEADERS += flash/sampler/Sample_as.h
+SAMPLER_SOURCES += asobj/flash/sampler/Sample_as.cpp
+SAMPLER_HEADERS += asobj/flash/sampler/Sample_as.h
endif
if BUILD_STACKFRAME_AS3
-SAMPLER_SOURCES += flash/sampler/StackFrame_as.cpp
-SAMPLER_HEADERS += flash/sampler/StackFrame_as.h
+SAMPLER_SOURCES += asobj/flash/sampler/StackFrame_as.cpp
+SAMPLER_HEADERS += asobj/flash/sampler/StackFrame_as.h
endif
libgnashasobjs_la_SOURCES += $(SAMPLER_SOURCES)
=== modified file 'libcore/asobj/flash/system/system.am'
--- a/libcore/asobj/flash/system/system.am 2009-06-07 00:49:02 +0000
+++ b/libcore/asobj/flash/system/system.am 2009-06-07 16:20:44 +0000
@@ -17,53 +17,53 @@
SYSTEMdir = $(includedir)/gnash
-SYSTEM_SOURCES = flash/system/system_pkg.cpp
-SYSTEM_HEADERS = flash/system/system_pkg.h
+SYSTEM_SOURCES = asobj/flash/system/system_pkg.cpp
+SYSTEM_HEADERS = asobj/flash/system/system_pkg.h
if BUILD_APPLICATIONDOMAIN_AS3
-SYSTEM_SOURCES += flash/system/ApplicationDomain_as.cpp
-SYSTEM_HEADERS += flash/system/ApplicationDomain_as.h
+SYSTEM_SOURCES += asobj/flash/system/ApplicationDomain_as.cpp
+SYSTEM_HEADERS += asobj/flash/system/ApplicationDomain_as.h
endif
if BUILD_CAPABILITIES_AS3
-SYSTEM_SOURCES += flash/system/Capabilities_as.cpp
-SYSTEM_HEADERS += flash/system/Capabilities_as.h
+SYSTEM_SOURCES += asobj/flash/system/Capabilities_as.cpp
+SYSTEM_HEADERS += asobj/flash/system/Capabilities_as.h
endif
if BUILD_IMECONVERSIONMODE_AS3
-SYSTEM_SOURCES += flash/system/IMEConversionMode_as.cpp
-SYSTEM_HEADERS += flash/system/IMEConversionMode_as.h
+SYSTEM_SOURCES += asobj/flash/system/IMEConversionMode_as.cpp
+SYSTEM_HEADERS += asobj/flash/system/IMEConversionMode_as.h
endif
if BUILD_IME_AS3
-SYSTEM_SOURCES += flash/system/IME_as.cpp
-SYSTEM_HEADERS += flash/system/IME_as.h
+SYSTEM_SOURCES += asobj/flash/system/IME_as.cpp
+SYSTEM_HEADERS += asobj/flash/system/IME_as.h
endif
if BUILD_LOADERCONTEXT_AS3
-SYSTEM_SOURCES += flash/system/LoaderContext_as.cpp
-SYSTEM_HEADERS += flash/system/LoaderContext_as.h
+SYSTEM_SOURCES += asobj/flash/system/LoaderContext_as.cpp
+SYSTEM_HEADERS += asobj/flash/system/LoaderContext_as.h
endif
if BUILD_SECURITYDOMAIN_AS3
-SYSTEM_SOURCES += flash/system/SecurityDomain_as.cpp
-SYSTEM_HEADERS += flash/system/SecurityDomain_as.h
+SYSTEM_SOURCES += asobj/flash/system/SecurityDomain_as.cpp
+SYSTEM_HEADERS += asobj/flash/system/SecurityDomain_as.h
endif
if BUILD_SECURITYPANEL_AS3
-SYSTEM_SOURCES += flash/system/SecurityPanel_as.cpp
-SYSTEM_HEADERS += flash/system/SecurityPanel_as.h
+SYSTEM_SOURCES += asobj/flash/system/SecurityPanel_as.cpp
+SYSTEM_HEADERS += asobj/flash/system/SecurityPanel_as.h
endif
if BUILD_SECURITY_AS3
-SYSTEM_SOURCES += flash/system/Security_as.cpp
-SYSTEM_HEADERS += flash/system/Security_as.h
+SYSTEM_SOURCES += asobj/flash/system/Security_as.cpp
+SYSTEM_HEADERS += asobj/flash/system/Security_as.h
endif
# FIXME: already exists
if BUILD_SYSTEM_AS3
-# SYSTEM_SOURCES += flash/system/System_as.cpp
-SYSTEM_HEADERS += flash/system/System_as.h
+# SYSTEM_SOURCES += asobj/flash/system/System_as.cpp
+SYSTEM_HEADERS += asobj/flash/system/System_as.h
endif
libgnashasobjs_la_SOURCES += $(SYSTEM_SOURCES)
=== modified file 'libcore/asobj/flash/text/text.am'
--- a/libcore/asobj/flash/text/text.am 2009-06-07 00:49:02 +0000
+++ b/libcore/asobj/flash/text/text.am 2009-06-07 16:20:44 +0000
@@ -17,103 +17,103 @@
TEXTdir = $(includedir)/gnash
-TEXT_SOURCES = flash/text/text_pkg.cpp
-TEXT_HEADERS = flash/text/text_pkg.h
+TEXT_SOURCES = asobj/flash/text/text_pkg.cpp
+TEXT_HEADERS = asobj/flash/text/text_pkg.h
TEXT_SOURCES_AS2 =
TEXT_HEADERS_AS2 =
if BUILD_ANTIALIASTYPE_AS3
-TEXT_SOURCES += flash/text/AntiAliasType_as.cpp
-TEXT_HEADERS += flash/text/AntiAliasType_as.h
+TEXT_SOURCES += asobj/flash/text/AntiAliasType_as.cpp
+TEXT_HEADERS += asobj/flash/text/AntiAliasType_as.h
endif
if BUILD_CSMSETTINGS_AS3
-TEXT_SOURCES += flash/text/CSMSettings_as.cpp
-TEXT_HEADERS += flash/text/CSMSettings_as.h
+TEXT_SOURCES += asobj/flash/text/CSMSettings_as.cpp
+TEXT_HEADERS += asobj/flash/text/CSMSettings_as.h
endif
if BUILD_FONTSTYLE_AS3
-TEXT_SOURCES += flash/text/FontStyle_as.cpp
-TEXT_HEADERS += flash/text/FontStyle_as.h
+TEXT_SOURCES += asobj/flash/text/FontStyle_as.cpp
+TEXT_HEADERS += asobj/flash/text/FontStyle_as.h
endif
if BUILD_FONTTYPE_AS3
-TEXT_SOURCES += flash/text/FontType_as.cpp
-TEXT_HEADERS += flash/text/FontType_as.h
+TEXT_SOURCES += asobj/flash/text/FontType_as.cpp
+TEXT_HEADERS += asobj/flash/text/FontType_as.h
endif
if BUILD_FONT_AS3
-TEXT_SOURCES += flash/text/Font_as.cpp
-TEXT_HEADERS += flash/text/Font_as.h
+TEXT_SOURCES += asobj/flash/text/Font_as.cpp
+TEXT_HEADERS += asobj/flash/text/Font_as.h
endif
if BUILD_GRIDFITTYPE_AS3
-TEXT_SOURCES += flash/text/GridFitType_as.cpp
-TEXT_HEADERS += flash/text/GridFitType_as.h
+TEXT_SOURCES += asobj/flash/text/GridFitType_as.cpp
+TEXT_HEADERS += asobj/flash/text/GridFitType_as.h
endif
if BUILD_STATICTEXT_AS3
-TEXT_SOURCES += flash/text/StaticText_as.cpp
-TEXT_HEADERS += flash/text/StaticText_as.h
+TEXT_SOURCES += asobj/flash/text/StaticText_as.cpp
+TEXT_HEADERS += asobj/flash/text/StaticText_as.h
endif
if BUILD_STYLESHEET_AS3
-TEXT_SOURCES += flash/text/StyleSheet_as.cpp
-TEXT_HEADERS += flash/text/StyleSheet_as.h
+TEXT_SOURCES += asobj/flash/text/StyleSheet_as.cpp
+TEXT_HEADERS += asobj/flash/text/StyleSheet_as.h
endif
if BUILD_TEXTCOLORTYPE_AS3
-TEXT_SOURCES += flash/text/TextColorType_as.cpp
-TEXT_HEADERS += flash/text/TextColorType_as.h
+TEXT_SOURCES += asobj/flash/text/TextColorType_as.cpp
+TEXT_HEADERS += asobj/flash/text/TextColorType_as.h
endif
if BUILD_TEXTDISPLAYMODE_AS3
-TEXT_SOURCES += flash/text/TextDisplayMode_as.cpp
-TEXT_HEADERS += flash/text/TextDisplayMode_as.h
+TEXT_SOURCES += asobj/flash/text/TextDisplayMode_as.cpp
+TEXT_HEADERS += asobj/flash/text/TextDisplayMode_as.h
endif
if BUILD_TEXTFIELDAUTOSIZE_AS3
-TEXT_SOURCES += flash/text/TextFieldAutoSize_as.cpp
-TEXT_HEADERS += flash/text/TextFieldAutoSize_as.h
+TEXT_SOURCES += asobj/flash/text/TextFieldAutoSize_as.cpp
+TEXT_HEADERS += asobj/flash/text/TextFieldAutoSize_as.h
endif
if BUILD_TEXTFIELDTYPE_AS3
-TEXT_SOURCES += flash/text/TextFieldType_as.cpp
-TEXT_HEADERS += flash/text/TextFieldType_as.h
+TEXT_SOURCES += asobj/flash/text/TextFieldType_as.cpp
+TEXT_HEADERS += asobj/flash/text/TextFieldType_as.h
endif
# FIXME: already exists
if BUILD_TEXTFIELD_AS3
-# TEXT_SOURCES += flash/text/TextField_as.cpp
-TEXT_HEADERS += flash/text/TextField_as.h
+# TEXT_SOURCES += asobj/flash/text/TextField_as.cpp
+TEXT_HEADERS += asobj/flash/text/TextField_as.h
endif
if BUILD_TEXTFORMATALIGN_AS3
-TEXT_SOURCES += flash/text/TextFormatAlign_as.cpp
-TEXT_HEADERS += flash/text/TextFormatAlign_as.h
+TEXT_SOURCES += asobj/flash/text/TextFormatAlign_as.cpp
+TEXT_HEADERS += asobj/flash/text/TextFormatAlign_as.h
endif
# FIXME: already exists
if BUILD_TEXTFORMAT_AS3
-# TEXT_SOURCES += flash/text/TextFormat_as.cpp
-TEXT_HEADERS += flash/text/TextFormat_as.h
+# TEXT_SOURCES += asobj/flash/text/TextFormat_as.cpp
+TEXT_HEADERS += asobj/flash/text/TextFormat_as.h
endif
if BUILD_TEXTLINEMETRICS_AS3
-TEXT_SOURCES += flash/text/TextLineMetrics_as.cpp
-TEXT_HEADERS += flash/text/TextLineMetrics_as.h
+TEXT_SOURCES += asobj/flash/text/TextLineMetrics_as.cpp
+TEXT_HEADERS += asobj/flash/text/TextLineMetrics_as.h
endif
if BUILD_TEXTRENDERER_AS3
-TEXT_SOURCES_AS2 += flash/text/TextRenderer_as.cpp
-TEXT_HEADERS_AS2 += flash/text/TextRenderer_as.h
+TEXT_SOURCES_AS2 += asobj/flash/text/TextRenderer_as.cpp
+TEXT_HEADERS_AS2 += asobj/flash/text/TextRenderer_as.h
endif
# FIXME: already exists
if BUILD_TEXTSNAPSHOT_AS3
-# TEXT_SOURCES += flash/text/TextSnapshot_as.cpp
-TEXT_HEADERS += flash/text/TextSnapshot_as.h
+# TEXT_SOURCES += asobj/flash/text/TextSnapshot_as.cpp
+TEXT_HEADERS += asobj/flash/text/TextSnapshot_as.h
endif
libgnashasobjs_la_SOURCES += $(TEXT_SOURCES) $(TEXT_SOURCES_AS2)
=== modified file 'libcore/asobj/flash/ui/ui.am'
--- a/libcore/asobj/flash/ui/ui.am 2009-06-07 00:49:02 +0000
+++ b/libcore/asobj/flash/ui/ui.am 2009-06-07 16:20:44 +0000
@@ -17,38 +17,38 @@
UIdir = $(includedir)/gnash
-UI_SOURCES = flash/ui/ui_pkg.cpp
-UI_HEADERS = flash/ui/ui_pkg.h
+UI_SOURCES = asobj/flash/ui/ui_pkg.cpp
+UI_HEADERS = asobj/flash/ui/ui_pkg.h
if BUILD_CONTEXTMENUBUILTINITEMS_AS3
-UI_SOURCES += flash/ui/ContextMenuBuiltInItems_as.cpp
-UI_HEADERS += flash/ui/ContextMenuBuiltInItems_as.h
+UI_SOURCES += asobj/flash/ui/ContextMenuBuiltInItems_as.cpp
+UI_HEADERS += asobj/flash/ui/ContextMenuBuiltInItems_as.h
endif
if BUILD_CONTEXTMENUITEM_AS3
-UI_SOURCES += flash/ui/ContextMenuItem_as.cpp
-UI_HEADERS += flash/ui/ContextMenuItem_as.h
+UI_SOURCES += asobj/flash/ui/ContextMenuItem_as.cpp
+UI_HEADERS += asobj/flash/ui/ContextMenuItem_as.h
endif
# FIXME: already exists
if BUILD_CONTEXTMENU_AS3
-# UI_SOURCES += flash/ui/ContextMenu_as.cpp
-UI_HEADERS += flash/ui/ContextMenu_as.h
+# UI_SOURCES += asobj/flash/ui/ContextMenu_as.cpp
+UI_HEADERS += asobj/flash/ui/ContextMenu_as.h
endif
if BUILD_KEYLOCATION_AS3
-UI_SOURCES += flash/ui/KeyLocation_as.cpp
-UI_HEADERS += flash/ui/KeyLocation_as.h
+UI_SOURCES += asobj/flash/ui/KeyLocation_as.cpp
+UI_HEADERS += asobj/flash/ui/KeyLocation_as.h
endif
if BUILD_KEYBOARD_AS3
-UI_SOURCES += flash/ui/Keyboard_as.cpp
-UI_HEADERS += flash/ui/Keyboard_as.h
+UI_SOURCES += asobj/flash/ui/Keyboard_as.cpp
+UI_HEADERS += asobj/flash/ui/Keyboard_as.h
endif
if BUILD_MOUSE_AS3
-UI_SOURCES += flash/ui/Mouse_as.cpp
-UI_HEADERS += flash/ui/Mouse_as.h
+UI_SOURCES += asobj/flash/ui/Mouse_as.cpp
+UI_HEADERS += asobj/flash/ui/Mouse_as.h
endif
libgnashasobjs_la_SOURCES += $(UI_SOURCES)
=== modified file 'libcore/asobj/flash/utils/utils.am'
--- a/libcore/asobj/flash/utils/utils.am 2009-06-07 00:49:02 +0000
+++ b/libcore/asobj/flash/utils/utils.am 2009-06-07 16:20:44 +0000
@@ -17,47 +17,47 @@
UTILSdir = $(includedir)/gnash
-UTILS_SOURCES = flash/utils/utils_pkg.cpp
-UTILS_HEADERS = flash/utils/utils_pkg.h
+UTILS_SOURCES = asobj/flash/utils/utils_pkg.cpp
+UTILS_HEADERS = asobj/flash/utils/utils_pkg.h
if BUILD_BYTEARRAY_AS3
-UTILS_SOURCES += flash/utils/ByteArray_as.cpp
-UTILS_HEADERS += flash/utils/ByteArray_as.h
+UTILS_SOURCES += asobj/flash/utils/ByteArray_as.cpp
+UTILS_HEADERS += asobj/flash/utils/ByteArray_as.h
endif
if BUILD_DICTIONARY_AS3
-UTILS_SOURCES += flash/utils/Dictionary_as.cpp
-UTILS_HEADERS += flash/utils/Dictionary_as.h
+UTILS_SOURCES += asobj/flash/utils/Dictionary_as.cpp
+UTILS_HEADERS += asobj/flash/utils/Dictionary_as.h
endif
if BUILD_ENDIAN_AS3
-UTILS_SOURCES += flash/utils/Endian_as.cpp
-UTILS_HEADERS += flash/utils/Endian_as.h
+UTILS_SOURCES += asobj/flash/utils/Endian_as.cpp
+UTILS_HEADERS += asobj/flash/utils/Endian_as.h
endif
if BUILD_IDATAINPUT_AS3
-UTILS_SOURCES += flash/utils/IDataInput_as.cpp
-UTILS_HEADERS += flash/utils/IDataInput_as.h
+UTILS_SOURCES += asobj/flash/utils/IDataInput_as.cpp
+UTILS_HEADERS += asobj/flash/utils/IDataInput_as.h
endif
if BUILD_IDATAOUTPUT_AS3
-UTILS_SOURCES += flash/utils/IDataOutput_as.cpp
-UTILS_HEADERS += flash/utils/IDataOutput_as.h
+UTILS_SOURCES += asobj/flash/utils/IDataOutput_as.cpp
+UTILS_HEADERS += asobj/flash/utils/IDataOutput_as.h
endif
if BUILD_IEXTERNALIZABLE_AS3
-UTILS_SOURCES += flash/utils/IExternalizable_as.cpp
-UTILS_HEADERS += flash/utils/IExternalizable_as.h
+UTILS_SOURCES += asobj/flash/utils/IExternalizable_as.cpp
+UTILS_HEADERS += asobj/flash/utils/IExternalizable_as.h
endif
if BUILD_PROXY_AS3
-UTILS_SOURCES += flash/utils/Proxy_as.cpp
-UTILS_HEADERS += flash/utils/Proxy_as.h
+UTILS_SOURCES += asobj/flash/utils/Proxy_as.cpp
+UTILS_HEADERS += asobj/flash/utils/Proxy_as.h
endif
if BUILD_TIMER_AS3
-UTILS_SOURCES += flash/utils/Timer_as.cpp
-UTILS_HEADERS += flash/utils/Timer_as.h
+UTILS_SOURCES += asobj/flash/utils/Timer_as.cpp
+UTILS_HEADERS += asobj/flash/utils/Timer_as.h
endif
libgnashasobjs_la_SOURCES += $(UTILS_SOURCES)
=== modified file 'libcore/asobj/flash/xml/xml.am'
--- a/libcore/asobj/flash/xml/xml.am 2009-06-07 00:49:02 +0000
+++ b/libcore/asobj/flash/xml/xml.am 2009-06-07 16:20:44 +0000
@@ -18,8 +18,8 @@
XMLdir = $(includedir)/gnash
# This variable contains all classes in AS2 and AS3
-XML_SOURCES = flash/xml/xml_pkg.cpp
-XML_HEADERS = flash/xml/xml_pkg.h
+XML_SOURCES = asobj/flash/xml/xml_pkg.cpp
+XML_HEADERS = asobj/flash/xml/xml_pkg.h
# This variable contains the classes only in AS3
XML_SOURCES_AS3 =
@@ -28,18 +28,18 @@
# ActionScript 2 has the XML class, which has been renamed in
# ActionScript 3 to XMLDocument. They are the same class though.
if BUILD_XMLDOCUMENT_AS3
-XML_SOURCES += flash/xml/XMLDocument_as.cpp
-XML_HEADERS += flash/xml/XMLDocument_as.h
+XML_SOURCES += asobj/flash/xml/XMLDocument_as.cpp
+XML_HEADERS += asobj/flash/xml/XMLDocument_as.h
endif
if BUILD_XMLNODETYPE_AS3
-XML_SOURCES_AS3 += flash/xml/XMLNodeType_as.cpp
-XML_HEADERS_AS3 += flash/xml/XMLNodeType_as.h
+XML_SOURCES_AS3 += asobj/flash/xml/XMLNodeType_as.cpp
+XML_HEADERS_AS3 += asobj/flash/xml/XMLNodeType_as.h
endif
if BUILD_XMLNODE_AS3
-XML_SOURCES += flash/xml/XMLNode_as.cpp
-XML_HEADERS += flash/xml/XMLNode_as.h
+XML_SOURCES += asobj/flash/xml/XMLNode_as.cpp
+XML_HEADERS += asobj/flash/xml/XMLNode_as.h
endif
libgnashasobjs_la_SOURCES += $(XML_SOURCES) $(XML_SOURCES_AS3)
=== modified file 'utilities/Makefile.am'
--- a/utilities/Makefile.am 2009-05-31 21:37:14 +0000
+++ b/utilities/Makefile.am 2009-06-06 23:27:19 +0000
@@ -30,7 +30,6 @@
$(top_builddir)/libbase/libgnashbase.la \
$(top_builddir)/libmedia/libgnashmedia.la \
$(top_builddir)/libsound/libgnashsound.la \
- $(top_builddir)/libcore/asobj/libgnashasobjs.la \
$(NULL)
## WARNING: make sure GLIB_LIBS appears first
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r11021: work around circular dependencies till we figure out a better long-term fix.,
rob <=