[Gnash-commit] /srv/bzr/gnash/trunk r12003: Move libamf and libnet back to Cygnal where they started life.

[Rob Savoye]

------------------------------------------------------------
revno: 12003
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Tue 2010-03-09 13:11:52 -0700
message:
  Move libamf and libnet back to Cygnal where they started life.
  Move testsuite/libamf.all and testsuite/libnet.all back to cygnal/testsuite.
  Remove all references to libamf and libnet from all but cygnal.
  Fix all paths in Cygnal for libamf and libnet.
  Make building lirc conditional like it always should have been.
  Don't build flvdumper or soldumper, nobody uses them anyway.
  Drop libnet from XML_Socket, leave broken for now.
  Make packaging have bzrversion.h as a dependency, or sometimes it gets the
  nickname and revno wrong.
renamed:
  libamf/ => cygnal/libamf/
  libnet/ => cygnal/libnet/
  testsuite/libamf.all/ => cygnal/testsuite/libamf.all/
  testsuite/libnet.all/ => cygnal/testsuite/libnet.all/
modified:
  Makefile.am
  configure.ac
  cygnal/Makefile.am
  cygnal/cgi-bin/echo/Makefile.am
  cygnal/cgi-bin/oflaDemo/Makefile.am
  cygnal/libamf/Makefile.am
  cygnal/libnet/Makefile.am
  cygnal/testsuite/Makefile.am
  gui/Makefile.am
  gui/gtk.cpp
  libcore/Makefile.am
  libcore/asobj/Makefile.am
  libcore/asobj/flash.am
  libcore/asobj/flash/net/SharedObject_as.cpp
  libcore/asobj/flash/net/SharedObject_as.h
  libcore/asobj/flash/net/XMLSocket_as.cpp
  libcore/asobj/flash/net/XMLSocket_as.h
  libcore/parser/Makefile.am
  libcore/vm/Makefile.am
  packaging/snapshot.am
  testsuite/Makefile.am
  testsuite/actionscript.all/Makefile.am
  testsuite/libcore.all/AsValueTest.cpp
  testsuite/libcore.all/Makefile.am
  testsuite/libmedia.all/Makefile.am
  testsuite/misc-swfc.all/Makefile.am
  testsuite/network.all/Makefile.am
  testsuite/samples/Makefile.am
  utilities/Makefile.am

=== modified file 'Makefile.am'
--- a/Makefile.am       2010-02-27 00:11:47 +0000
+++ b/Makefile.am       2010-03-09 20:11:52 +0000
@@ -44,13 +44,16 @@
        --disable-testsuite
 #--enable-cygnal
 
+if CYGNAL
+CYGNAL_DIR = cygnal
+endif
+
 STD_DIRS = \
        libbase \
-       libamf \
-       libnet \
        libmedia \
        libsound \
        libcore \
+       $(CYGNAL_DIR) \
        backend \
        gui \
        plugin \
@@ -63,12 +66,8 @@
 LIBLTDLDIR = libltdl
 endif
 
-if CYGNAL
-CYGNAL_DIR = cygnal
-endif
-
 DIST_SUBDIRS = $(STD_DIRS) cygnal extensions testsuite libltdl
-SUBDIRS = $(LIBLTDLDIR) $(STD_DIRS) $(CYGNAL_DIR)
+SUBDIRS = $(LIBLTDLDIR) $(STD_DIRS)
 
 if TESTSUITE
 SUBDIRS += testsuite

=== modified file 'configure.ac'
--- a/configure.ac      2010-03-09 16:00:50 +0000
+++ b/configure.ac      2010-03-09 20:11:52 +0000
@@ -2470,8 +2470,6 @@
 libcore/Makefile
 libcore/vm/Makefile
 libcore/parser/Makefile
-libnet/Makefile
-libamf/Makefile
 backend/Makefile
 utilities/Makefile
 doc/Makefile
@@ -2495,8 +2493,6 @@
 testsuite/network.all/Makefile
 testsuite/movies.all/Makefile
 testsuite/libcore.all/Makefile
-testsuite/libamf.all/Makefile
-testsuite/libnet.all/Makefile
 testsuite/libmedia.all/Makefile
 gui/Makefile
 gui/Info.plist
@@ -2515,11 +2511,15 @@
 plugin/mozilla-sdk/Makefile
 plugin/win32/Makefile
 cygnal/Makefile
+cygnal/libnet/Makefile
+cygnal/libamf/Makefile
 cygnal/cgi-bin/Makefile
 cygnal/cgi-bin/echo/Makefile
 cygnal/cgi-bin/oflaDemo/Makefile
 cygnal/cgi-bin/fitcDemo/Makefile
 cygnal/testsuite/Makefile
+cygnal/testsuite/libamf.all/Makefile
+cygnal/testsuite/libnet.all/Makefile
 cygnal/testsuite/cygnal.all/Makefile
 pch/Makefile
 )

=== modified file 'cygnal/Makefile.am'
--- a/cygnal/Makefile.am        2010-01-22 04:40:06 +0000
+++ b/cygnal/Makefile.am        2010-03-09 20:11:52 +0000
@@ -24,15 +24,14 @@
 TEST_DIR = #testsuite
 endif
 
-#if USE_CGI
-CGI_DIR = cgi-bin
-#endif
-
 EXTRA_DIST = cygnalrc.in
 CLEANFILES = cygnalrc
 
-SUBDIRS = . \
-       $(CGI_DIR) \
+SUBDIRS = \
+       libamf \
+       libnet \
+       . \
+       cgi-bin
        $(TEST_DIR)
 
 # these need to be included in a distribution, even if not part
@@ -47,10 +46,10 @@
 AM_CPPFLAGS =  -DPLUGINSDIR=\"$(pluginsdir)\"
 
 AM_LDFLAGS = \
+       libnet/libgnashnet.la \
+       libamf/libgnashamf.la \
        $(top_builddir)/libbase/libgnashbase.la \
        $(top_builddir)/libcore/libgnashcore.la \
-       $(top_builddir)/libnet/libgnashnet.la \
-       $(top_builddir)/libamf/libgnashamf.la \
        $(top_builddir)/libmedia/libgnashmedia.la \
        $(top_builddir)/libsound/libgnashsound.la \
        $(GLIB_LIBS) \
@@ -70,9 +69,9 @@
 localedir = $(datadir)/locale
 
 INCLUDES = -I.. \
+        -I$(srcdir)/libamf \
+        -I$(srcdir)/libnet \
         -I$(top_srcdir)        \
-        -I$(top_srcdir)/libnet \
-        -I$(top_srcdir)/libamf \
         -I$(top_srcdir)/libbase \
         -I$(top_srcdir)/libltdl \
         -I$(top_srcdir)/libmedia \

=== modified file 'cygnal/cgi-bin/echo/Makefile.am'
--- a/cygnal/cgi-bin/echo/Makefile.am   2010-01-01 17:48:26 +0000
+++ b/cygnal/cgi-bin/echo/Makefile.am   2010-03-09 20:11:52 +0000
@@ -1,6 +1,6 @@
 ## Process this file with automake to generate Makefile.in
 # 
-#   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, 
Inc.
+# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 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
@@ -25,19 +25,19 @@
 GNASH_LIBS = \
        $(top_builddir)/libbase/libgnashbase.la \
        $(top_builddir)/libcore/libgnashcore.la \
-       $(top_builddir)/libamf/libgnashamf.la \
-       $(top_builddir)/libnet/libgnashnet.la \
-       $(BOOST_CFLAGS) \
+       ../../libamf/libgnashamf.la \
+       ../../libnet/libgnashnet.la \
+       $(BOOST_LIBS) \
        $(PTHREAD_LIBS) \
        $(NULL)
 
 INCLUDES = \
         -I$(top_srcdir)/libbase \
-        -I$(top_srcdir)/libamf \
-       -I$(top_srcdir)/libnet \
        -I$(top_srcdir)/libcore \
        -I$(top_srcdir)/libltdl \
        -I$(top_srcdir)/cygnal \
+        -I$(top_srcdir)/cygnal/libamf \
+       -I$(top_srcdir)/cygnal/libnet \
        $(BOOST_CFLAGS)
 
 echo_la_SOURCES = echo.cpp echo.h

=== modified file 'cygnal/cgi-bin/oflaDemo/Makefile.am'
--- a/cygnal/cgi-bin/oflaDemo/Makefile.am       2010-01-01 17:48:26 +0000
+++ b/cygnal/cgi-bin/oflaDemo/Makefile.am       2010-03-09 20:11:52 +0000
@@ -25,19 +25,19 @@
 GNASH_LIBS = \
        $(top_builddir)/libbase/libgnashbase.la \
        $(top_builddir)/libcore/libgnashcore.la \
-       $(top_builddir)/libamf/libgnashamf.la \
-       $(top_builddir)/libnet/libgnashnet.la \
+       ../../libamf/libgnashamf.la \
+       ../../libnet/libgnashnet.la \
+       $(BOOST_LIBS) \
        $(PTHREAD_LIBS) \
-       $(BOOST_CFLAGS) \
        $(NULL)
 
 INCLUDES = \
         -I$(top_srcdir)/libbase \
-        -I$(top_srcdir)/libamf \
-       -I$(top_srcdir)/libnet \
        -I$(top_srcdir)/libcore \
        -I$(top_srcdir)/libltdl \
        -I$(top_srcdir)/cygnal \
+        -I$(top_srcdir)/cygnal/libamf \
+       -I$(top_srcdir)/cygnal/libnet \
        $(BOOST_CFLAGS)
 
 oflaDemo_la_SOURCES = oflaDemo.cpp oflaDemo.h

=== renamed directory 'libamf' => 'cygnal/libamf'
=== modified file 'cygnal/libamf/Makefile.am'
--- a/libamf/Makefile.am        2010-03-09 16:00:50 +0000
+++ b/cygnal/libamf/Makefile.am 2010-03-09 20:11:52 +0000
@@ -41,7 +41,8 @@
 # noinst_HEADERS = amf.h amfutf8.h
 
 AM_CPPFLAGS = \
-       -I$(top_srcdir)/libnet \
+       -I$(top_srcdir)/cygnal/libamf \
+       -I$(top_srcdir)/cygnal/libnet \
        -I$(top_srcdir)/libcore \
        -I$(top_srcdir)/libbase \
        $(BOOST_CFLAGS) \
@@ -61,7 +62,6 @@
        sol.h
 
 if ENABLE_PCH
-SUBDIRS = ../pch
 AM_CXXFLAGS = $(PCH_FLAGS)
 endif
 

=== renamed directory 'libnet' => 'cygnal/libnet'
=== modified file 'cygnal/libnet/Makefile.am'
--- a/libnet/Makefile.am        2010-03-09 16:00:50 +0000
+++ b/cygnal/libnet/Makefile.am 2010-03-09 20:11:52 +0000
@@ -23,7 +23,7 @@
 pkglib_LTLIBRARIES = libgnashnet.la
 
 AM_LDFLAGS = \
-       ../libbase/libgnashbase.la \
+       $(top_builddir)/libbase/libgnashbase.la \
        ../libamf/libgnashamf.la \
        $(SSH_LIBS) \
        $(SSL_LIBS) \
@@ -37,7 +37,8 @@
 localedir = $(datadir)/locale
 
 INCLUDES = \
-        -I$(top_srcdir)/libamf \
+       -I$(top_srcdir)/cygnal/libamf \
+       -I$(top_srcdir)/cygnal/libnet \
         -I$(top_srcdir)/libbase \
         -I$(top_srcdir)/libcore \
         -DLOCALEDIR=\"$(localedir)\" \
@@ -89,7 +90,6 @@
 endif
 
 if ENABLE_PCH
-SUBDIRS = ../pch
 AM_CXXFLAGS = $(PCH_FLAGS)
 endif
 

=== modified file 'cygnal/testsuite/Makefile.am'
--- a/cygnal/testsuite/Makefile.am      2010-01-01 17:48:26 +0000
+++ b/cygnal/testsuite/Makefile.am      2010-03-09 20:11:52 +0000
@@ -20,5 +20,5 @@
 
 AUTOMAKE_OPTIONS = 
 
-SUBDIRS = cygnal.all
+SUBDIRS = libamf.all libnet.all cygnal.all
 

=== renamed directory 'testsuite/libamf.all' => 'cygnal/testsuite/libamf.all'
=== renamed directory 'testsuite/libnet.all' => 'cygnal/testsuite/libnet.all'
=== modified file 'gui/Makefile.am'
--- a/gui/Makefile.am   2010-03-09 16:37:20 +0000
+++ b/gui/Makefile.am   2010-03-09 20:11:52 +0000
@@ -107,7 +107,6 @@
        $(NULL)
 
 GNASH_LIBS = \
-       $(top_builddir)/libnet/libgnashnet.la \
        $(top_builddir)/libmedia/libgnashmedia.la \
        $(top_builddir)/libcore/libgnashcore.la \
        $(top_builddir)/libsound/libgnashsound.la \

=== modified file 'gui/gtk.cpp'
--- a/gui/gtk.cpp       2010-02-11 08:33:14 +0000
+++ b/gui/gtk.cpp       2010-03-09 20:11:52 +0000
@@ -32,7 +32,9 @@
 #include "Renderer.h"
 #include "RunResources.h"
 #include "VM.h"
+#ifdef USE_LIRC
 #include "lirc.h"
+#endif
 #include "gnash.h" // Quality
 
 #include <iostream>
@@ -135,10 +137,12 @@
 
 }
 
-// This is global so it can be accessed by the evnt handler, which
+#ifdef USE_LIRC
+// This is global so it can be accessed by the event handler, which
 // isn't part of this class. 
 Lirc *lirc;
 bool lirc_handler(void*, int, void* data);
+#endif
 
 GtkGui::~GtkGui()
 {
@@ -2164,6 +2168,7 @@
 
 }
 
+#ifdef USE_LIRC
 bool
 lirc_handler(void*, int, void* /*data*/)
 { 
@@ -2174,6 +2179,7 @@
     // Want to keep this handler
     return true;
 }
+#endif
 
 // This assumes that the parent of _drawingArea is _window, which
 // isn't the case in the plugin fullscreen (it's _overlay). Currently

=== modified file 'libcore/Makefile.am'
--- a/libcore/Makefile.am       2010-03-09 16:00:50 +0000
+++ b/libcore/Makefile.am       2010-03-09 20:11:52 +0000
@@ -33,7 +33,6 @@
 
 # Only enable if we're configured with --enable-mp3
 AM_CPPFLAGS = \
-       -I$(top_srcdir)/libnet \
        -I$(top_srcdir)/backend \
        -I$(top_srcdir)/libcore/swf \
        -I$(top_srcdir)/libcore/abc \
@@ -293,7 +292,6 @@
 
 libgnashcore_la_LIBADD = \
        $(top_builddir)/libbase/libgnashbase.la \
-       $(top_builddir)/libnet/libgnashnet.la \
        $(top_builddir)/libcore/parser/libgnashparser.la \
        $(top_builddir)/libcore/vm/libgnashvm.la \
        $(top_builddir)/libmedia/libgnashmedia.la \

=== modified file 'libcore/asobj/Makefile.am'
--- a/libcore/asobj/Makefile.am 2010-03-09 16:00:50 +0000
+++ b/libcore/asobj/Makefile.am 2010-03-09 20:11:52 +0000
@@ -34,7 +34,6 @@
 pkglib_LTLIBRARIES = libgnashasobjs.la 
 
 AM_CPPFLAGS = \
-       -I$(top_srcdir)/libnet \
        -I$(top_srcdir)/backend \
        -I$(top_srcdir)/libcore \
        -I$(top_srcdir)/libcore/swf \
@@ -120,8 +119,7 @@
 endif
 
 libgnashasobjs_la_LIBADD = \
-       $(top_builddir)/libnet/libgnashmedia.la \
-       $(top_builddir)/libnet/libgnashnet.la \
+       $(top_builddir)/libmedia/libgnashmedia.la \
        $(top_builddir)/libbase/libgnashbase.la
 
 if USE_FFMPEG_ENGINE

=== modified file 'libcore/asobj/flash.am'
--- a/libcore/asobj/flash.am    2010-03-08 06:29:39 +0000
+++ b/libcore/asobj/flash.am    2010-03-09 20:11:52 +0000
@@ -75,7 +75,6 @@
        $(NULL)
 
 # libgnashasobjs_la_LIBADD = \
-#      $(top_builddir)/libnet/libgnashnet.la \
 #      $(top_builddir)/libbase/libgnashbase.la
 
 # if USE_FFMPEG_ENGINE

=== modified file 'libcore/asobj/flash/net/SharedObject_as.cpp'
--- a/libcore/asobj/flash/net/SharedObject_as.cpp       2010-03-09 02:52:16 
+0000
+++ b/libcore/asobj/flash/net/SharedObject_as.cpp       2010-03-09 20:11:52 
+0000
@@ -40,7 +40,6 @@
 #include "string_table.h"
 #include "rc.h" // for use of rcfile
 #include "URLAccessManager.h"
-#include "network.h"
 #include "URL.h"
 #include "NetConnection_as.h"
 #include "Object.h"

=== modified file 'libcore/asobj/flash/net/SharedObject_as.h'
--- a/libcore/asobj/flash/net/SharedObject_as.h 2010-02-15 08:21:35 +0000
+++ b/libcore/asobj/flash/net/SharedObject_as.h 2010-03-09 20:11:52 +0000
@@ -26,7 +26,6 @@
 // Forward declarations
 namespace gnash {
     class as_object;
-    class Network;
     class ObjectURI;
     class SharedObject_as;
     class VM;

=== modified file 'libcore/asobj/flash/net/XMLSocket_as.cpp'
--- a/libcore/asobj/flash/net/XMLSocket_as.cpp  2010-01-25 18:52:20 +0000
+++ b/libcore/asobj/flash/net/XMLSocket_as.cpp  2010-03-09 20:11:52 +0000
@@ -20,8 +20,8 @@
 
 
 #include "GnashSystemFDHeaders.h"
-#include "network.h"
 #include "utility.h"
+#include "Socket.h"
 #include "net/XMLSocket_as.h"
 #include "as_function.h"
 #include "movie_root.h"
@@ -98,7 +98,8 @@
 
     size_t writeMessage(const std::string& str) {
         // We have to write the null terminator as well.
-        return write(_socket.getFileFd(), str.c_str(), str.size() + 1);
+       return 0;               // TODO
+//        return write(_socket.getFileFd(), str.c_str(), str.size() + 1);
     }
 
     /// Read from the socket.
@@ -106,7 +107,7 @@
         
         assert(_socket.connected());
     
-        const int fd = _socket.getFileFd();
+        const int fd = 0; //_socket.getFileFd(); TODO
         assert(fd > 0);
 
         fd_set fdset;
@@ -188,24 +189,26 @@
     //
     /// This also cancels any connection attempt in progress.
     void close() {
-        if (_start) _start.reset();
-        _socket.closeNet();
+        if (_start) {
+           _start.reset();
+       }
+      // _socket.closeNet(); TODO:
         
         // Reset for next connection.
         _complete = false;
 
-        assert(_socket.getFileFd() <= 0);
+        // assert(_socket.getFileFd() <= 0); TODO
         assert(!_socket.connected());
     }
 
 private:
 
     void makeConnection(const std::string& host, boost::uint16_t port) {
-        _socket.createClient(host, port);
+        // _socket.createClient(host, port); TODO
         _complete = true;
     }
 
-    Network _socket;
+    Socket _socket;
 
     bool _complete;
 

=== modified file 'libcore/asobj/flash/net/XMLSocket_as.h'
--- a/libcore/asobj/flash/net/XMLSocket_as.h    2010-01-25 18:52:20 +0000
+++ b/libcore/asobj/flash/net/XMLSocket_as.h    2010-03-09 20:11:52 +0000
@@ -20,8 +20,6 @@
 #ifndef GNASH_ASOBJ3_XMLSOCKET_H
 #define GNASH_ASOBJ3_XMLSOCKET_H
 
-
-
 namespace gnash {
 
 // Forward declarations

=== modified file 'libcore/parser/Makefile.am'
--- a/libcore/parser/Makefile.am        2010-03-09 16:00:50 +0000
+++ b/libcore/parser/Makefile.am        2010-03-09 20:11:52 +0000
@@ -73,7 +73,6 @@
 endif
 
 libgnashparser_la_LIBADD = \
-       $(top_builddir)/libamf/libgnashamf.la \
        $(top_builddir)/libbase/libgnashbase.la
 
 ## $(top_builddir)/libmedia/libgnashmedia.la

=== modified file 'libcore/vm/Makefile.am'
--- a/libcore/vm/Makefile.am    2010-03-09 16:00:50 +0000
+++ b/libcore/vm/Makefile.am    2010-03-09 20:11:52 +0000
@@ -21,7 +21,6 @@
 noinst_LTLIBRARIES = libgnashvm.la 
 
 AM_CPPFLAGS = \
-       -I$(top_srcdir)/libnet \
        -I$(top_srcdir)/backend \
        -I$(top_srcdir)/libcore \
        -I$(top_srcdir)/libcore/asobj \

=== modified file 'packaging/snapshot.am'
--- a/packaging/snapshot.am     2010-02-27 00:15:05 +0000
+++ b/packaging/snapshot.am     2010-03-09 20:11:52 +0000
@@ -17,11 +17,6 @@
 
 NOW := $(shell date "+%Y%m%d")
 
-# for snapshots, this should always be something like trunk or head
-# for an official release, it should be unset
-
-#bzr version-info --custom --template='#define BRANCH_REVNO {revno}\n#define 
BRANCH_NICK {branch_nick}\n'
-
 # this is used for Debian style naming conventions
 NEXT_RELEASE = 0.8.8
 SNAPSHOT_VERSION := $(NEXT_RELEASE)~bzr.$(BRANCH_NICK)$(BRANCH_REVNO)
@@ -52,7 +47,7 @@
 # from Automake. This uses the default version for Gnash. which is
 # 'trunk'. Then it gets renamed from the default version from 'trunk'
 # to a branch-revno stamped version instead of trunk.
-snapshot-src: distdir
+snapshot-src: bzrversion.h distdir
 
 snapshot-configure:
        address@hidden "+%Y%m%d"`; \

=== modified file 'testsuite/Makefile.am'
--- a/testsuite/Makefile.am     2010-02-09 16:21:45 +0000
+++ b/testsuite/Makefile.am     2010-03-09 20:11:52 +0000
@@ -59,8 +59,6 @@
        as3compile.all \
        actionscript.all \
        libbase.all     \
-       libamf.all \
-       libnet.all \
        libcore.all \
        libmedia.all \
        network.all \
@@ -86,9 +84,7 @@
        $(DIR_SWFMILL) \
        $(DIR_SWFC) \
        movies.all \
-       libnet.all \
        libbase.all     \
-       libamf.all \
        libmedia.all \
        libcore.all \
        $(NULL)

=== modified file 'testsuite/actionscript.all/Makefile.am'
--- a/testsuite/actionscript.all/Makefile.am    2010-01-01 17:48:26 +0000
+++ b/testsuite/actionscript.all/Makefile.am    2010-03-09 20:11:52 +0000
@@ -55,18 +55,17 @@
 dist_noinst_SCRIPTS = gen-test.sh
 
 AM_CPPFLAGS = \
-        -I$(top_srcdir)/libbase \
-        -I$(top_srcdir)/libamf  \
-        -I$(top_srcdir)/libcore  \
-        -I$(top_srcdir)/libcore/vm  \
-        -I$(top_srcdir)/libcore/asobj \
+       -I$(top_srcdir)/libbase \
+       -I$(top_srcdir)/libcore  \
+       -I$(top_srcdir)/libcore/vm  \
+       -I$(top_srcdir)/libcore/asobj \
        -I$(top_srcdir)/testsuite \
        $(OPENGL_CFLAGS)        \
        $(MP3_CFLAGS)           \
        $(OGG_CFLAGS)           \
-        $(MING_CFLAGS)         \
-        $(SDL_CFLAGS)          \
-        $(NULL)
+       $(MING_CFLAGS)          \
+       $(SDL_CFLAGS)           \
+       $(NULL)
 
 ## These are needed to properly set dependencies
 ASTESTS =                      \

=== modified file 'testsuite/libcore.all/AsValueTest.cpp'
--- a/testsuite/libcore.all/AsValueTest.cpp     2010-01-01 17:48:26 +0000
+++ b/testsuite/libcore.all/AsValueTest.cpp     2010-03-09 20:11:52 +0000
@@ -29,18 +29,21 @@
 #include "as_value.h"
 #include "as_object.h"
 #include "arg_parser.h"
+#include "Global_as.h"
+#include "GnashNumeric.h"
+#include "movie_root.h"
+#include <string>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <iostream>
+#include <boost/shared_ptr.hpp>
+
+#if 0
 #include "buffer.h"
 #include "network.h"
 #include "amf.h"
-#include "Global_as.h"
 #include "element.h"
-#include "GnashNumeric.h"
-#include "movie_root.h"
-#include <string>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <iostream>
-#include <boost/shared_ptr.hpp>
+#endif
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -49,15 +52,16 @@
 #include <iostream>
 #include <string>
 
-using namespace amf;
 using namespace gnash;
 using namespace std;
 
 static void usage (void);
 
 // Prototypes for test cases
+#if 0                           // this needs libamf and libnet
 static void test_el();
 static void test_obj(const as_object* o);
+#endif
 static void test_isnan();
 static void test_conversion();
 
@@ -121,8 +125,10 @@
 
     // run the tests
     test_isnan();
+#if 0                           // this needs libamf and libnet
     test_el();
     test_obj(getObject(m));
+#endif
     test_conversion();
    
 }
@@ -185,11 +191,10 @@
     
 }
 
-
+#if 0
 void
 test_el()
 {
-#if 0
 //    bool notest = false;
     
     Element el1;
@@ -241,13 +246,11 @@
     //}
 
     // There is no equivalent AMF element type to the as_value AS_FUNCTION type
-#endif
 }
 
 void
 test_obj(const as_object* o)
 {
-#if 0
     // Create an object element with some properties
     bool notest = false;
     Element top;
@@ -264,7 +267,6 @@
     if (top.propertySize() != 2) {
         notest = true;
     }
-    
     VM& vm = VM::get();
     string_table& st = vm.getStringTable();
 
@@ -320,8 +322,8 @@
     } else {
         runtest.fail("as_value::to_element()");
     }
+}
 #endif
-}
 
 void
 test_isnan()

=== modified file 'testsuite/libcore.all/Makefile.am'
--- a/testsuite/libcore.all/Makefile.am 2010-01-30 01:08:47 +0000
+++ b/testsuite/libcore.all/Makefile.am 2010-03-09 20:11:52 +0000
@@ -23,8 +23,6 @@
         -I$(top_srcdir)/backend  \
         -I$(top_srcdir)/libsound  \
         -I$(top_srcdir)/libmedia  \
-        -I$(top_srcdir)/libamf  \
-        -I$(top_srcdir)/libnet  \
         -I$(top_srcdir)/libbase  \
         -I$(top_srcdir)/libcore  \
         -I$(top_srcdir)/libcore/asobj \
@@ -44,7 +42,6 @@
        PropertyListTest \
        PropFlagsTest \
        DisplayListTest \
-       AsValueTest \
        ClassSizes \
        SafeStackTest \
        $(NULL)
@@ -64,7 +61,6 @@
 AM_LDFLAGS = \
        $(top_builddir)/libcore/libgnashcore.la \
        $(top_builddir)/libbase/libgnashbase.la \
-       $(top_builddir)/libamf/libgnashamf.la \
        $(top_builddir)/libmedia/libgnashmedia.la \
        $(top_builddir)/libsound/libgnashsound.la
 
@@ -103,8 +99,11 @@
 DisplayListTest_SOURCES = DisplayListTest.cpp
 DisplayListTest_LDADD = $(AM_LDFLAGS)
 
+# if CYGNAL
+check_PROGRAMS += AsValueTest
 AsValueTest_SOURCES = AsValueTest.cpp
 AsValueTest_LDADD = $(AM_LDFLAGS)
+# endif
 
 ClassSizes_SOURCES = ClassSizes.cpp
 ClassSizes_LDADD = $(AM_LDFLAGS)

=== modified file 'testsuite/libmedia.all/Makefile.am'
--- a/testsuite/libmedia.all/Makefile.am        2010-01-01 17:48:26 +0000
+++ b/testsuite/libmedia.all/Makefile.am        2010-03-09 20:11:52 +0000
@@ -35,15 +35,13 @@
 localedir = $(datadir)/locale
 
 INCLUDES = \
-        -I$(top_srcdir)/testsuite \
-        -I$(top_srcdir)/libnet \
-        -I$(top_srcdir)/libamf \
-        -I$(top_srcdir)/libbase \
+       -I$(top_srcdir)/testsuite \
+       -I$(top_srcdir)/libbase \
        -I$(top_srcdir)/libmedia \
        -I$(top_srcdir)/libmedia/gst \
-        -I$(top_srcdir)/cygnal \
-        -I$(top_srcdir)/libcore \
-        -DLOCALEDIR=\"$(localedir)\" \
+       -I$(top_srcdir)/cygnal \
+       -I$(top_srcdir)/libcore \
+       -DLOCALEDIR=\"$(localedir)\" \
        $(BOOST_CFLAGS) \
        $(DEJAGNU_CFLAGS) \
        $(PTHREAD_CFLAGS) \

=== modified file 'testsuite/misc-swfc.all/Makefile.am'
--- a/testsuite/misc-swfc.all/Makefile.am       2010-01-01 17:48:26 +0000
+++ b/testsuite/misc-swfc.all/Makefile.am       2010-03-09 20:11:52 +0000
@@ -70,7 +70,6 @@
        $(top_builddir)/testsuite/libtestsuite.la \
        $(top_builddir)/libcore/libgnashcore.la \
        $(top_builddir)/libbase/libgnashbase.la \
-       $(top_builddir)/libamf/libgnashamf.la \
        $(NULL)
 
 # These will get compiled to SWFs just as above, but will not be executed as a 
test

=== modified file 'testsuite/network.all/Makefile.am'
--- a/testsuite/network.all/Makefile.am 2010-01-22 16:18:18 +0000
+++ b/testsuite/network.all/Makefile.am 2010-03-09 20:11:52 +0000
@@ -44,8 +44,6 @@
        -I$(top_srcdir)/libcore/parser  \
        -I$(top_srcdir)/libcore/vm \
        -I$(top_srcdir)/libcore/asobj \
-       -I$(top_srcdir)/libamf \
-       -I$(top_srcdir)/libnet \
        -I$(top_srcdir)/testsuite \
        -I$(top_srcdir)/testsuite/misc-ming.all \
        $(MING_CFLAGS) \
@@ -56,12 +54,10 @@
 
 AM_LDFLAGS = 
        $(top_builddir)/libbase/libgnashbase.la \
-       $(top_builddir)/libamf/libgnashamf.la \
-       $(top_builddir)/libnet/libgnashnet.la \
+       $(MING_LIBS) \
        $(OPENGL_LIBS) \
        $(BOOST_LIBS) \
        $(PTHREAD_LIBS)
-       $(MING_LIBS) \
        $(NULL)
 
 if LIBLTDL2
@@ -134,8 +130,6 @@
 test_ssl_SOURCES = test_ssl.cpp
 test_ssl_LDADD = \
        $(top_builddir)/libbase/libgnashbase.la \
-       $(top_builddir)/libamf/libgnashamf.la \
-       $(top_builddir)/libnet/libgnashnet.la
 test_ssl_DEPENDENCIES = site-update
 endif
 
@@ -143,8 +137,6 @@
 test_ssh_SOURCES = test_ssh.cpp
 test_ssh_LDADD = \
        $(top_builddir)/libbase/libgnashbase.la \
-       $(top_builddir)/libamf/libgnashamf.la \
-       $(top_builddir)/libnet/libgnashnet.la
 test_ssh_DEPENDENCIES = site-update
 endif
 

=== modified file 'testsuite/samples/Makefile.am'
--- a/testsuite/samples/Makefile.am     2010-01-25 03:23:13 +0000
+++ b/testsuite/samples/Makefile.am     2010-03-09 20:11:52 +0000
@@ -49,7 +49,6 @@
        $(top_builddir)/testsuite/libtestsuite.la \
        $(top_builddir)/libcore/libgnashcore.la \
        $(top_builddir)/libbase/libgnashbase.la \
-       $(top_builddir)/libamf/libgnashamf.la \
        $(NULL)
 
 if LIBLTDL2

=== modified file 'utilities/Makefile.am'
--- a/utilities/Makefile.am     2010-03-09 16:37:20 +0000
+++ b/utilities/Makefile.am     2010-03-09 20:11:52 +0000
@@ -25,8 +25,6 @@
 
 GNASH_LIBS = \
        $(top_builddir)/libcore/libgnashcore.la \
-       $(top_builddir)/libamf/libgnashamf.la \
-       $(top_builddir)/libnet/libgnashnet.la \
        $(top_builddir)/libbase/libgnashbase.la \
        $(top_builddir)/libmedia/libgnashmedia.la \
        $(top_builddir)/libsound/libgnashsound.la \
@@ -60,11 +58,8 @@
 
 localedir = $(datadir)/locale
 
-#AM_CPPFLAGS = # -Wall
 AM_CPPFLAGS = \
         -I$(top_srcdir)/libbase \
-        -I$(top_srcdir)/libnet \
-        -I$(top_srcdir)/libamf \
         -I$(top_srcdir)/backend \
         -I$(top_srcdir)/libcore \
         -I$(top_srcdir)/libcore/asobj \
@@ -101,7 +96,25 @@
 endif
 endif
 
-bin_PROGRAMS = gprocessor soldumper flvdumper rtmpget
+bin_PROGRAMS = gprocessor rtmpget
+
+if CYGNAL
+AM_CPPFLAGS += \
+       -I$(top_srcdir)/cygnal/libamf \
+       -I$(top_srcdir)/cygnal/libnet
+bin_PROGRAMS += soldumper flvdumper
+
+soldumper_SOURCES = soldumper.cpp
+soldumper_LDADD = $(GNASH_LIBS) $(AM_LDFLAGS)
+
+flvdumper_SOURCES = flvdumper.cpp
+flvdumper_LDADD = $(GNASH_LIBS) $(AM_LDFLAGS)
+
+GNASH_LIBS += \
+       $(top_builddir)/cygnal/libamf/libgnashamf.la \
+       $(top_builddir)/cygnal/libnet/libgnashnet.la
+endif
+
 #check_PROGRAMS = gdebug.swf
 
 if USE_GST_ENGINE
@@ -123,12 +136,6 @@
 #dumpshm_SOURCES = dumpshm.cpp
 #dumpshm_LDADD = $(GNASH_LIBS) $(AM_LDFLAGS)
 
-soldumper_SOURCES = soldumper.cpp
-soldumper_LDADD = $(GNASH_LIBS) $(AM_LDFLAGS)
-
-flvdumper_SOURCES = flvdumper.cpp
-flvdumper_LDADD = $(GNASH_LIBS) $(AM_LDFLAGS)
-
 if USE_GST_ENGINE
  GST_STUFF = $(GSTPBUTILS_LIBS) $(GSTREAMER_PLUGINS_BASE_LIBS) 
$(GSTREAMER_LIBS) 
  findwebcams_SOURCES = findwebcams.cpp