[Gnash-commit] gnash/utilities Makefile.am dumpshm.cpp process...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    08/01/21 23:29:46

Modified files:
        utilities      : Makefile.am dumpshm.cpp processor.cpp 
                         soldumper.cpp 

Log message:
        arg...

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/Makefile.am?cvsroot=gnash&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/dumpshm.cpp?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/processor.cpp?cvsroot=gnash&r1=1.80&r2=1.81
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/soldumper.cpp?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/utilities/Makefile.am,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- Makefile.am 20 Dec 2007 02:01:38 -0000      1.61
+++ Makefile.am 21 Jan 2008 23:29:46 -0000      1.62
@@ -1,5 +1,5 @@
 # 
-#   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+#   Copyright (C) 2005, 2006, 2007, 2008 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,9 +25,9 @@
 
 GNASH_LIBS = \
        $(top_builddir)/server/libgnashserver.la \
+       $(top_builddir)/libamf/libgnashamf.la \
        $(top_builddir)/libbase/libgnashbase.la \
-       $(top_builddir)/libmedia/libgnashmedia.la \
-       $(top_builddir)/libamf/libgnashamf.la
+       $(top_builddir)/libmedia/libgnashmedia.la
 
 ## WARNING: make sure GLIB_LIBS appears first
 ## See: http://lists.gnu.org/archive/html/gnash-dev/2006-07/msg00076.html
@@ -51,6 +51,7 @@
         -I$(top_srcdir)/libbase \
         -I$(top_srcdir)/libamf \
         -I$(top_srcdir)/server \
+        -I$(top_srcdir)/server/asobj \
         -I$(top_srcdir)/server/parser \
         -I$(top_srcdir)/server/vm \
         -I$(top_srcdir)/libmedia \
@@ -76,8 +77,7 @@
  GNASH_LIBS += $(GLIB_LIBS) $(GSTREAMER_LIBS)
 #endif
 
-bin_PROGRAMS = gprocessor soldumper
-noinst_PROGRAMS = dumpshm
+bin_PROGRAMS = gprocessor soldumper dumpshm
 #check_PROGRAMS = gdebug.swf
 
 gprocessor_SOURCES = processor.cpp

Index: dumpshm.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/dumpshm.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- dumpshm.cpp 31 Dec 2007 03:53:35 -0000      1.19
+++ dumpshm.cpp 21 Jan 2008 23:29:46 -0000      1.20
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007, 2008 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
@@ -16,7 +16,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "gnashconfig.h"
 #endif
 
 #include <stdarg.h>

Index: processor.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/processor.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- processor.cpp       10 Jan 2008 17:34:46 -0000      1.80
+++ processor.cpp       21 Jan 2008 23:29:46 -0000      1.81
@@ -1,6 +1,6 @@
 // processor.cpp:  Flash movie processor (gprocessor command), for Gnash.
 // 
-//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007, 2008 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
@@ -16,10 +16,10 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: processor.cpp,v 1.80 2008/01/10 17:34:46 strk Exp $ */
+/* $Id: processor.cpp,v 1.81 2008/01/21 23:29:46 rsavoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "gnashconfig.h"
 #endif
 
 #include <iostream>

Index: soldumper.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/soldumper.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- soldumper.cpp       15 Jan 2008 14:58:15 -0000      1.3
+++ soldumper.cpp       21 Jan 2008 23:29:46 -0000      1.4
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007, 2008 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
@@ -16,7 +16,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "gnashconfig.h"
 #endif
 
 #include <dirent.h>