[Gnash-commit] gnash ChangeLog Makefile.am backend/Makefile.am

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/07/11 00:22:58

Modified files:
        .              : ChangeLog Makefile.am 
        backend        : Makefile.am 

Log message:
        Oops, did completely miss that we still need the backend dir.
        Fixed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.487&r2=1.488
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/Makefile.am?cvsroot=gnash&r1=1.23&r2=1.24

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.487
retrieving revision 1.488
diff -u -b -r1.487 -r1.488
--- ChangeLog   10 Jul 2006 22:51:07 -0000      1.487
+++ ChangeLog   11 Jul 2006 00:22:58 -0000      1.488
@@ -1,6 +1,8 @@
 2006-07-10 Sandro Santilli <address@hidden>
 
-       * Makefile.am: replaced backend/ with gui/
+       * backend/Makefile.am: commented out 'gnash' build
+       (there will be a 'gnash' program built under gui/)
+       * Makefile.am: added gui/ subdir
        * server/edit_text_character.cpp: fixed tu_string => std::string
        attempt bug.
        * testsuite/actionscript.all/swf_exists.exp:

Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- Makefile.am 10 Jul 2006 23:01:34 -0000      1.26
+++ Makefile.am 11 Jul 2006 00:22:58 -0000      1.27
@@ -37,7 +37,7 @@
 AUTOMAKE_OPTIONS = dejagnu 1.6.0
 ACLOCAL_AMFLAGS = -I macros
 
-STD_DIRS = libbase libgeometry server gui utilities # backend
+STD_DIRS = libbase libgeometry server backend utilities gui
 
 if PLUGIN
 PLUGIN_DIRS = plugin

Index: backend/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/backend/Makefile.am,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- backend/Makefile.am 7 Jun 2006 03:03:22 -0000       1.23
+++ backend/Makefile.am 11 Jul 2006 00:22:58 -0000      1.24
@@ -71,7 +71,7 @@
        $(MP3_CFLAGS)           \
        $(OGG_CFLAGS)
 
-bin_PROGRAMS = gnash
+# bin_PROGRAMS = gnash
 
 #noinst_LTLIBRARIES = libgbackend.la
 lib_LTLIBRARIES = libgnashbackend.la
@@ -88,14 +88,14 @@
        sound_handler_sdl.cpp \
        gtksup.cpp gtksup.h
 
-gnash_SOURCES = gnash.cpp
-gnash_LDFLAGS = -module -avoid-version -no-undefined #-Wl,-z,defs
-gnash_LDADD =  $(AM_LDFLAGS) \
-       libgnashbackend.la \
-       ../server/libgnashserver.la \
-       ../server/libgnashasobjs.la \
-       ../libgeometry/libgnashgeo.la \
-        ../libbase/libgnashbase.la
+# gnash_SOURCES = gnash.cpp
+# gnash_LDFLAGS = -module -avoid-version -no-undefined #-Wl,-z,defs
+# gnash_LDADD =  $(AM_LDFLAGS) \
+#      libgnashbackend.la \
+#      ../server/libgnashserver.la \
+#      ../server/libgnashasobjs.la \
+#      ../libgeometry/libgnashgeo.la \
+#       ../libbase/libgnashbase.la
 
 MUDFLAP_OPT = -fmudflap
 MUDFLAP_LIB =  /usr/local/lib/libmudflap.so