[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/avm2 r9709: include all the sub makefiles
|
From: |
rob |
|
Subject: |
[Gnash-commit] /srv/bzr/gnash/avm2 r9709: include all the sub makefiles as fragments, instead of recursion. This is faster as make doesn't have to fire up as many shells and processes. It also lets us build a subset of all the classes much easier. |
|
Date: |
Fri, 24 Apr 2009 09:50:42 -0600 |
|
User-agent: |
Bazaar (1.5) |
------------------------------------------------------------
revno: 9709
committer: address@hidden
branch nick: avm2
timestamp: Fri 2009-04-24 09:50:42 -0600
message:
include all the sub makefiles as fragments, instead of recursion. This is
faster as make doesn't have to fire up as many shells and processes. It also
lets us build a subset of all the classes much easier.
renamed:
libcore/asobj3/accessibility/Makefile.am =>
libcore/asobj3/accessibility/accessibility.am
libcore/asobj3/containers/Makefile.am =>
libcore/asobj3/containers/containers.am
libcore/asobj3/controls/Makefile.am => libcore/asobj3/controls/controls.am
libcore/asobj3/core/Makefile.am => libcore/asobj3/core/core.am
libcore/asobj3/data/Makefile.am => libcore/asobj3/data/data.am
libcore/asobj3/desktop/Makefile.am => libcore/asobj3/desktop/desktop.am
libcore/asobj3/display/Makefile.am => libcore/asobj3/display/display.am
libcore/asobj3/errors/Makefile.am => libcore/asobj3/errors/errors.am
libcore/asobj3/events/Makefile.am => libcore/asobj3/events/events.am
modified:
libcore/asobj3/Makefile.am
macros/classes.m4
libcore/asobj3/accessibility/accessibility.am
libcore/asobj3/containers/containers.am
libcore/asobj3/controls/controls.am
libcore/asobj3/core/core.am
libcore/asobj3/data/data.am
libcore/asobj3/desktop/desktop.am
libcore/asobj3/display/display.am
libcore/asobj3/errors/errors.am
libcore/asobj3/events/events.am
=== modified file 'libcore/asobj3/Makefile.am'
--- a/libcore/asobj3/Makefile.am 2009-04-24 04:32:22 +0000
+++ b/libcore/asobj3/Makefile.am 2009-04-24 15:50:42 +0000
@@ -90,15 +90,15 @@
libgnashas3_la_SOURCES =
noinst_HEADERS =
-# include $(srcdir)/accessibility/accessibility.am
-# include $(srcdir)/containers/containers.am
-# include $(srcdir)/controls/controls.am
-# include $(srcdir)/core/core.am
-# include $(srcdir)/data/data.am
-# include $(srcdir)/desktop/desktop.am
-# include $(srcdir)/display/display.am
-# include $(srcdir)/errors/errors.am
-# include $(srcdir)/events/events.am
+include $(srcdir)/accessibility/accessibility.am
+include $(srcdir)/containers/containers.am
+include $(srcdir)/controls/controls.am
+include $(srcdir)/core/core.am
+include $(srcdir)/data/data.am
+include $(srcdir)/desktop/desktop.am
+include $(srcdir)/display/display.am
+include $(srcdir)/errors/errors.am
+include $(srcdir)/events/events.am
include $(srcdir)/external/external.am
include $(srcdir)/filesystem/filesystem.am
include $(srcdir)/filters/filters.am
=== renamed file 'libcore/asobj3/accessibility/Makefile.am' =>
'libcore/asobj3/accessibility/accessibility.am'
--- a/libcore/asobj3/accessibility/Makefile.am 2009-04-23 22:41:54 +0000
+++ b/libcore/asobj3/accessibility/accessibility.am 2009-04-24 15:50:42
+0000
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
#
-# Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 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
@@ -15,97 +15,77 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-AUTOMAKE_OPTIONS =
-
-# if the compiler has broken flaot support when optimized
-if BROKEN_FLOAT
-AM_CXXFLAGS = -ffloat-store
-endif
-
-noinst_LTLIBRARIES = libgnashas3.la
-
-AM_CPPFLAGS = \
- -I$(top_srcdir)/libnet \
- -I$(top_srcdir)/backend \
- -I$(top_srcdir)/libcore \
- -I$(top_srcdir)/libcore/swf \
- -I$(top_srcdir)/libcore/parser \
- -I$(top_srcdir)/libcore/vm \
- -I$(top_srcdir)/libbase \
- -I$(top_srcdir)/libamf \
- -I$(top_srcdir)/libltdl \
- -I$(top_srcdir)/libmedia \
- -I$(top_srcdir)/libsound \
- $(PTHREAD_CFLAGS) \
- $(GLIB_CFLAGS) \
- $(BOOST_CFLAGS) \
- $(FREETYPE2_CFLAGS) \
- $(NULL)
-
-
-libgnashas3_la_SOURCES = \
- AccImpl_as3.cpp \
- AccessibilityProperties_as3.cpp \
- Accessibility_as3.cpp \
- ButtonAccImpl_as3.cpp \
- CheckBoxAccImpl_as3.cpp \
- ComboBoxAccImpl_as3.cpp \
- DataGridAccImpl_as3.cpp \
- LabelButtonAccImpl_as3.cpp \
- ListAccImpl_as3.cpp \
- RadioButtonAccImpl_as3.cpp \
- SelectableListAccImpl_as3.cpp \
- TileListAccImpl_as3.cpp \
- UIComponentAccImpl_as3.cpp \
- $(NULL)
-
-noinst_HEADERS = \
- AccImpl_as3.h \
- AccessibilityProperties_as3.h \
- Accessibility_as3.h \
- ButtonAccImpl_as3.h \
- CheckBoxAccImpl_as3.h \
- ComboBoxAccImpl_as3.h \
- DataGridAccImpl_as3.h \
- LabelButtonAccImpl_as3.h \
- ListAccImpl_as3.h \
- RadioButtonAccImpl_as3.h \
- SelectableListAccImpl_as3.h \
- TileListAccImpl_as3.h \
- UIComponentAccImpl_as3.h \
- $(NULL)
-
-libgnashas3_la_LIBADD = \
- $(top_builddir)/libamf/libgnashamf.la \
- $(top_builddir)/libbase/libgnashbase.la
-
-if USE_FFMPEG_ENGINE
-AM_CPPFLAGS += $(FFMPEG_CFLAGS) \
- $(SDL_CFLAGS) \
- -I$(top_srcdir)/libmedia/ffmpeg
-libgnashas3_la_LIBADD += $(FFMPEG_LIBS) \
- $(SDL_LIBS)
-endif
-
-if USE_GST_ENGINE
-AM_CPPFLAGS += $(GSTREAMER_CFLAGS) \
- -I$(top_srcdir)/libmedia/gst
-libgnashas3_la_LIBADD += $(GSTREAMER_LIBS) \
- $(SDL_LIBS)
-endif
-
-#libgnashasobjs_la_LDFLAGS = -release $(VERSION) -no-undefined -export-dynamic
-
-if WIN32
- libgnashas3_la_LDFLAGS = -no-undefined
-endif
-
-# Rebuild with GCC 4.x Mudflap support
-mudflap:
- @echo "Rebuilding with GCC Mudflap support"
- $(MAKE) CXXFLAGS="$(CXXFLAGS) -fmudflap" LDFLAGS="$(LDFLAGS) -lmudflap"
-
-clean-hook:
- -rm -f core.*
-
+ACCESSIBILITYdir = $(srcdir)/accessibility
+
+AM_CPPFLAGS += -I$(ACCESSIBILITYdir)
+
+ACCESSIBILITY_SOURCES =
+ACCESSIBILITY_HEADERS =
+
+if BUILD_ACCIMPL_AS3
+ACCESSIBILITY_SOURCES += $(ACCESSIBILITYdir)/AccImpl_as3.cpp
+ACCESSIBILITY_HEADERS += $(ACCESSIBILITYdir)/AccImpl_as3.h
+endif
+
+if BUILD_ACCESSIBILITY_PROPERTIES_AS3
+ACCESSIBILITY_SOURCES += $(ACCESSIBILITYdir)/AccessibilityProperties_as3.cpp
+ACCESSIBILITY_HEADERS += $(ACCESSIBILITYdir)/AccessibilityProperties_as3.h
+endif
+
+if BUILD_ACCESSIBILITY_AS3
+ACCESSIBILITY_SOURCES += $(ACCESSIBILITYdir)/Accessibility_as3.cpp
+ACCESSIBILITY_HEADERS += $(ACCESSIBILITYdir)/Accessibility_as3.h
+endif
+
+if BUILD_BUTTONACCIMPL_AS3
+ACCESSIBILITY_SOURCES += $(ACCESSIBILITYdir)/ButtonAccImpl_as3.cpp
+ACCESSIBILITY_HEADERS += $(ACCESSIBILITYdir)/ButtonAccImpl_as3.h
+endif
+
+if BUILD_CHECKBOXACCIMPL_AS3
+ACCESSIBILITY_SOURCES += $(ACCESSIBILITYdir)/CheckBoxAccImpl_as3.cpp
+ACCESSIBILITY_HEADERS += $(ACCESSIBILITYdir)/CheckBoxAccImpl_as3.h
+endif
+
+if BUILD_COMBOBOXACCIMPL_AS3
+ACCESSIBILITY_SOURCES += $(ACCESSIBILITYdir)/ComboBoxAccImpl_as3.cpp
+ACCESSIBILITY_HEADERS += $(ACCESSIBILITYdir)/ComboBoxAccImpl_as3.h
+endif
+
+if BUILD_DATAGRIDACCIMPL_AS3
+ACCESSIBILITY_SOURCES += $(ACCESSIBILITYdir)/DataGridAccImpl_as3.cpp
+ACCESSIBILITY_HEADERS += $(ACCESSIBILITYdir)/DataGridAccImpl_as3.h
+endif
+
+if BUILD_LABELBUTTONACCIMPL_AS3
+ACCESSIBILITY_SOURCES += $(ACCESSIBILITYdir)/LabelButtonAccImpl_as3.cpp
+ACCESSIBILITY_HEADERS += $(ACCESSIBILITYdir)/LabelButtonAccImpl_as3.h
+endif
+
+if BUILD_LISTACCIMPL_AS3
+ACCESSIBILITY_SOURCES += $(ACCESSIBILITYdir)/ListAccImpl_as3.cpp
+ACCESSIBILITY_HEADERS += $(ACCESSIBILITYdir)/ListAccImpl_as3.h
+endif
+
+if BUILD_RADIOBUTTONACCIMPL_AS3
+ACCESSIBILITY_SOURCES += $(ACCESSIBILITYdir)/RadioButtonAccImpl_as3.cpp
+ACCESSIBILITY_HEADERS += $(ACCESSIBILITYdir)/RadioButtonAccImpl_as3.h
+endif
+
+if BUILD_SELECTABLELISTACCIMPL_AS3
+ACCESSIBILITY_SOURCES += $(ACCESSIBILITYdir)/SelectableListAccImpl_as3.cpp
+ACCESSIBILITY_HEADERS += $(ACCESSIBILITYdir)/SelectableListAccImpl_as3.h
+endif
+
+if BUILD_TILELISTACCIMPL_AS3
+ACCESSIBILITY_SOURCES += $(ACCESSIBILITYdir)/TileListAccImpl_as3.cpp
+ACCESSIBILITY_HEADERS += $(ACCESSIBILITYdir)/TileListAccImpl_as3.h
+endif
+
+if BUILD_UICOMPONENTACCIMPL_AS3
+ACCESSIBILITY_SOURCES += $(ACCESSIBILITYdir)/UIComponentAccImpl_as3.cpp
+ACCESSIBILITY_HEADERS += $(ACCESSIBILITYdir)/UIComponentAccImpl_as3.h
+endif
+
+libgnashas3_la_SOURCES += $(ACCESSIBILITY_SOURCES)
+noinst_HEADERS += $(ACCESSIBILITY_HEADERS)
=== renamed file 'libcore/asobj3/containers/Makefile.am' =>
'libcore/asobj3/containers/containers.am'
--- a/libcore/asobj3/containers/Makefile.am 2009-04-23 22:41:54 +0000
+++ b/libcore/asobj3/containers/containers.am 2009-04-24 15:50:42 +0000
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
#
-# Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 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
@@ -15,77 +15,27 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-AUTOMAKE_OPTIONS =
-
-# if the compiler has broken flaot support when optimized
-if BROKEN_FLOAT
-AM_CXXFLAGS = -ffloat-store
-endif
-
-noinst_LTLIBRARIES = libgnashas3.la
-
-AM_CPPFLAGS = \
- -I$(top_srcdir)/libnet \
- -I$(top_srcdir)/backend \
- -I$(top_srcdir)/libcore \
- -I$(top_srcdir)/libcore/swf \
- -I$(top_srcdir)/libcore/parser \
- -I$(top_srcdir)/libcore/vm \
- -I$(top_srcdir)/libbase \
- -I$(top_srcdir)/libamf \
- -I$(top_srcdir)/libltdl \
- -I$(top_srcdir)/libmedia \
- -I$(top_srcdir)/libsound \
- $(PTHREAD_CFLAGS) \
- $(GLIB_CFLAGS) \
- $(BOOST_CFLAGS) \
- $(FREETYPE2_CFLAGS) \
- $(NULL)
-
-
-libgnashas3_la_SOURCES = \
- BaseScrollPane_as3.cpp \
- ScrollPane_as3.cpp \
- UILoader_as3.cpp \
- $(NULL)
-
-noinst_HEADERS = \
- BaseScrollPane_as3.h \
- ScrollPane_as3.h \
- UILoader_as3.h \
- $(NULL)
-
-libgnashas3_la_LIBADD = \
- $(top_builddir)/libamf/libgnashamf.la \
- $(top_builddir)/libbase/libgnashbase.la
-
-if USE_FFMPEG_ENGINE
-AM_CPPFLAGS += $(FFMPEG_CFLAGS) \
- $(SDL_CFLAGS) \
- -I$(top_srcdir)/libmedia/ffmpeg
-libgnashas3_la_LIBADD += $(FFMPEG_LIBS) \
- $(SDL_LIBS)
-endif
-
-if USE_GST_ENGINE
-AM_CPPFLAGS += $(GSTREAMER_CFLAGS) \
- -I$(top_srcdir)/libmedia/gst
-libgnashas3_la_LIBADD += $(GSTREAMER_LIBS) \
- $(SDL_LIBS)
-endif
-
-#libgnashasobjs_la_LDFLAGS = -release $(VERSION) -no-undefined -export-dynamic
-
-if WIN32
- libgnashas3_la_LDFLAGS = -no-undefined
-endif
-
-# Rebuild with GCC 4.x Mudflap support
-mudflap:
- @echo "Rebuilding with GCC Mudflap support"
- $(MAKE) CXXFLAGS="$(CXXFLAGS) -fmudflap" LDFLAGS="$(LDFLAGS) -lmudflap"
-
-clean-hook:
- -rm -f core.*
-
+CONTAINERSdir = $(srcdir)/containers
+
+AM_CPPFLAGS += -I$(CONTAINERSdir)
+
+CONTAINERS_SOURCES =
+CONTAINERS_HEADERS =
+
+if BUILD_BASESCROLLPANE_AS3
+CONTAINERS_SOURCES += $(CONTAINERSdir)/BaseScrollPane_as3.cpp
+CONTAINERS_HEADERS += $(CONTAINERSdir)/BaseScrollPane_as3.h
+endif
+
+if BUILD_SCROLLPANE_AS3
+CONTAINERS_SOURCES += $(CONTAINERSdir)/ScrollPane_as3.cpp
+CONTAINERS_HEADERS += $(CONTAINERSdir)/ScrollPane_as3.h
+endif
+
+if BUILD_UILOADER_AS3
+CONTAINERS_SOURCES += $(CONTAINERSdir)/UILoader_as3.cpp
+CONTAINERS_HEADERS += $(CONTAINERSdir)/UILoader_as3.h
+endif
+
+libgnashas3_la_SOURCES += $(CONTAINERS_SOURCES)
+noinst_HEADERS += $(CONTAINERS_HEADERS)
=== renamed file 'libcore/asobj3/controls/Makefile.am' =>
'libcore/asobj3/controls/controls.am'
--- a/libcore/asobj3/controls/Makefile.am 2009-04-23 22:41:54 +0000
+++ b/libcore/asobj3/controls/controls.am 2009-04-24 15:50:42 +0000
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
#
-# Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 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
@@ -15,123 +15,142 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-AUTOMAKE_OPTIONS =
-
-# if the compiler has broken flaot support when optimized
-if BROKEN_FLOAT
-AM_CXXFLAGS = -ffloat-store
-endif
-
-noinst_LTLIBRARIES = libgnashas3.la
-
-AM_CPPFLAGS = \
- -I$(top_srcdir)/libnet \
- -I$(top_srcdir)/backend \
- -I$(top_srcdir)/libcore \
- -I$(top_srcdir)/libcore/swf \
- -I$(top_srcdir)/libcore/parser \
- -I$(top_srcdir)/libcore/vm \
- -I$(top_srcdir)/libbase \
- -I$(top_srcdir)/libamf \
- -I$(top_srcdir)/libltdl \
- -I$(top_srcdir)/libmedia \
- -I$(top_srcdir)/libsound \
- $(PTHREAD_CFLAGS) \
- $(GLIB_CFLAGS) \
- $(BOOST_CFLAGS) \
- $(FREETYPE2_CFLAGS) \
- $(NULL)
-
-
-libgnashas3_la_SOURCES = \
- BaseButton_as3.cpp \
- ButtonLabelPlacement_as3.cpp \
- Button_as3.cpp \
- CheckBox_as3.cpp \
- ColorPicker_as3.cpp \
- ComboBox_as3.cpp \
- DataGrid_as3.cpp \
- LabelButton_as3.cpp \
- Label_as3.cpp \
- List_as3.cpp \
- NumericStepper_as3.cpp \
- ProgressBarDirection_as3.cpp \
- ProgressBarMode_as3.cpp \
- ProgressBar_as3.cpp \
- RadioButtonGroup_as3.cpp \
- RadioButton_as3.cpp \
- ScrollBarDirection_as3.cpp \
- ScrollBar_as3.cpp \
- ScrollPolicy_as3.cpp \
- SelectableList_as3.cpp \
- SliderDirection_as3.cpp \
- Slider_as3.cpp \
- TextArea_as3.cpp \
- TextInput_as3.cpp \
- TileList_as3.cpp \
- UIScrollBar_as3.cpp \
- $(NULL)
-
-noinst_HEADERS = \
- BaseButton_as3.h \
- ButtonLabelPlacement_as3.h \
- Button_as3.h \
- CheckBox_as3.h \
- ColorPicker_as3.h \
- ComboBox_as3.h \
- DataGrid_as3.h \
- LabelButton_as3.h \
- Label_as3.h \
- List_as3.h \
- NumericStepper_as3.h \
- ProgressBarDirection_as3.h \
- ProgressBarMode_as3.h \
- ProgressBar_as3.h \
- RadioButtonGroup_as3.h \
- RadioButton_as3.h \
- ScrollBarDirection_as3.h \
- ScrollBar_as3.h \
- ScrollPolicy_as3.h \
- SelectableList_as3.h \
- SliderDirection_as3.h \
- Slider_as3.h \
- TextArea_as3.h \
- TextInput_as3.h \
- TileList_as3.h \
- UIScrollBar_as3.h \
- $(NULL)
-
-libgnashas3_la_LIBADD = \
- $(top_builddir)/libamf/libgnashamf.la \
- $(top_builddir)/libbase/libgnashbase.la
-
-if USE_FFMPEG_ENGINE
-AM_CPPFLAGS += $(FFMPEG_CFLAGS) \
- $(SDL_CFLAGS) \
- -I$(top_srcdir)/libmedia/ffmpeg
-libgnashas3_la_LIBADD += $(FFMPEG_LIBS) \
- $(SDL_LIBS)
-endif
-
-if USE_GST_ENGINE
-AM_CPPFLAGS += $(GSTREAMER_CFLAGS) \
- -I$(top_srcdir)/libmedia/gst
-libgnashas3_la_LIBADD += $(GSTREAMER_LIBS) \
- $(SDL_LIBS)
-endif
-
-#libgnashasobjs_la_LDFLAGS = -release $(VERSION) -no-undefined -export-dynamic
-
-if WIN32
- libgnashas3_la_LDFLAGS = -no-undefined
-endif
-
-# Rebuild with GCC 4.x Mudflap support
-mudflap:
- @echo "Rebuilding with GCC Mudflap support"
- $(MAKE) CXXFLAGS="$(CXXFLAGS) -fmudflap" LDFLAGS="$(LDFLAGS) -lmudflap"
-
-clean-hook:
- -rm -f core.*
-
+CONTROLSdir = $(srcdir)/controls
+
+AM_CPPFLAGS += -I$(CONTROLSdir)
+
+CONTROLS_SOURCES =
+CONTROLS_HEADERS =
+
+if BUILD_BASEBUTTON_AS3
+CONTROLS_SOURCES += $(CONTROLSdir)/BaseButton_as3.cpp
+CONTROLS_HEADERS += $(CONTROLSdir)/BaseButton_as3.h
+endif
+
+if BUILD_BUTTONLABELPLACEMENT_AS3
+CONTROLS_SOURCES += $(CONTROLSdir)/ButtonLabelPlacement_as3.cpp
+CONTROLS_HEADERS += $(CONTROLSdir)/ButtonLabelPlacement_as3.h
+endif
+
+if BUILD_BUTTON_AS3
+CONTROLS_SOURCES += $(CONTROLSdir)/Button_as3.cpp
+CONTROLS_HEADERS += $(CONTROLSdir)/Button_as3.h
+endif
+
+if BUILD_CHECKBOX_AS3
+CONTROLS_SOURCES += $(CONTROLSdir)/CheckBox_as3.cpp
+CONTROLS_HEADERS += $(CONTROLSdir)/CheckBox_as3.h
+endif
+
+if BUILD_COLORPICKER_AS3
+CONTROLS_SOURCES += $(CONTROLSdir)/ColorPicker_as3.cpp
+CONTROLS_HEADERS += $(CONTROLSdir)/ColorPicker_as3.h
+endif
+
+if BUILD_COMBOBOX_AS3
+CONTROLS_SOURCES += $(CONTROLSdir)/ComboBox_as3.cpp
+CONTROLS_HEADERS += $(CONTROLSdir)/ComboBox_as3.h
+endif
+
+if BUILD_DATAGRID_AS3
+CONTROLS_SOURCES += $(CONTROLSdir)/DataGrid_as3.cpp
+CONTROLS_HEADERS += $(CONTROLSdir)/DataGrid_as3.h
+endif
+
+if BUILD_LABELBUTTON_AS3
+CONTROLS_SOURCES += $(CONTROLSdir)/LabelButton_as3.cpp
+CONTROLS_HEADERS += $(CONTROLSdir)/LabelButton_as3.h
+endif
+
+if BUILD_LABEL_AS3
+CONTROLS_SOURCES += $(CONTROLSdir)/Label_as3.cpp
+CONTROLS_HEADERS += $(CONTROLSdir)/Label_as3.h
+endif
+
+if BUILD_LIST_AS3
+CONTROLS_SOURCES += $(CONTROLSdir)/List_as3.cpp
+CONTROLS_HEADERS += $(CONTROLSdir)/List_as3.h
+endif
+
+if BUILD_NUMERICSTEPPER_AS3
+CONTROLS_SOURCES += $(CONTROLSdir)/NumericStepper_as3.cpp
+CONTROLS_HEADERS += $(CONTROLSdir)/NumericStepper_as3.h
+endif
+
+if BUILD_PROGRESSBARDIRECTION_AS3
+CONTROLS_SOURCES += $(CONTROLSdir)/ProgressBarDirection_as3.cpp
+CONTROLS_HEADERS += $(CONTROLSdir)/ProgressBarDirection_as3.h
+endif
+
+if BUILD_PROGRESSBARMODE_AS3
+CONTROLS_SOURCES += $(CONTROLSdir)/ProgressBarMode_as3.cpp
+CONTROLS_HEADERS += $(CONTROLSdir)/ProgressBarMode_as3.h
+endif
+
+if BUILD_PROGRESSBAR_AS3
+CONTROLS_SOURCES += $(CONTROLSdir)/ProgressBar_as3.cpp
+CONTROLS_HEADERS += $(CONTROLSdir)/ProgressBar_as3.h
+endif
+
+if BUILD_RADIOBUTTONGROUP_AS3
+CONTROLS_SOURCES += $(CONTROLSdir)/RadioButtonGroup_as3.cpp
+CONTROLS_HEADERS += $(CONTROLSdir)/RadioButtonGroup_as3.h
+endif
+
+if BUILD_RADIOBUTTON_AS3
+CONTROLS_SOURCES += $(CONTROLSdir)/RadioButton_as3.cpp
+CONTROLS_HEADERS += $(CONTROLSdir)/RadioButton_as3.h
+endif
+
+if BUILD_SCROLLBARDIRECTION_AS3
+CONTROLS_SOURCES += $(CONTROLSdir)/ScrollBarDirection_as3.cpp
+CONTROLS_HEADERS += $(CONTROLSdir)/ScrollBarDirection_as3.h
+endif
+
+if BUILD_SCROLLBAR_AS3
+CONTROLS_SOURCES += $(CONTROLSdir)/ScrollBar_as3.cpp
+CONTROLS_HEADERS += $(CONTROLSdir)/ScrollBar_as3.h
+endif
+
+if BUILD_SCROLLPOLICY_AS3
+CONTROLS_SOURCES += $(CONTROLSdir)/ScrollPolicy_as3.cpp
+CONTROLS_HEADERS += $(CONTROLSdir)/ScrollPolicy_as3.h
+endif
+
+if BUILD_SELECTABLELIST_AS3
+CONTROLS_SOURCES += $(CONTROLSdir)/SelectableList_as3.cpp
+CONTROLS_HEADERS += $(CONTROLSdir)/SelectableList_as3.h
+endif
+
+if BUILD_SLIDERDIRECTION_AS3
+CONTROLS_SOURCES += $(CONTROLSdir)/SliderDirection_as3.cpp
+CONTROLS_HEADERS += $(CONTROLSdir)/SliderDirection_as3.h
+endif
+
+if BUILD_SLIDER_AS3
+CONTROLS_SOURCES += $(CONTROLSdir)/Slider_as3.cpp
+CONTROLS_HEADERS += $(CONTROLSdir)/Slider_as3.h
+endif
+
+if BUILD_TEXTAREA_AS3
+CONTROLS_SOURCES += $(CONTROLSdir)/TextArea_as3.cpp
+CONTROLS_HEADERS += $(CONTROLSdir)/TextArea_as3.h
+endif
+
+if BUILD_TEXTINPUT_AS3
+CONTROLS_SOURCES += $(CONTROLSdir)/TextInput_as3.cpp
+CONTROLS_HEADERS += $(CONTROLSdir)/TextInput_as3.h
+endif
+
+if BUILD_TILELIST_AS3
+CONTROLS_SOURCES += $(CONTROLSdir)/TileList_as3.cpp
+CONTROLS_HEADERS += $(CONTROLSdir)/TileList_as3.h
+endif
+
+if BUILD_UISCROLLBAR_AS3
+CONTROLS_SOURCES += $(CONTROLSdir)/UIScrollBar_as3.cpp
+CONTROLS_HEADERS += $(CONTROLSdir)/UIScrollBar_as3.h
+endif
+
+libgnashas3_la_SOURCES += $(CONTROLS_SOURCES)
+noinst_HEADERS += $(CONTROLS_HEADERS)
=== renamed file 'libcore/asobj3/core/Makefile.am' =>
'libcore/asobj3/core/core.am'
--- a/libcore/asobj3/core/Makefile.am 2009-04-23 22:41:54 +0000
+++ b/libcore/asobj3/core/core.am 2009-04-24 15:50:42 +0000
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
#
-# Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 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
@@ -15,75 +15,22 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-AUTOMAKE_OPTIONS =
-
-# if the compiler has broken flaot support when optimized
-if BROKEN_FLOAT
-AM_CXXFLAGS = -ffloat-store
-endif
-
-noinst_LTLIBRARIES = libgnashas3.la
-
-AM_CPPFLAGS = \
- -I$(top_srcdir)/libnet \
- -I$(top_srcdir)/backend \
- -I$(top_srcdir)/libcore \
- -I$(top_srcdir)/libcore/swf \
- -I$(top_srcdir)/libcore/parser \
- -I$(top_srcdir)/libcore/vm \
- -I$(top_srcdir)/libbase \
- -I$(top_srcdir)/libamf \
- -I$(top_srcdir)/libltdl \
- -I$(top_srcdir)/libmedia \
- -I$(top_srcdir)/libsound \
- $(PTHREAD_CFLAGS) \
- $(GLIB_CFLAGS) \
- $(BOOST_CFLAGS) \
- $(FREETYPE2_CFLAGS) \
- $(NULL)
-
-
-libgnashas3_la_SOURCES = \
- InvalidationType_as3.cpp \
- UIComponent_as3.cpp \
- $(NULL)
-
-noinst_HEADERS = \
- InvalidationType_as3.h \
- UIComponent_as3.h \
- $(NULL)
-
-libgnashas3_la_LIBADD = \
- $(top_builddir)/libamf/libgnashamf.la \
- $(top_builddir)/libbase/libgnashbase.la
-
-if USE_FFMPEG_ENGINE
-AM_CPPFLAGS += $(FFMPEG_CFLAGS) \
- $(SDL_CFLAGS) \
- -I$(top_srcdir)/libmedia/ffmpeg
-libgnashas3_la_LIBADD += $(FFMPEG_LIBS) \
- $(SDL_LIBS)
-endif
-
-if USE_GST_ENGINE
-AM_CPPFLAGS += $(GSTREAMER_CFLAGS) \
- -I$(top_srcdir)/libmedia/gst
-libgnashas3_la_LIBADD += $(GSTREAMER_LIBS) \
- $(SDL_LIBS)
-endif
-
-#libgnashasobjs_la_LDFLAGS = -release $(VERSION) -no-undefined -export-dynamic
-
-if WIN32
- libgnashas3_la_LDFLAGS = -no-undefined
-endif
-
-# Rebuild with GCC 4.x Mudflap support
-mudflap:
- @echo "Rebuilding with GCC Mudflap support"
- $(MAKE) CXXFLAGS="$(CXXFLAGS) -fmudflap" LDFLAGS="$(LDFLAGS) -lmudflap"
-
-clean-hook:
- -rm -f core.*
-
+COREdir = $(srcdir)/core
+
+AM_CPPFLAGS += -I$(COREdir)
+
+CORE_SOURCES =
+CORE_HEADERS =
+
+if BUILD_INVALIDATIONTYPE_AS3
+CORE_SOURCES += $(COREdir)/InvalidationType_as3.cpp
+CORE_HEADERS += $(COREdir)/InvalidationType_as3.h
+endif
+
+if BUILD_UICOMPONENT_AS3
+CORE_SOURCES += $(COREdir)/UIComponent_as3.cpp
+CORE_HEADERS += $(COREdir)/UIComponent_as3.h
+endif
+
+libgnashas3_la_SOURCES += $(CORE_SOURCES)
+noinst_HEADERS += $(CORE_HEADERS)
=== renamed file 'libcore/asobj3/data/Makefile.am' =>
'libcore/asobj3/data/data.am'
--- a/libcore/asobj3/data/Makefile.am 2009-04-23 22:41:54 +0000
+++ b/libcore/asobj3/data/data.am 2009-04-24 15:50:42 +0000
@@ -15,101 +15,87 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-AUTOMAKE_OPTIONS =
-
-# if the compiler has broken flaot support when optimized
-if BROKEN_FLOAT
-AM_CXXFLAGS = -ffloat-store
-endif
-
-noinst_LTLIBRARIES = libgnashas3.la
-
-AM_CPPFLAGS = \
- -I$(top_srcdir)/libnet \
- -I$(top_srcdir)/backend \
- -I$(top_srcdir)/libcore \
- -I$(top_srcdir)/libcore/swf \
- -I$(top_srcdir)/libcore/parser \
- -I$(top_srcdir)/libcore/vm \
- -I$(top_srcdir)/libbase \
- -I$(top_srcdir)/libamf \
- -I$(top_srcdir)/libltdl \
- -I$(top_srcdir)/libmedia \
- -I$(top_srcdir)/libsound \
- $(PTHREAD_CFLAGS) \
- $(GLIB_CFLAGS) \
- $(BOOST_CFLAGS) \
- $(FREETYPE2_CFLAGS) \
- $(NULL)
-
-
-libgnashas3_la_SOURCES = \
- EncryptedLocalStore_as3.cpp \
- SQLCollationType_as3.cpp \
- SQLColumnNameStyle_as3.cpp \
- SQLColumnSchema_as3.cpp \
- SQLConnection_as3.cpp \
- SQLIndexSchema_as3.cpp \
- SQLMode_as3.cpp \
- SQLResult_as3.cpp \
- SQLSchemaResult_as3.cpp \
- SQLSchema_as3.cpp \
- SQLStatement_as3.cpp \
- SQLTableSchema_as3.cpp \
- SQLTransactionLockType_as3.cpp \
- SQLTriggerSchema_as3.cpp \
- SQLViewSchema_as3.cpp \
- $(NULL)
-
-noinst_HEADERS = \
- EncryptedLocalStore_as3.h \
- SQLCollationType_as3.h \
- SQLColumnNameStyle_as3.h \
- SQLColumnSchema_as3.h \
- SQLConnection_as3.h \
- SQLIndexSchema_as3.h \
- SQLMode_as3.h \
- SQLResult_as3.h \
- SQLSchemaResult_as3.h \
- SQLSchema_as3.h \
- SQLStatement_as3.h \
- SQLTableSchema_as3.h \
- SQLTransactionLockType_as3.h \
- SQLTriggerSchema_as3.h \
- SQLViewSchema_as3.h \
- $(NULL)
-
-libgnashas3_la_LIBADD = \
- $(top_builddir)/libamf/libgnashamf.la \
- $(top_builddir)/libbase/libgnashbase.la
-
-if USE_FFMPEG_ENGINE
-AM_CPPFLAGS += $(FFMPEG_CFLAGS) \
- $(SDL_CFLAGS) \
- -I$(top_srcdir)/libmedia/ffmpeg
-libgnashas3_la_LIBADD += $(FFMPEG_LIBS) \
- $(SDL_LIBS)
-endif
-
-if USE_GST_ENGINE
-AM_CPPFLAGS += $(GSTREAMER_CFLAGS) \
- -I$(top_srcdir)/libmedia/gst
-libgnashas3_la_LIBADD += $(GSTREAMER_LIBS) \
- $(SDL_LIBS)
-endif
-
-#libgnashasobjs_la_LDFLAGS = -release $(VERSION) -no-undefined -export-dynamic
-
-if WIN32
- libgnashas3_la_LDFLAGS = -no-undefined
-endif
-
-# Rebuild with GCC 4.x Mudflap support
-mudflap:
- @echo "Rebuilding with GCC Mudflap support"
- $(MAKE) CXXFLAGS="$(CXXFLAGS) -fmudflap" LDFLAGS="$(LDFLAGS) -lmudflap"
-
-clean-hook:
- -rm -f core.*
-
+DATAdir = $(srcdir)/data
+
+AM_CPPFLAGS += -I$(DATAdir)
+
+DATA_SOURCES =
+DATA_HEADERS =
+
+if BUILD_ENCRYPTEDLOCALSTORE_AS3
+DATA_SOURCES += $(DATAdir)/EncryptedLocalStore_as3.cpp
+DATA_HEADERS += $(DATAdir)/EncryptedLocalStore_as3.h
+endif
+
+if BUILD_SQLCOLLATIONTYPE_AS3
+DATA_SOURCES += $(DATAdir)/SQLCollationType_as3.cpp
+DATA_HEADERS += $(DATAdir)/SQLCollationType_as3.h
+endif
+
+if BUILD_SQLCOLUMNNAMESTYLE_AS3
+DATA_SOURCES += $(DATAdir)/SQLColumnNameStyle_as3.cpp
+DATA_HEADERS += $(DATAdir)/SQLColumnNameStyle_as3.h
+endif
+
+if BUILD_SQLCOLUMNSCHEMA_AS3
+DATA_SOURCES += $(DATAdir)/SQLColumnSchema_as3.cpp
+DATA_HEADERS += $(DATAdir)/SQLColumnSchema_as3.h
+endif
+
+if BUILD_SQLCONNECTION_AS3
+DATA_SOURCES += $(DATAdir)/SQLConnection_as3.cpp
+DATA_HEADERS += $(DATAdir)/SQLConnection_as3.h
+endif
+
+if BUILD_SQLINDEXSCHEMA_AS3
+DATA_SOURCES += $(DATAdir)/SQLIndexSchema_as3.cpp
+DATA_HEADERS += $(DATAdir)/SQLIndexSchema_as3.h
+endif
+
+if BUILD_SQLMODE_AS3
+DATA_SOURCES += $(DATAdir)/SQLMode_as3.cpp
+DATA_HEADERS += $(DATAdir)/SQLMode_as3.h
+endif
+
+if BUILD_SQLRESULT_AS3
+DATA_SOURCES += $(DATAdir)/SQLResult_as3.cpp
+DATA_HEADERS += $(DATAdir)/SQLResult_as3.h
+endif
+
+if BUILD_SQLSCHEMARESULT_AS3
+DATA_SOURCES += $(DATAdir)/SQLSchemaResult_as3.cpp
+DATA_HEADERS += $(DATAdir)/SQLSchemaResult_as3.h
+endif
+
+if BUILD_SQLSCHEMA_AS3
+DATA_SOURCES += $(DATAdir)/SQLSchema_as3.cpp
+DATA_HEADERS += $(DATAdir)/SQLSchema_as3.h
+endif
+
+if BUILD_SQLSTATEMENT_AS3
+DATA_SOURCES += $(DATAdir)/SQLStatement_as3.cpp
+DATA_HEADERS += $(DATAdir)/SQLStatement_as3.h
+endif
+
+if BUILD_SQLTABLESCHEMA_AS3
+DATA_SOURCES += $(DATAdir)/SQLTableSchema_as3.cpp
+DATA_HEADERS += $(DATAdir)/SQLTableSchema_as3.h
+endif
+
+if BUILD_SQLTRANSACTIONLOCKTYPE_AS3
+DATA_SOURCES += $(DATAdir)/SQLTransactionLockType_as3.cpp
+DATA_HEADERS += $(DATAdir)/SQLTransactionLockType_as3.h
+endif
+
+if BUILD_SQLTRIGGERSCHEMA_AS3
+DATA_SOURCES += $(DATAdir)/SQLTriggerSchema_as3.cpp
+DATA_HEADERS += $(DATAdir)/SQLTriggerSchema_as3.h
+endif
+
+if BUILD_SQLVIEWSCHEMA_AS3
+DATA_SOURCES += $(DATAdir)/SQLViewSchema_as3.cpp
+DATA_HEADERS += $(DATAdir)/SQLViewSchema_as3.h
+endif
+
+libgnashas3_la_SOURCES += $(DATA_SOURCES)
+noinst_HEADERS += $(DATA_HEADERS)
=== renamed file 'libcore/asobj3/desktop/Makefile.am' =>
'libcore/asobj3/desktop/desktop.am'
--- a/libcore/asobj3/desktop/Makefile.am 2009-04-23 22:41:54 +0000
+++ b/libcore/asobj3/desktop/desktop.am 2009-04-24 15:50:42 +0000
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
#
-# Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 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
@@ -15,97 +15,77 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-AUTOMAKE_OPTIONS =
-
-# if the compiler has broken flaot support when optimized
-if BROKEN_FLOAT
-AM_CXXFLAGS = -ffloat-store
-endif
-
-noinst_LTLIBRARIES = libgnashas3.la
-
-AM_CPPFLAGS = \
- -I$(top_srcdir)/libnet \
- -I$(top_srcdir)/backend \
- -I$(top_srcdir)/libcore \
- -I$(top_srcdir)/libcore/swf \
- -I$(top_srcdir)/libcore/parser \
- -I$(top_srcdir)/libcore/vm \
- -I$(top_srcdir)/libbase \
- -I$(top_srcdir)/libamf \
- -I$(top_srcdir)/libltdl \
- -I$(top_srcdir)/libmedia \
- -I$(top_srcdir)/libsound \
- $(PTHREAD_CFLAGS) \
- $(GLIB_CFLAGS) \
- $(BOOST_CFLAGS) \
- $(FREETYPE2_CFLAGS) \
- $(NULL)
-
-
-libgnashas3_la_SOURCES = \
- ClipboardFormats_as3.cpp \
- ClipboardTransferMode_as3.cpp \
- Clipboard_as3.cpp \
- DockIcon_as3.cpp \
- Icon_as3.cpp \
- InteractiveIcon_as3.cpp \
- NativeApplication_as3.cpp \
- NativeDragActions_as3.cpp \
- NativeDragManager_as3.cpp \
- NativeDragOptions_as3.cpp \
- NotificationType_as3.cpp \
- SystemTrayIcon_as3.cpp \
- Updater_as3.cpp \
- $(NULL)
-
-noinst_HEADERS = \
- ClipboardFormats_as3.h \
- ClipboardTransferMode_as3.h \
- Clipboard_as3.h \
- DockIcon_as3.h \
- Icon_as3.h \
- InteractiveIcon_as3.h \
- NativeApplication_as3.h \
- NativeDragActions_as3.h \
- NativeDragManager_as3.h \
- NativeDragOptions_as3.h \
- NotificationType_as3.h \
- SystemTrayIcon_as3.h \
- Updater_as3.h \
- $(NULL)
-
-libgnashas3_la_LIBADD = \
- $(top_builddir)/libamf/libgnashamf.la \
- $(top_builddir)/libbase/libgnashbase.la
-
-if USE_FFMPEG_ENGINE
-AM_CPPFLAGS += $(FFMPEG_CFLAGS) \
- $(SDL_CFLAGS) \
- -I$(top_srcdir)/libmedia/ffmpeg
-libgnashas3_la_LIBADD += $(FFMPEG_LIBS) \
- $(SDL_LIBS)
-endif
-
-if USE_GST_ENGINE
-AM_CPPFLAGS += $(GSTREAMER_CFLAGS) \
- -I$(top_srcdir)/libmedia/gst
-libgnashas3_la_LIBADD += $(GSTREAMER_LIBS) \
- $(SDL_LIBS)
-endif
-
-#libgnashasobjs_la_LDFLAGS = -release $(VERSION) -no-undefined -export-dynamic
-
-if WIN32
- libgnashas3_la_LDFLAGS = -no-undefined
-endif
-
-# Rebuild with GCC 4.x Mudflap support
-mudflap:
- @echo "Rebuilding with GCC Mudflap support"
- $(MAKE) CXXFLAGS="$(CXXFLAGS) -fmudflap" LDFLAGS="$(LDFLAGS) -lmudflap"
-
-clean-hook:
- -rm -f core.*
-
+DESKTOPdir = $(srcdir)/desktop
+
+AM_CPPFLAGS += -I$(DESKTOPdir)
+
+DESKTOP_SOURCES =
+DESKTOP_HEADERS =
+
+if BUILD_CLIPBOARDFORMATS_AS3
+DESKTOP_SOURCES += $(DESKTOPdir)/ClipboardFormats_as3.cpp
+DESKTOP_HEADERS += $(DESKTOPdir)/ClipboardFormats_as3.h
+endif
+
+if BUILD_CLIPBOARDTRANSFERMODE_AS3
+DESKTOP_SOURCES += $(DESKTOPdir)/ClipboardTransferMode_as3.cpp
+DESKTOP_HEADERS += $(DESKTOPdir)/ClipboardTransferMode_as3.h
+endif
+
+if BUILD_CLIPBOARD_AS3
+DESKTOP_SOURCES += $(DESKTOPdir)/Clipboard_as3.cpp
+DESKTOP_HEADERS += $(DESKTOPdir)/Clipboard_as3.h
+endif
+
+if BUILD_DOCKICON_AS3
+DESKTOP_SOURCES += $(DESKTOPdir)/DockIcon_as3.cpp
+DESKTOP_HEADERS += $(DESKTOPdir)/DockIcon_as3.h
+endif
+
+if BUILD_ICON_AS3
+DESKTOP_SOURCES += $(DESKTOPdir)/Icon_as3.cpp
+DESKTOP_HEADERS += $(DESKTOPdir)/Icon_as3.h
+endif
+
+if BUILD_INTERACTIVEICON_AS3
+DESKTOP_SOURCES += $(DESKTOPdir)/InteractiveIcon_as3.cpp
+DESKTOP_HEADERS += $(DESKTOPdir)/InteractiveIcon_as3.h
+endif
+
+if BUILD_NATIVEAPPLICATION_AS3
+DESKTOP_SOURCES += $(DESKTOPdir)/NativeApplication_as3.cpp
+DESKTOP_HEADERS += $(DESKTOPdir)/NativeApplication_as3.h
+endif
+
+if BUILD_NATIVEDRAGACTIONS_AS3
+DESKTOP_SOURCES += $(DESKTOPdir)/NativeDragActions_as3.cpp
+DESKTOP_HEADERS += $(DESKTOPdir)/NativeDragActions_as3.h
+endif
+
+if BUILD_NATIVEDRAGMANAGER_AS3
+DESKTOP_SOURCES += $(DESKTOPdir)/NativeDragManager_as3.cpp
+DESKTOP_HEADERS += $(DESKTOPdir)/NativeDragManager_as3.h
+endif
+
+if BUILD_NATIVEDRAGOPTIONS_AS3
+DESKTOP_SOURCES += $(DESKTOPdir)/NativeDragOptions_as3.cpp
+DESKTOP_HEADERS += $(DESKTOPdir)/NativeDragOptions_as3.h
+endif
+
+if BUILD_NOTIFICATIONTYPE_AS3
+DESKTOP_SOURCES += $(DESKTOPdir)/NotificationType_as3.cpp
+DESKTOP_HEADERS += $(DESKTOPdir)/NotificationType_as3.h
+endif
+
+if BUILD_SYSTEMTRAYICON_AS3
+DESKTOP_SOURCES += $(DESKTOPdir)/SystemTrayIcon_as3.cpp
+DESKTOP_HEADERS += $(DESKTOPdir)/SystemTrayIcon_as3.h
+endif
+
+if BUILD_UPDATER_AS3
+DESKTOP_SOURCES += $(DESKTOPdir)/Updater_as3.cpp
+DESKTOP_HEADERS += $(DESKTOPdir)/Updater_as3.h
+endif
+
+libgnashas3_la_SOURCES += $(DESKTOP_SOURCES)
+noinst_HEADERS += $(DESKTOP_HEADERS)
=== renamed file 'libcore/asobj3/display/Makefile.am' =>
'libcore/asobj3/display/display.am'
--- a/libcore/asobj3/display/Makefile.am 2009-04-23 22:41:54 +0000
+++ b/libcore/asobj3/display/display.am 2009-04-24 15:50:42 +0000
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
#
-# Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 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
@@ -15,155 +15,222 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-AUTOMAKE_OPTIONS =
-
-# if the compiler has broken flaot support when optimized
-if BROKEN_FLOAT
-AM_CXXFLAGS = -ffloat-store
-endif
-
-noinst_LTLIBRARIES = libgnashas3.la
-
-AM_CPPFLAGS = \
- -I$(top_srcdir)/libnet \
- -I$(top_srcdir)/backend \
- -I$(top_srcdir)/libcore \
- -I$(top_srcdir)/libcore/swf \
- -I$(top_srcdir)/libcore/parser \
- -I$(top_srcdir)/libcore/vm \
- -I$(top_srcdir)/libbase \
- -I$(top_srcdir)/libamf \
- -I$(top_srcdir)/libltdl \
- -I$(top_srcdir)/libmedia \
- -I$(top_srcdir)/libsound \
- $(PTHREAD_CFLAGS) \
- $(GLIB_CFLAGS) \
- $(BOOST_CFLAGS) \
- $(FREETYPE2_CFLAGS) \
- $(NULL)
-
-
-libgnashas3_la_SOURCES = \
- AVM1Movie_as3.cpp \
- ActionScriptVersion_as3.cpp \
- BitmapDataChannel_as3.cpp \
- BitmapData_as3.cpp \
- Bitmap_as3.cpp \
- BlendMode_as3.cpp \
- CapsStyle_as3.cpp \
- DisplayObjectContainer_as3.cpp \
- DisplayObject_as3.cpp \
- FocusDirection_as3.cpp \
- FrameLabel_as3.cpp \
- GradientType_as3.cpp \
- Graphics_as3.cpp \
- IBitmapDrawable_as3.cpp \
- InteractiveObject_as3.cpp \
- InterpolationMethod_as3.cpp \
- JointStyle_as3.cpp \
- LineScaleMode_as3.cpp \
- LoaderInfo_as3.cpp \
- Loader_as3.cpp \
- MorphShape_as3.cpp \
- MovieClip_as3.cpp \
- NativeMenuItem_as3.cpp \
- NativeMenu_as3.cpp \
- NativeWindowDisplayState_as3.cpp \
- NativeWindowInitOptions_as3.cpp \
- NativeWindowResize_as3.cpp \
- NativeWindowType_as3.cpp \
- NativeWindow_as3.cpp \
- PixelSnapping_as3.cpp \
- SWFVersion_as3.cpp \
- Scene_as3.cpp \
- Screen_as3.cpp \
- Shape_as3.cpp \
- SimpleButton_as3.cpp \
- SpreadMethod_as3.cpp \
- Sprite_as3.cpp \
- StageAlign_as3.cpp \
- StageDisplayState_as3.cpp \
- StageQuality_as3.cpp \
- StageScaleMode_as3.cpp \
- Stage_as3.cpp \
- $(NULL)
-
-noinst_HEADERS = \
- AVM1Movie_as3.h \
- ActionScriptVersion_as3.h \
- BitmapDataChannel_as3.h \
- BitmapData_as3.h \
- Bitmap_as3.h \
- BlendMode_as3.h \
- CapsStyle_as3.h \
- DisplayObjectContainer_as3.h \
- DisplayObject_as3.h \
- FocusDirection_as3.h \
- FrameLabel_as3.h \
- GradientType_as3.h \
- Graphics_as3.h \
- IBitmapDrawable_as3.h \
- InteractiveObject_as3.h \
- InterpolationMethod_as3.h \
- JointStyle_as3.h \
- LineScaleMode_as3.h \
- LoaderInfo_as3.h \
- Loader_as3.h \
- MorphShape_as3.h \
- MovieClip_as3.h \
- NativeMenuItem_as3.h \
- NativeMenu_as3.h \
- NativeWindowDisplayState_as3.h \
- NativeWindowInitOptions_as3.h \
- NativeWindowResize_as3.h \
- NativeWindowType_as3.h \
- NativeWindow_as3.h \
- PixelSnapping_as3.h \
- SWFVersion_as3.h \
- Scene_as3.h \
- Screen_as3.h \
- Shape_as3.h \
- SimpleButton_as3.h \
- SpreadMethod_as3.h \
- Sprite_as3.h \
- StageAlign_as3.h \
- StageDisplayState_as3.h \
- StageQuality_as3.h \
- StageScaleMode_as3.h \
- Stage_as3.h \
- $(NULL)
-
-libgnashas3_la_LIBADD = \
- $(top_builddir)/libamf/libgnashamf.la \
- $(top_builddir)/libbase/libgnashbase.la
-
-if USE_FFMPEG_ENGINE
-AM_CPPFLAGS += $(FFMPEG_CFLAGS) \
- $(SDL_CFLAGS) \
- -I$(top_srcdir)/libmedia/ffmpeg
-libgnashas3_la_LIBADD += $(FFMPEG_LIBS) \
- $(SDL_LIBS)
-endif
-
-if USE_GST_ENGINE
-AM_CPPFLAGS += $(GSTREAMER_CFLAGS) \
- -I$(top_srcdir)/libmedia/gst
-libgnashas3_la_LIBADD += $(GSTREAMER_LIBS) \
- $(SDL_LIBS)
-endif
-
-#libgnashasobjs_la_LDFLAGS = -release $(VERSION) -no-undefined -export-dynamic
-
-if WIN32
- libgnashas3_la_LDFLAGS = -no-undefined
-endif
-
-# Rebuild with GCC 4.x Mudflap support
-mudflap:
- @echo "Rebuilding with GCC Mudflap support"
- $(MAKE) CXXFLAGS="$(CXXFLAGS) -fmudflap" LDFLAGS="$(LDFLAGS) -lmudflap"
-
-clean-hook:
- -rm -f core.*
-
+DISPLAYdir = $(srcdir)/display
+
+AM_CPPFLAGS += -I$(DISPLAYdir)
+
+DISPLAY_SOURCES =
+DISPLAY_HEADERS =
+
+if BUILD_AVM1MOVIE_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/AVM1Movie_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/AVM1Movie_as3.h
+endif
+
+if BUILD_ACTIONSCRIPTVERSION_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/ActionScriptVersion_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/ActionScriptVersion_as3.h
+endif
+
+if BUILD_BITMAPDATACHANNEL_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/BitmapDataChannel_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/BitmapDataChannel_as3.h
+endif
+
+if BUILD_BITMAPDATA_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/BitmapData_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/BitmapData_as3.h
+endif
+
+if BUILD_BITMAP_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/Bitmap_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/Bitmap_as3.h
+endif
+
+if BUILD_BLENDMODE_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/BlendMode_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/BlendMode_as3.h
+endif
+
+if BUILD_CAPSSTYLE_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/CapsStyle_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/CapsStyle_as3.h
+endif
+
+if BUILD_DISPLAYOBJECTCONTAINER_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/DisplayObjectContainer_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/DisplayObjectContainer_as3.h
+endif
+
+if BUILD_DISPLAYOBJECT_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/DisplayObject_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/DisplayObject_as3.h
+endif
+
+if BUILD_FOCUSDIRECTION_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/FocusDirection_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/FocusDirection_as3.h
+endif
+
+if BUILD_FRAMELABEL_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/FrameLabel_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/FrameLabel_as3.h
+endif
+
+if BUILD_GRADIENTTYPE_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/GradientType_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/GradientType_as3.h
+endif
+
+if BUILD_GRAPHICS_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/Graphics_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/Graphics_as3.h
+endif
+
+if BUILD_IBITMAPDRAWABLE_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/IBitmapDrawable_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/IBitmapDrawable_as3.h
+endif
+
+if BUILD_INTERACTIVEOBJECT_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/InteractiveObject_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/InteractiveObject_as3.h
+endif
+
+if BUILD_INTERPOLATIONMETHOD_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/InterpolationMethod_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/InterpolationMethod_as3.h
+endif
+
+if BUILD_JOINTSTYLE_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/JointStyle_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/JointStyle_as3.h
+endif
+
+if BUILD_LINESCALEMODE_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/LineScaleMode_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/LineScaleMode_as3.h
+endif
+
+if BUILD_LOADERINFO_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/LoaderInfo_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/LoaderInfo_as3.h
+endif
+
+if BUILD_LOADER_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/Loader_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/Loader_as3.h
+endif
+
+if BUILD_MORPHSHAPE_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/MorphShape_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/MorphShape_as3.h
+endif
+
+if BUILD_MOVIECLIP_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/MovieClip_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/MovieClip_as3.h
+endif
+
+if BUILD_NATIVEMENUITEM_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/NativeMenuItem_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/NativeMenuItem_as3.h
+endif
+
+if BUILD_NATIVEMENU_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/NativeMenu_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/NativeMenu_as3.h
+endif
+
+if BUILD_NATIVEWINDOWDISPLAYSTATE_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/NativeWindowDisplayState_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/NativeWindowDisplayState_as3.h
+endif
+
+if BUILD_NATIVEWINDOWINITOPTIONS_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/NativeWindowInitOptions_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/NativeWindowInitOptions_as3.h
+endif
+
+if BUILD_NATIVEWINDOWRESIZE_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/NativeWindowResize_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/NativeWindowResize_as3.h
+endif
+
+if BUILD_NATIVEWINDOWTYPE_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/NativeWindowType_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/NativeWindowType_as3.h
+endif
+
+if BUILD_NATIVEWINDOW_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/NativeWindow_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/NativeWindow_as3.h
+endif
+
+if BUILD_PIXELSNAPPING_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/PixelSnapping_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/PixelSnapping_as3.h
+endif
+
+if BUILD_SWFVERSION_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/SWFVersion_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/SWFVersion_as3.h
+endif
+
+if BUILD_SCENE_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/Scene_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/Scene_as3.h
+endif
+
+if BUILD_SCREEN_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/Screen_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/Screen_as3.h
+endif
+
+if BUILD_SHAPE_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/Shape_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/Shape_as3.h
+endif
+
+if BUILD_SIMPLEBUTTON_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/SimpleButton_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/SimpleButton_as3.h
+endif
+
+if BUILD_SPREADMETHOD_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/SpreadMethod_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/SpreadMethod_as3.h
+endif
+
+if BUILD_SPRITE_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/Sprite_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/Sprite_as3.h
+endif
+
+if BUILD_STAGEALIGN_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/StageAlign_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/StageAlign_as3.h
+endif
+
+if BUILD_STAGEDISPLAYSTATE_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/StageDisplayState_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/StageDisplayState_as3.h
+endif
+
+if BUILD_STAGEQUALITY_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/StageQuality_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/StageQuality_as3.h
+endif
+
+if BUILD_STAGESCALEMODE_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/StageScaleMode_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/StageScaleMode_as3.h
+endif
+
+if BUILD_STAGE_AS3
+DISPLAY_SOURCES += $(DISPLAYdir)/Stage_as3.cpp
+DISPLAY_HEADERS += $(DISPLAYdir)/Stage_as3.h
+endif
+
+libgnashas3_la_SOURCES += $(DISPLAY_SOURCES)
+noinst_HEADERS += $(DISPLAY_HEADERS)
=== renamed file 'libcore/asobj3/errors/Makefile.am' =>
'libcore/asobj3/errors/errors.am'
--- a/libcore/asobj3/errors/Makefile.am 2009-04-23 22:41:54 +0000
+++ b/libcore/asobj3/errors/errors.am 2009-04-24 15:50:42 +0000
@@ -1,6 +1,6 @@
## Process this file with automake to generate Makefile.in
#
-# Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 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
@@ -15,89 +15,57 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-AUTOMAKE_OPTIONS =
-
-# if the compiler has broken flaot support when optimized
-if BROKEN_FLOAT
-AM_CXXFLAGS = -ffloat-store
-endif
-
-noinst_LTLIBRARIES = libgnashas3.la
-
-AM_CPPFLAGS = \
- -I$(top_srcdir)/libnet \
- -I$(top_srcdir)/backend \
- -I$(top_srcdir)/libcore \
- -I$(top_srcdir)/libcore/swf \
- -I$(top_srcdir)/libcore/parser \
- -I$(top_srcdir)/libcore/vm \
- -I$(top_srcdir)/libbase \
- -I$(top_srcdir)/libamf \
- -I$(top_srcdir)/libltdl \
- -I$(top_srcdir)/libmedia \
- -I$(top_srcdir)/libsound \
- $(PTHREAD_CFLAGS) \
- $(GLIB_CFLAGS) \
- $(BOOST_CFLAGS) \
- $(FREETYPE2_CFLAGS) \
- $(NULL)
-
-
-libgnashas3_la_SOURCES = \
- EOFError_as3.cpp \
- IOError_as3.cpp \
- IllegalOperationError_as3.cpp \
- InvalidSWFError_as3.cpp \
- MemoryError_as3.cpp \
- SQLErrorOperation_as3.cpp \
- SQLError_as3.cpp \
- ScriptTimeoutError_as3.cpp \
- StackOverflowError_as3.cpp \
- $(NULL)
-
-noinst_HEADERS = \
- EOFError_as3.h \
- IOError_as3.h \
- IllegalOperationError_as3.h \
- InvalidSWFError_as3.h \
- MemoryError_as3.h \
- SQLErrorOperation_as3.h \
- SQLError_as3.h \
- ScriptTimeoutError_as3.h \
- StackOverflowError_as3.h \
- $(NULL)
-
-libgnashas3_la_LIBADD = \
- $(top_builddir)/libamf/libgnashamf.la \
- $(top_builddir)/libbase/libgnashbase.la
-
-if USE_FFMPEG_ENGINE
-AM_CPPFLAGS += $(FFMPEG_CFLAGS) \
- $(SDL_CFLAGS) \
- -I$(top_srcdir)/libmedia/ffmpeg
-libgnashas3_la_LIBADD += $(FFMPEG_LIBS) \
- $(SDL_LIBS)
-endif
-
-if USE_GST_ENGINE
-AM_CPPFLAGS += $(GSTREAMER_CFLAGS) \
- -I$(top_srcdir)/libmedia/gst
-libgnashas3_la_LIBADD += $(GSTREAMER_LIBS) \
- $(SDL_LIBS)
-endif
-
-#libgnashasobjs_la_LDFLAGS = -release $(VERSION) -no-undefined -export-dynamic
-
-if WIN32
- libgnashas3_la_LDFLAGS = -no-undefined
-endif
-
-# Rebuild with GCC 4.x Mudflap support
-mudflap:
- @echo "Rebuilding with GCC Mudflap support"
- $(MAKE) CXXFLAGS="$(CXXFLAGS) -fmudflap" LDFLAGS="$(LDFLAGS) -lmudflap"
-
-clean-hook:
- -rm -f core.*
-
+ERRORSdir = $(srcdir)/errors
+
+AM_CPPFLAGS += -I$(ERRORSdir)
+
+ERRORS_SOURCES =
+ERRORS_HEADERS =
+
+if BUILD_EOFERROR_AS3
+ERRORS_SOURCES += $(ERRORSdir)/EOFError_as3.cpp
+ERRORS_HEADERS += $(ERRORSdir)/EOFError_as3.h
+endif
+
+if BUILD_IOERROR_AS3
+ERRORS_SOURCES += $(ERRORSdir)/IOError_as3.cpp
+ERRORS_HEADERS += $(ERRORSdir)/IOError_as3.h
+endif
+
+if BUILD_ILLEGALOPERATIONERROR_AS3
+ERRORS_SOURCES += $(ERRORSdir)/IllegalOperationError_as3.cpp
+ERRORS_HEADERS += $(ERRORSdir)/IllegalOperationError_as3.h
+endif
+
+if BUILD_INVALIDSWFERROR_AS3
+ERRORS_SOURCES += $(ERRORSdir)/InvalidSWFError_as3.cpp
+ERRORS_HEADERS += $(ERRORSdir)/InvalidSWFError_as3.h
+endif
+
+if BUILD_MEMORYERROR_AS3
+ERRORS_SOURCES += $(ERRORSdir)/MemoryError_as3.cpp
+ERRORS_HEADERS += $(ERRORSdir)/MemoryError_as3.h
+endif
+
+if BUILD_SQLERROROPERATION_AS3
+ERRORS_SOURCES += $(ERRORSdir)/SQLErrorOperation_as3.cpp
+ERRORS_HEADERS += $(ERRORSdir)/SQLErrorOperation_as3.h
+endif
+
+if BUILD_SQLERROR_AS3
+ERRORS_SOURCES += $(ERRORSdir)/SQLError_as3.cpp
+ERRORS_HEADERS += $(ERRORSdir)/SQLError_as3.h
+endif
+
+if BUILD_SCRIPTTIMEOUTERROR_AS3
+ERRORS_SOURCES += $(ERRORSdir)/ScriptTimeoutError_as3.cpp
+ERRORS_HEADERS += $(ERRORSdir)/ScriptTimeoutError_as3.h
+endif
+
+if BUILD_STACKOVERFLOWERROR_AS3
+ERRORS_SOURCES += $(ERRORSdir)/StackOverflowError_as3.cpp
+ERRORS_HEADERS += $(ERRORSdir)/StackOverflowError_as3.h
+endif
+
+libgnashas3_la_SOURCES += $(ERRORS_SOURCES)
+noinst_HEADERS += $(ERRORS_HEADERS)
=== renamed file 'libcore/asobj3/events/Makefile.am' =>
'libcore/asobj3/events/events.am'
--- a/libcore/asobj3/events/Makefile.am 2009-04-23 22:41:54 +0000
+++ b/libcore/asobj3/events/events.am 2009-04-24 15:50:42 +0000
@@ -15,147 +15,202 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-AUTOMAKE_OPTIONS =
-
-# if the compiler has broken flaot support when optimized
-if BROKEN_FLOAT
-AM_CXXFLAGS = -ffloat-store
-endif
-
-noinst_LTLIBRARIES = libgnashas3.la
-
-AM_CPPFLAGS = \
- -I$(top_srcdir)/libnet \
- -I$(top_srcdir)/backend \
- -I$(top_srcdir)/libcore \
- -I$(top_srcdir)/libcore/swf \
- -I$(top_srcdir)/libcore/parser \
- -I$(top_srcdir)/libcore/vm \
- -I$(top_srcdir)/libbase \
- -I$(top_srcdir)/libamf \
- -I$(top_srcdir)/libltdl \
- -I$(top_srcdir)/libmedia \
- -I$(top_srcdir)/libsound \
- $(PTHREAD_CFLAGS) \
- $(GLIB_CFLAGS) \
- $(BOOST_CFLAGS) \
- $(FREETYPE2_CFLAGS) \
- $(NULL)
-
-
-libgnashas3_la_SOURCES = \
- ActivityEvent_as3.cpp \
- AsyncErrorEvent_as3.cpp \
- BrowserInvokeEvent_as3.cpp \
- ContextMenuEvent_as3.cpp \
- DRMAuthenticateEvent_as3.cpp \
- DRMErrorEvent_as3.cpp \
- DRMStatusEvent_as3.cpp \
- DataEvent_as3.cpp \
- ErrorEvent_as3.cpp \
- EventDispatcher_as3.cpp \
- EventPhase_as3.cpp \
- Event_as3.cpp \
- FileListEvent_as3.cpp \
- FocusEvent_as3.cpp \
- FullScreenEvent_as3.cpp \
- HTMLUncaughtScriptExceptionEvent_as3.cpp \
- HTTPStatusEvent_as3.cpp \
- IEventDispatcher_as3.cpp \
- IMEEvent_as3.cpp \
- IOErrorEvent_as3.cpp \
- InvokeEvent_as3.cpp \
- KeyboardEvent_as3.cpp \
- MouseEvent_as3.cpp \
- NativeDragEvent_as3.cpp \
- NativeWindowBoundsEvent_as3.cpp \
- NativeWindowDisplayStateEvent_as3.cpp \
- NetStatusEvent_as3.cpp \
- OutputProgressEvent_as3.cpp \
- ProgressEvent_as3.cpp \
- SQLErrorEvent_as3.cpp \
- SQLEvent_as3.cpp \
- SQLUpdateEvent_as3.cpp \
- ScreenMouseEvent_as3.cpp \
- SecurityErrorEvent_as3.cpp \
- StatusEvent_as3.cpp \
- SyncEvent_as3.cpp \
- TextEvent_as3.cpp \
- TimerEvent_as3.cpp \
- $(NULL)
-
-noinst_HEADERS = \
- ActivityEvent_as3.h \
- AsyncErrorEvent_as3.h \
- BrowserInvokeEvent_as3.h \
- ContextMenuEvent_as3.h \
- DRMAuthenticateEvent_as3.h \
- DRMErrorEvent_as3.h \
- DRMStatusEvent_as3.h \
- DataEvent_as3.h \
- ErrorEvent_as3.h \
- EventDispatcher_as3.h \
- EventPhase_as3.h \
- Event_as3.h \
- FileListEvent_as3.h \
- FocusEvent_as3.h \
- FullScreenEvent_as3.h \
- HTMLUncaughtScriptExceptionEvent_as3.h \
- HTTPStatusEvent_as3.h \
- IEventDispatcher_as3.h \
- IMEEvent_as3.h \
- IOErrorEvent_as3.h \
- InvokeEvent_as3.h \
- KeyboardEvent_as3.h \
- MouseEvent_as3.h \
- NativeDragEvent_as3.h \
- NativeWindowBoundsEvent_as3.h \
- NativeWindowDisplayStateEvent_as3.h \
- NetStatusEvent_as3.h \
- OutputProgressEvent_as3.h \
- ProgressEvent_as3.h \
- SQLErrorEvent_as3.h \
- SQLEvent_as3.h \
- SQLUpdateEvent_as3.h \
- ScreenMouseEvent_as3.h \
- SecurityErrorEvent_as3.h \
- StatusEvent_as3.h \
- SyncEvent_as3.h \
- TextEvent_as3.h \
- TimerEvent_as3.h \
- $(NULL)
-
-libgnashas3_la_LIBADD = \
- $(top_builddir)/libamf/libgnashamf.la \
- $(top_builddir)/libbase/libgnashbase.la
-
-if USE_FFMPEG_ENGINE
-AM_CPPFLAGS += $(FFMPEG_CFLAGS) \
- $(SDL_CFLAGS) \
- -I$(top_srcdir)/libmedia/ffmpeg
-libgnashas3_la_LIBADD += $(FFMPEG_LIBS) \
- $(SDL_LIBS)
-endif
-
-if USE_GST_ENGINE
-AM_CPPFLAGS += $(GSTREAMER_CFLAGS) \
- -I$(top_srcdir)/libmedia/gst
-libgnashas3_la_LIBADD += $(GSTREAMER_LIBS) \
- $(SDL_LIBS)
-endif
-
-#libgnashasobjs_la_LDFLAGS = -release $(VERSION) -no-undefined -export-dynamic
-
-if WIN32
- libgnashas3_la_LDFLAGS = -no-undefined
-endif
-
-# Rebuild with GCC 4.x Mudflap support
-mudflap:
- @echo "Rebuilding with GCC Mudflap support"
- $(MAKE) CXXFLAGS="$(CXXFLAGS) -fmudflap" LDFLAGS="$(LDFLAGS) -lmudflap"
-
-clean-hook:
- -rm -f core.*
-
+EVENTSdir = $(srcdir)/events
+
+AM_CPPFLAGS += -I$(EVENTSdir)
+
+EVENTS_SOURCES =
+EVENTS_HEADERS =
+
+if BUILD_ACTIVITYEVENT_AS3
+EVENTS_SOURCES += $(EVENTSdir)/ActivityEvent_as3.cpp
+EVENTS_HEADERS += $(EVENTSdir)/ActivityEvent_as3.h
+endif
+
+if BUILD_ASYNCERROREVENT_AS3
+EVENTS_SOURCES += $(EVENTSdir)/AsyncErrorEvent_as3.cpp
+EVENTS_HEADERS += $(EVENTSdir)/AsyncErrorEvent_as3.h
+endif
+
+if BUILD_BROWSERINVOKEEVENT_AS3
+EVENTS_SOURCES += $(EVENTSdir)/BrowserInvokeEvent_as3.cpp
+EVENTS_HEADERS += $(EVENTSdir)/BrowserInvokeEvent_as3.h
+endif
+
+if BUILD_CONTEXTMENUEVENT_AS3
+EVENTS_SOURCES += $(EVENTSdir)/ContextMenuEvent_as3.cpp
+EVENTS_HEADERS += $(EVENTSdir)/ContextMenuEvent_as3.h
+endif
+
+if BUILD_DRMAUTHENTICATEEVENT_AS3
+EVENTS_SOURCES += $(EVENTSdir)/DRMAuthenticateEvent_as3.cpp
+EVENTS_HEADERS += $(EVENTSdir)/DRMAuthenticateEvent_as3.h
+endif
+
+if BUILD_DRMERROREVENT_AS3
+EVENTS_SOURCES += $(EVENTSdir)/DRMErrorEvent_as3.cpp
+EVENTS_HEADERS += $(EVENTSdir)/DRMErrorEvent_as3.h
+endif
+
+if BUILD_DRMSTATUSEVENT_AS3
+EVENTS_SOURCES += $(EVENTSdir)/DRMStatusEvent_as3.cpp
+EVENTS_HEADERS += $(EVENTSdir)/DRMStatusEvent_as3.h
+endif
+
+if BUILD_DATAEVENT_AS3
+EVENTS_SOURCES += $(EVENTSdir)/DataEvent_as3.cpp
+EVENTS_HEADERS += $(EVENTSdir)/DataEvent_as3.h
+endif
+
+if BUILD_ERROREVENT_AS3
+EVENTS_SOURCES += $(EVENTSdir)/ErrorEvent_as3.cpp
+EVENTS_HEADERS += $(EVENTSdir)/ErrorEvent_as3.h
+endif
+
+if BUILD_EVENTDISPATCHER_AS3
+EVENTS_SOURCES += $(EVENTSdir)/EventDispatcher_as3.cpp
+EVENTS_HEADERS += $(EVENTSdir)/EventDispatcher_as3.h
+endif
+
+if BUILD_EVENTPHASE_AS3
+EVENTS_SOURCES += $(EVENTSdir)/EventPhase_as3.cpp
+EVENTS_HEADERS += $(EVENTSdir)/EventPhase_as3.h
+endif
+
+if BUILD_EVENT_AS3
+EVENTS_SOURCES += $(EVENTSdir)/Event_as3.cpp
+EVENTS_HEADERS += $(EVENTSdir)/Event_as3.h
+endif
+
+if BUILD_FILELISTEVENT_AS3
+EVENTS_SOURCES += $(EVENTSdir)/FileListEvent_as3.cpp
+EVENTS_HEADERS += $(EVENTSdir)/FileListEvent_as3.h
+endif
+
+if BUILD_FOCUSEVENT_AS3
+EVENTS_SOURCES += $(EVENTSdir)/FocusEvent_as3.cpp
+EVENTS_HEADERS += $(EVENTSdir)/FocusEvent_as3.h
+endif
+
+if BUILD_FULLSCREENEVENT_AS3
+EVENTS_SOURCES += $(EVENTSdir)/FullScreenEvent_as3.cpp
+EVENTS_HEADERS += $(EVENTSdir)/FullScreenEvent_as3.h
+endif
+
+if BUILD_HTMLUNCAUGHTSCRIPTEXCEPTIONEVENT_AS3
+EVENTS_SOURCES += $(EVENTSdir)/HTMLUncaughtScriptExceptionEvent_as3.cpp
+EVENTS_HEADERS += $(EVENTSdir)/HTMLUncaughtScriptExceptionEvent_as3.h
+endif
+
+if BUILD_HTTPSTATUSEVENT_AS3
+EVENTS_SOURCES += $(EVENTSdir)/HTTPStatusEvent_as3.cpp
+EVENTS_HEADERS += $(EVENTSdir)/HTTPStatusEvent_as3.h
+endif
+
+if BUILD_IEVENTDISPATCHER_AS3
+EVENTS_SOURCES += $(EVENTSdir)/IEventDispatcher_as3.cpp
+EVENTS_HEADERS += $(EVENTSdir)/IEventDispatcher_as3.h
+endif
+
+if BUILD_IMEEVENT_AS3
+EVENTS_SOURCES += $(EVENTSdir)/IMEEvent_as3.cpp
+EVENTS_HEADERS += $(EVENTSdir)/IMEEvent_as3.h
+endif
+
+if BUILD_IOERROREVENT_AS3
+EVENTS_SOURCES += $(EVENTSdir)/IOErrorEvent_as3.cpp
+EVENTS_HEADERS += $(EVENTSdir)/IOErrorEvent_as3.h
+endif
+
+if BUILD_INVOKEEVENT_AS3
+EVENTS_SOURCES += $(EVENTSdir)/InvokeEvent_as3.cpp
+EVENTS_HEADERS += $(EVENTSdir)/InvokeEvent_as3.h
+endif
+
+if BUILD_KEYBOARDEVENT_AS3
+EVENTS_SOURCES += $(EVENTSdir)/KeyboardEvent_as3.cpp
+EVENTS_HEADERS += $(EVENTSdir)/KeyboardEvent_as3.h
+endif
+
+if BUILD_MOUSEEVENT_AS3
+EVENTS_SOURCES += $(EVENTSdir)/MouseEvent_as3.cpp
+EVENTS_HEADERS += $(EVENTSdir)/MouseEvent_as3.h
+endif
+
+if BUILD_NATIVEDRAGEVENT_AS3
+EVENTS_SOURCES += $(EVENTSdir)/NativeDragEvent_as3.cpp
+EVENTS_HEADERS += $(EVENTSdir)/NativeDragEvent_as3.h
+endif
+
+if BUILD_NATIVEWINDOWBOUNDSEVENT_AS3
+EVENTS_SOURCES += $(EVENTSdir)/NativeWindowBoundsEvent_as3.cpp
+EVENTS_HEADERS += $(EVENTSdir)/NativeWindowBoundsEvent_as3.h
+endif
+
+if BUILD_NATIVEWINDOWDISPLAYSTATEEVENT_AS3
+EVENTS_SOURCES += $(EVENTSdir)/NativeWindowDisplayStateEvent_as3.cpp
+EVENTS_HEADERS += $(EVENTSdir)/NativeWindowDisplayStateEvent_as3.h
+endif
+
+if BUILD_NETSTATUSEVENT_AS3
+EVENTS_SOURCES += $(EVENTSdir)/NetStatusEvent_as3.cpp
+EVENTS_HEADERS += $(EVENTSdir)/NetStatusEvent_as3.h
+endif
+
+if BUILD_OUTPUTPROGRESSEVENT_AS3
+EVENTS_SOURCES += $(EVENTSdir)/OutputProgressEvent_as3.cpp
+EVENTS_HEADERS += $(EVENTSdir)/OutputProgressEvent_as3.h
+endif
+
+if BUILD_PROGRESSEVENT_AS3
+EVENTS_SOURCES += $(EVENTSdir)/ProgressEvent_as3.cpp
+EVENTS_HEADERS += $(EVENTSdir)/ProgressEvent_as3.h
+endif
+
+if BUILD_SQLERROREVENT_AS3
+EVENTS_SOURCES += $(EVENTSdir)/SQLErrorEvent_as3.cpp
+EVENTS_HEADERS += $(EVENTSdir)/SQLErrorEvent_as3.h
+endif
+
+if BUILD_SQLEVENT_AS3
+EVENTS_SOURCES += $(EVENTSdir)/SQLEvent_as3.cpp
+EVENTS_HEADERS += $(EVENTSdir)/SQLEvent_as3.h
+endif
+
+if BUILD_SQLUPDATEEVENT_AS3
+EVENTS_SOURCES += $(EVENTSdir)/SQLUpdateEvent_as3.cpp
+EVENTS_HEADERS += $(EVENTSdir)/SQLUpdateEvent_as3.h
+endif
+
+if BUILD_SCREENMOUSEEVENT_AS3
+EVENTS_SOURCES += $(EVENTSdir)/ScreenMouseEvent_as3.cpp
+EVENTS_HEADERS += $(EVENTSdir)/ScreenMouseEvent_as3.h
+endif
+
+if BUILD_SECURITYERROREVENT_AS3
+EVENTS_SOURCES += $(EVENTSdir)/SecurityErrorEvent_as3.cpp
+EVENTS_HEADERS += $(EVENTSdir)/SecurityErrorEvent_as3.h
+endif
+
+if BUILD_STATUSEVENT_AS3
+EVENTS_SOURCES += $(EVENTSdir)/StatusEvent_as3.cpp
+EVENTS_HEADERS += $(EVENTSdir)/StatusEvent_as3.h
+endif
+
+if BUILD_SYNCEVENT_AS3
+EVENTS_SOURCES += $(EVENTSdir)/SyncEvent_as3.cpp
+EVENTS_HEADERS += $(EVENTSdir)/SyncEvent_as3.h
+endif
+
+if BUILD_TEXTEVENT_AS3
+EVENTS_SOURCES += $(EVENTSdir)/TextEvent_as3.cpp
+EVENTS_HEADERS += $(EVENTSdir)/TextEvent_as3.h
+endif
+
+if BUILD_TIMEREVENT_AS3
+EVENTS_SOURCES += $(EVENTSdir)/TimerEvent_as3.cpp
+EVENTS_HEADERS += $(EVENTSdir)/TimerEvent_as3.h
+endif
+
+libgnashas3_la_SOURCES += $(EVENTS_SOURCES)
+noinst_HEADERS += $(EVENTS_HEADERS)
=== modified file 'macros/classes.m4'
--- a/macros/classes.m4 2009-04-24 00:13:24 +0000
+++ b/macros/classes.m4 2009-04-24 15:50:42 +0000
@@ -183,7 +183,7 @@
AM_CONDITIONAL(BUILD_SOUND_AS3, test x"${Sound_as3}" = x"yes" -o
x"${build_all_as3}" = x"yes")
dnl
-dnl AM_CONDITIONAL(BUILD_ACCESSIBILITYPROPERTIES_AS3, test
x"${AccessibilityProperties_as3}" = x"yes" -o x"${build_all_as3}" = x"yes")
+AM_CONDITIONAL(BUILD_ACCESSIBILITY_PROPERTIES_AS3, test
x"${AccessibilityProperties_as3}" = x"yes" -o x"${build_all_as3}" = x"yes")
AM_CONDITIONAL(BUILD_CHECKBOXACCIMPL_AS3, test x"${CheckBoxAccImpl_as3}" =
x"yes" -o x"${build_all_as3}" = x"yes")
AM_CONDITIONAL(BUILD_BUTTONACCIMPL_AS3, test x"${ButtonAccImpl_as3}" = x"yes"
-o x"${build_all_as3}" = x"yes")
AM_CONDITIONAL(BUILD_DATAGRIDACCIMPL_AS3, test x"${DataGridAccImpl_as3}" =
x"yes" -o x"${build_all_as3}" = x"yes")
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/avm2 r9709: include all the sub makefiles as fragments, instead of recursion. This is faster as make doesn't have to fire up as many shells and processes. It also lets us build a subset of all the classes much easier.,
rob <=