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

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  06/10/11 14:44:33

Modified files:
        .              : ChangeLog 
        backend        : Makefile.am 
        gui            : Makefile.am 
        libamf         : Makefile.am 
        libgeometry    : Makefile.am 
        plugin         : Makefile.am 
        plugin/klash   : Makefile.am 
        server         : Makefile.am 
        server/asobj   : Makefile.am 
        server/parser  : Makefile.am 
        utilities      : Makefile.am 

Log message:
        Add $(top_srcdir).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1142&r2=1.1143
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/Makefile.am?cvsroot=gnash&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/Makefile.am?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/Makefile.am?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/Makefile.am?cvsroot=gnash&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/Makefile.am?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Makefile.am?cvsroot=gnash&r1=1.70&r2=1.71
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Makefile.am?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/Makefile.am?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/Makefile.am?cvsroot=gnash&r1=1.28&r2=1.29

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1142
retrieving revision 1.1143
diff -u -b -r1.1142 -r1.1143
--- ChangeLog   11 Oct 2006 14:03:42 -0000      1.1142
+++ ChangeLog   11 Oct 2006 14:44:32 -0000      1.1143
@@ -1,3 +1,11 @@
+2006-10-11 Markus Gothe <address@hidden>
+
+       * backend/Makefile.am, testsuite/Makefile.am, gui/Makefile.am,
+         libamf/Makefile.am, libgeometry/Makefile.am, plugin/Makefile.am,
+         plugin/klash/Makefile.am, server/Makefile.am, utilities/Makefile.am,
+         server/asobj/Makefile.am, server/parser/Makefile.am:
+         Add $(top_srcdir).
+
 2006-10-11 Sandro Santilli <address@hidden>
 
        * server/asobj/Global.cpp (as_global_parseint): fixed invalid

Index: backend/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/backend/Makefile.am,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- backend/Makefile.am 10 Oct 2006 08:45:35 -0000      1.41
+++ backend/Makefile.am 11 Oct 2006 14:44:32 -0000      1.42
@@ -103,8 +103,8 @@
 endif
 
 libgnashbackend_la_LIBADD = \
-       ../libbase/libgnashbase.la \
-       ../server/libgnashserver.la 
+       $(top_srcdir)/libbase/libgnashbase.la \
+       $(top_srcdir)/server/libgnashserver.la 
 
 libgnashbackend_la_SOURCES = \
        $(RENDER_SOURCES) \

Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- gui/Makefile.am     10 Oct 2006 09:28:05 -0000      1.28
+++ gui/Makefile.am     11 Oct 2006 14:44:32 -0000      1.29
@@ -161,8 +161,8 @@
        NullGui.h
 
 libgnashgui_la_LIBADD = \
-       ../server/libgnashserver.la \
-       ../backend/libgnashbackend.la \
+       $(top_srcdir)/server/libgnashserver.la \
+       $(top_srcdir)/backend/libgnashbackend.la \
        $(AM_LDFLAGS)
 
 if USE_GUI_KDE
@@ -173,19 +173,19 @@
 
 GNASH_LIBS = \
         libgnashgui.la \
-       ../libamf/libgnashamf.la \
-       ../backend/libgnashbackend.la \
-       ../server/libgnashserver.la \
-       ../server/asobj/libgnashasobjs.la \
-       ../libgeometry/libgnashgeo.la \
-       ../libbase/libgnashbase.la
+       $(top_srcdir)/libamf/libgnashamf.la \
+       $(top_srcdir)/backend/libgnashbackend.la \
+       $(top_srcdir)/server/libgnashserver.la \
+       $(top_srcdir)/server/asobj/libgnashasobjs.la \
+       $(top_srcdir)/libgeometry/libgnashgeo.la \
+       $(top_srcdir)/libbase/libgnashbase.la
 
 libgnashplayer_la_SOURCES = \
        Player.cpp Player.h
 
 libgnashplayer_la_LIBADD = \
-       ../server/libgnashserver.la \
-       ../backend/libgnashbackend.la \
+       $(top_srcdir)/server/libgnashserver.la \
+       $(top_srcdir)/backend/libgnashbackend.la \
        libgnashgui.la \
        $(AM_LDFLAGS) 
 

Index: libamf/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libamf/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- libamf/Makefile.am  18 Sep 2006 03:27:45 -0000      1.13
+++ libamf/Makefile.am  11 Oct 2006 14:44:32 -0000      1.14
@@ -41,7 +41,7 @@
 AM_CXXFLAGS =  $(CXXFLAGS) $(SDL_CFLAGS) $(INCLUDES)
 AM_CPPFLAGS = 
 AM_LDFLAGS = \
-       ../libbase/libgnashbase.la \
+       $(top_srcdir)/libbase/libgnashbase.la \
         $(OPENGL_LIBS)      \
         $(SDL_LIBS)         \
         $(SDL_MIXER_LIBS)   \

Index: libgeometry/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libgeometry/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- libgeometry/Makefile.am     7 Jul 2006 15:10:15 -0000       1.15
+++ libgeometry/Makefile.am     11 Oct 2006 14:44:32 -0000      1.16
@@ -81,7 +81,7 @@
 
 #libgeometry_la_LDFLAGS = -module -avoid-version -no-undefined
 #libgeometry_la_LIBDADD =  address@hidden@  # $(LIBLTDL)
-libgnashgeo_la_LIBADD = -L../libbase -lgnashbase
+libgnashgeo_la_LIBADD = -L$(top_srcdir)/libbase -lgnashbase
 
 # Rebuild with GCC 4.x Mudflap support
 mudflap:

Index: plugin/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/Makefile.am,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- plugin/Makefile.am  7 Oct 2006 14:20:27 -0000       1.46
+++ plugin/Makefile.am  11 Oct 2006 14:44:32 -0000      1.47
@@ -132,11 +132,11 @@
 #      $(DMALLOC_LIBS) \
 #      $(OGG_LIBS) \
 #      $(DMALLOC_LIBS) \
-#      ../backend/libgnashbackend.la\
-#      ../server/asobj/libgnashasobjs.la \
-#      ../server/libgnashserver.la\
-#      ../libgeometry/libgnashgeo.la\
-#      ../libamf/libgnashamf.la \
+#      $(top_srcdir)/backend/libgnashbackend.la\
+#      $(top_srcdir)/server/asobj/libgnashasobjs.la \
+#      $(top_srcdir)/server/libgnashserver.la\
+#      $(top_srcdir)/libgeometry/libgnashgeo.la\
+#      $(top_srcdir)/libamf/libgnashamf.la \
 #
 
 if PLUGIN_LINK_UNDEFINED

Index: plugin/klash/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- plugin/klash/Makefile.am    27 Aug 2006 09:47:01 -0000      1.13
+++ plugin/klash/Makefile.am    11 Oct 2006 14:44:32 -0000      1.14
@@ -114,12 +114,12 @@
 klash_LDFLAGS = -module -avoid-version -no-undefined #-Wl,-z,defs
 
 klash_LDADD =  $(AM_LDFLAGS) \
-       ../../backend/libgnashbackend.la \
-       ../../server/libgnashserver.la \
-       ../../server/asobj/libgnashasobjs.la \
-       ../../libgeometry/libgnashgeo.la \
-       ../../libbase/libgnashbase.la \
-       ../../libamf/libgnashamf.la \
+       $(top_srcdir)/backend/libgnashbackend.la \
+       $(top_srcdir)/server/libgnashserver.la \
+       $(top_srcdir)/server/asobj/libgnashasobjs.la \
+       $(top_srcdir)/libgeometry/libgnashgeo.la \
+       $(top_srcdir)/libbase/libgnashbase.la \
+       $(top_srcdir)/libamf/libgnashamf.la \
        $(LIB_QT)
 
 

Index: server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/Makefile.am,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- server/Makefile.am  11 Oct 2006 08:08:36 -0000      1.70
+++ server/Makefile.am  11 Oct 2006 14:44:33 -0000      1.71
@@ -170,9 +170,9 @@
        fn_call.h
 
 libgnashserver_la_LIBADD = \
-       ../libbase/libgnashbase.la \
-       asobj/libgnashasobjs.la \
-       parser/libgnashparser.la \
+       $(top_srcdir)/libbase/libgnashbase.la \
+       $(top_srcdir)/server/asobj/libgnashasobjs.la \
+       $(top_srcdir)/server/parser/libgnashparser.la \
        $(ZLIB_LIBS) \
        $(LIBXML_LIBS) \
        $(OPENGL_LIBS)

Index: server/asobj/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/asobj/Makefile.am    30 Aug 2006 09:11:09 -0000      1.6
+++ server/asobj/Makefile.am    11 Oct 2006 14:44:33 -0000      1.7
@@ -122,8 +122,8 @@
        Video.h
 
 libgnashasobjs_la_LIBADD = \
-       ../../libamf/libgnashamf.la \
-       ../../libbase/libgnashbase.la
+       $(top_srcdir)/libamf/libgnashamf.la \
+       $(top_srcdir)/libbase/libgnashbase.la
 
 # Rebuild with GCC 4.x Mudflap support
 mudflap:

Index: server/parser/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/parser/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/parser/Makefile.am   26 Sep 2006 15:08:06 -0000      1.6
+++ server/parser/Makefile.am   11 Oct 2006 14:44:33 -0000      1.7
@@ -97,7 +97,7 @@
        sprite_definition.h 
 
 libgnashparser_la_LIBADD = \
-       ../../libbase/libgnashbase.la 
+       $(top_srcdir)/libbase/libgnashbase.la 
 
 # Rebuild with GCC 4.x Mudflap support
 mudflap:

Index: utilities/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/utilities/Makefile.am,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- utilities/Makefile.am       9 Oct 2006 23:03:42 -0000       1.28
+++ utilities/Makefile.am       11 Oct 2006 14:44:33 -0000      1.29
@@ -24,12 +24,12 @@
 #    on the gnash libraries side instead ?
 
 GNASH_LIBS = \
-       ../backend/libgnashbackend.la \
-       ../server/libgnashserver.la \
-       ../server/asobj/libgnashasobjs.la \
-       ../libgeometry/libgnashgeo.la \
-       ../libbase/libgnashbase.la \
-       ../libamf/libgnashamf.la 
+       $(top_srcdir)/backend/libgnashbackend.la \
+       $(top_srcdir)/server/libgnashserver.la \
+       $(top_srcdir)/server/asobj/libgnashasobjs.la \
+       $(top_srcdir)/libgeometry/libgnashgeo.la \
+       $(top_srcdir)/libbase/libgnashbase.la \
+       $(top_srcdir)/libamf/libgnashamf.la 
 
 AM_CPPFLAGS = # -Wall