[Gnash-commit] /srv/bzr/gnash/trunk r10855: Install more headers.

[Tomeu Vizoso]

------------------------------------------------------------
revno: 10855
committer: Tomeu Vizoso <address@hidden>
branch nick: gnash
timestamp: Tue 2009-04-28 17:22:32 +0200
message:
  Install more headers.
modified:
  gui/Makefile.am
  gui/pythonmod/Makefile.am
  libbase/Makefile.am
  libcore/DynamicShape.h
  libcore/Makefile.am
  libcore/MovieClip.h
  libcore/asobj/Makefile.am
  libcore/impl.h
  libcore/movie_root.h
  libcore/parser/Makefile.am
  libcore/parser/movie_definition.h
  libcore/vm/Makefile.am
  pythonmodule/Makefile.am

=== modified file 'gui/Makefile.am'
--- a/gui/Makefile.am   2009-04-26 21:31:52 +0000
+++ b/gui/Makefile.am   2009-04-28 15:22:32 +0000
@@ -50,6 +50,7 @@
         -I$(top_srcdir)/libcore/swf \
         -I$(top_srcdir)/libcore/parser \
         -I$(top_srcdir)/libcore/vm \
+        -I$(top_srcdir)/libcore/asobj \
        -I$(top_srcdir)/libltdl \
         -I$(top_srcdir)/libbase \
         -I$(top_srcdir)/backend \

=== modified file 'gui/pythonmod/Makefile.am'
--- a/gui/pythonmod/Makefile.am 2009-04-26 17:05:46 +0000
+++ b/gui/pythonmod/Makefile.am 2009-04-28 15:22:32 +0000
@@ -26,6 +26,7 @@
        -I$(top_srcdir)/libcore/swf \
        -I$(top_srcdir)/libcore/vm \
        -I$(top_srcdir)/libcore/parser \
+       -I$(top_srcdir)/libcore/asobj \
        -I$(top_srcdir)/libmedia \
        -I$(top_srcdir)/libmedia/gst \
        -I$(top_srcdir)/libmedia/ffmpeg \

=== modified file 'libbase/Makefile.am'
--- a/libbase/Makefile.am       2009-04-28 07:30:36 +0000
+++ b/libbase/Makefile.am       2009-04-28 15:22:32 +0000
@@ -138,8 +138,6 @@
        extension.h \
        GnashNumeric.h \
        jemtree.h \
-       GnashImage.h \
-       GnashImageJpeg.h \
        GnashSleep.h \
        gmemory.h \
        ogl.h \
@@ -153,22 +151,16 @@
        GnashSystemNetHeaders.h \
        GnashSystemIOHeaders.h \
        GnashFileUtilities.h \
-       NamingPolicy.h \
        ClockTime.h \
        WallClockTimer.h \
        utf8.h \
-       NetworkAdapter.h \
        noseek_fd_adapter.h \
        zlib_adapter.h \
-       URL.h \
        LoadThread.h \
        BitsReader.h \
        arg_parser.h \
        getclocktime.hpp \
-       Point2d.h \
-       Range2d.h \
        GnashAlgorithm.h \
-       snappingrange.h \
        $(NULL)
 
 if USE_PNG
@@ -189,6 +181,14 @@
        log.h \
        rc.h \
        gettext.h \
+       URL.h \
+       Point2d.h \
+       Range2d.h \
+       snappingrange.h \
+       NetworkAdapter.h \
+       NamingPolicy.h \
+       GnashImageJpeg.h \
+       GnashImage.h \
        $(NULL)
 
 if SDKINSTALL

=== modified file 'libcore/DynamicShape.h'
--- a/libcore/DynamicShape.h    2009-04-14 18:31:04 +0000
+++ b/libcore/DynamicShape.h    2009-04-28 15:22:32 +0000
@@ -22,7 +22,7 @@
 
 #include "fill_style.h"
 #include "styles.h" 
-#include "swf/ShapeRecord.h"
+#include "ShapeRecord.h"
 
 namespace gnash {
     class DisplayObject;

=== modified file 'libcore/Makefile.am'
--- a/libcore/Makefile.am       2009-04-28 07:30:36 +0000
+++ b/libcore/Makefile.am       2009-04-28 15:22:32 +0000
@@ -125,26 +125,16 @@
        $(NULL)
 
 noinst_HEADERS = \
-       StreamProvider.h \
        URLAccessManager.h \
        VirtualClock.h \
        SystemClock.h \
        ManualClock.h \
-       RunInfo.h \
        asClass.h \
        Bitmap.h \
-       BitmapInfo.h \
        BitmapMovie.h \
        Button.h \
-       DisplayObject.h \
-       cxform.h \
        debugger.h \
-       DynamicShape.h  \
-       DisplayList.h   \
-       drag_state.h \
        TextField.h \
-       event_id.h \
-       fill_style.h \
         BitmapFilter.h \
         BlurFilter.h \
         BevelFilter.h \
@@ -160,35 +150,17 @@
        Shape.h \
        MorphShape.h \
        StaticText.h \
-       InteractiveObject.h \
-       gnash.h \
-       GnashKey.h \
-       impl.h \
        LoadVariablesThread.h \
-       SWFMatrix.h \
-       MouseButtonState.h \
        SWFMovie.h \
-       Movie.h \
-       movie_root.h \
-       rect.h \
        render.h \
-       ExportableResource.h \
-       Geometry.h      \
-       MovieClip.h \
        SWFStream.h \
-       styles.h \
-       swf/swf.h \
-       swf/TagLoadersTable.h \
        swf/tag_loaders.h \
        swf/VideoFrameTag.h \
        swf/DefineVideoStreamTag.h \
-       swf/ControlTag.h \
        swf/DefineFontAlignZonesTag.h \
        swf/CSMTextSettingsTag.h \
        swf/DefineShapeTag.h \
-       swf/DefinitionTag.h \
        swf/DefineMorphShapeTag.h \
-       swf/ShapeRecord.h \
        swf/SoundInfoRecord.h \
        swf/TextRecord.h \
        swf/DefineButtonSoundTag.h \
@@ -210,7 +182,6 @@
        swf_event.h \
        swf_function.h \
        Timers.h \
-       RGBA.h  \
        Video.h \
        $(NULL)
 
@@ -226,6 +197,35 @@
        as_function.h \
        namedStrings.h \
        as_environment.h \
+       movie_root.h \
+       MouseButtonState.h \
+       drag_state.h \
+       InteractiveObject.h \
+       rect.h \
+       GnashKey.h \
+       Movie.h \
+       RunInfo.h \
+       gnash.h \
+       DisplayObject.h \
+       MovieClip.h \
+       StreamProvider.h \
+       event_id.h \
+       SWFMatrix.h \
+       cxform.h \
+       DisplayList.h   \
+       DynamicShape.h  \
+       swf/ControlTag.h \
+       swf/DefinitionTag.h \
+       swf/ShapeRecord.h \
+       swf/TagLoadersTable.h \
+       swf/swf.h \
+       impl.h \
+       fill_style.h \
+       styles.h \
+       ExportableResource.h \
+       BitmapInfo.h \
+       RGBA.h  \
+       Geometry.h      \
        $(NULL)
 
 if SDKINSTALL

=== modified file 'libcore/MovieClip.h'
--- a/libcore/MovieClip.h       2009-04-26 02:42:55 +0000
+++ b/libcore/MovieClip.h       2009-04-28 15:22:32 +0000
@@ -25,7 +25,7 @@
 #include "gnashconfig.h" // GNASH_USE_GC, USE_SWFTREE
 #endif
 
-#include "swf/ControlTag.h"
+#include "ControlTag.h"
 #include "movie_definition.h" // for inlines
 #include "DisplayList.h" // DisplayList 
 #include "InteractiveObject.h"

=== modified file 'libcore/asobj/Makefile.am'
--- a/libcore/asobj/Makefile.am 2009-04-16 16:57:06 +0000
+++ b/libcore/asobj/Makefile.am 2009-04-28 15:22:32 +0000
@@ -113,7 +113,6 @@
 noinst_HEADERS = \
        AsBroadcaster.h \
        Accessibility_as.h \
-       Array_as.h \
        Boolean_as.h \
        Camera.h \
        ClassHierarchy.h \
@@ -124,7 +123,6 @@
        Error_as.h      \
        Math_as.h       \
        Global.h\
-       Key_as.h \
        LoadVars_as.h \
        LocalConnection_as.h\
        Microphone.h \
@@ -176,6 +174,18 @@
        LoadableObject.h \
        $(NULL)
 
+EXTENSIONS_API = \
+       Array_as.h \
+       Key_as.h \
+       $(NULL)
+
+if SDKINSTALL
+noinst_HEADERS += $(EXTENSIONS_API)
+else
+instdir = $(includedir)/gnash
+inst_HEADERS = $(EXTENSIONS_API)
+endif
+
 libgnashasobjs_la_LIBADD = \
        $(top_builddir)/libamf/libgnashamf.la \
        $(top_builddir)/libbase/libgnashbase.la

=== modified file 'libcore/impl.h'
--- a/libcore/impl.h    2009-01-22 20:10:39 +0000
+++ b/libcore/impl.h    2009-04-28 15:22:32 +0000
@@ -22,7 +22,7 @@
 #include "dsodefs.h"
 
 #include "smart_ptr.h"
-#include "swf/TagLoadersTable.h"
+#include "TagLoadersTable.h"
 
 namespace gnash {
 

=== modified file 'libcore/movie_root.h'
--- a/libcore/movie_root.h      2009-04-14 17:49:58 +0000
+++ b/libcore/movie_root.h      2009-04-28 15:22:32 +0000
@@ -73,7 +73,7 @@
 #include "dsodefs.h" // DSOEXPORT
 #include "MouseButtonState.h" // for composition
 #include "drag_state.h" // for composition
-#include "asobj/Key_as.h"
+#include "Key_as.h"
 #include "smart_ptr.h" // for memory management
 #include "URL.h" // for loadMovie
 #include "GnashKey.h" // key::code

=== modified file 'libcore/parser/Makefile.am'
--- a/libcore/parser/Makefile.am        2009-04-07 12:34:43 +0000
+++ b/libcore/parser/Makefile.am        2009-04-28 15:22:32 +0000
@@ -61,6 +61,17 @@
        sound_definition.h \
        sprite_definition.h
 
+EXTENSIONS_API = \
+       movie_definition.h \
+       $(NULL)
+
+if SDKINSTALL
+noinst_HEADERS += $(EXTENSIONS_API)
+else
+instdir = $(includedir)/gnash
+inst_HEADERS = $(EXTENSIONS_API)
+endif
+
 libgnashparser_la_LIBADD = \
        $(top_builddir)/libamf/libgnashamf.la \
        $(top_builddir)/libbase/libgnashbase.la

=== modified file 'libcore/parser/movie_definition.h'
--- a/libcore/parser/movie_definition.h 2009-04-15 05:33:51 +0000
+++ b/libcore/parser/movie_definition.h 2009-04-28 15:22:32 +0000
@@ -51,7 +51,7 @@
 #include "gnashconfig.h" // for USE_SWFTREE
 #endif
 
-#include "swf/DefinitionTag.h"
+#include "DefinitionTag.h"
 #include "GnashImageJpeg.h"
 
 #include <string>

=== modified file 'libcore/vm/Makefile.am'
--- a/libcore/vm/Makefile.am    2009-04-28 07:30:36 +0000
+++ b/libcore/vm/Makefile.am    2009-04-28 15:22:32 +0000
@@ -54,7 +54,6 @@
        asName.h                        \
        ActionExec.h            \
        ExecutableCode.h        \
-       VM.h                    \
        action.h                \
        with_stack_entry.h      \
        $(NULL)
@@ -63,6 +62,7 @@
        fn_call.h               \
        CallStack.h \
        SafeStack.h                     \
+       VM.h                    \
        $(NULL)
 
 if SDKINSTALL

=== modified file 'pythonmodule/Makefile.am'
--- a/pythonmodule/Makefile.am  2009-04-20 17:20:47 +0000
+++ b/pythonmodule/Makefile.am  2009-04-28 15:22:32 +0000
@@ -46,6 +46,7 @@
         -I$(top_srcdir)/libcore/swf \
         -I$(top_srcdir)/libcore/parser \
         -I$(top_srcdir)/libcore/vm \
+        -I$(top_srcdir)/libcore/asobj \
        -I$(top_srcdir)/libltdl \
         -I$(top_srcdir)/libbase \
         -I$(top_srcdir)/backend \
@@ -77,6 +78,7 @@
         -I$(top_srcdir)/libcore/swf \
         -I$(top_srcdir)/libcore/parser \
         -I$(top_srcdir)/libcore/vm \
+        -I$(top_srcdir)/libcore/asobj \
        -I$(top_srcdir)/libltdl \
         -I$(top_srcdir)/libbase \
         -I$(top_srcdir)/backend \