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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/10/06 09:22:08

Modified files:
        .              : ChangeLog 
        backend        : Makefile.am 

Log message:
        * backend/Makefile.am: don't link against unecessary libs ( unfinished )

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1047&r2=1.1048
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/Makefile.am?cvsroot=gnash&r1=1.34&r2=1.35

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1047
retrieving revision 1.1048
diff -u -b -r1.1047 -r1.1048
--- ChangeLog   6 Oct 2006 07:51:14 -0000       1.1047
+++ ChangeLog   6 Oct 2006 09:22:08 -0000       1.1048
@@ -1,3 +1,8 @@
+2006-10-06 Sandro Santilli <address@hidden>
+
+       * backend/Makefile.am: don't link against unecessary libs
+       ( unfinished )
+
 2006-10-06 Hannes Mayr <address@hidden>
 
        * macros/jpeg.m4: fixed typo.

Index: backend/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/backend/Makefile.am,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- backend/Makefile.am 26 Sep 2006 15:08:06 -0000      1.34
+++ backend/Makefile.am 6 Oct 2006 09:22:08 -0000       1.35
@@ -35,21 +35,15 @@
        $(PNG_LIBS)             \
         $(OGG_LIBS)            \
        $(ZLIB_LIBS)            \
-       $(CURL_LIBS)            \
-        $(LIBXML_LIBS)         \
         $(SDL_LIBS)            \
         $(SDL_MIXER_LIBS)      \
-        $(OPENGL_LIBS)         \
-       $(GLEXT_LIBS)           \
-       $(GTK2_LIBS)            \
        $(PANGO_LIBS)           \
-       $(CAIRO_LIBS)           \
        $(ATK_LIBS)             \
        $(X_LIBS)               \
        $(DMALLOC_LIBS)         \
        $(MP3_LIBS)             \
        $(PTHREAD_LIBS)         \
-       $(GSTREAMER_LIBS)
+       $(NULL)
 
 INCLUDES = -I.. \
         -I$(top_srcdir)        \
@@ -60,20 +54,15 @@
        $(PTHREAD_CFLAGS)       \
         $(SDL_CFLAGS)          \
         $(SDL_MIXER_CFLAGS)    \
-       $(LIBXML_CFLAGS)        \
-       $(OPENGL_CFLAGS)        \
-       $(GLEXT_CFLAGS)         \
-       $(GTK2_CFLAGS)          \
        $(PANGO_CFLAGS)         \
        $(GLIB_CFLAGS)          \
-       $(CAIRO_CFLAGS)         \
        $(ATK_CFLAGS)           \
        $(DMALLOC_CFLAGS)       \
        $(PNG_CFLAGS)           \
        $(JPEG_CFLAGS)          \
        $(MP3_CFLAGS)           \
        $(OGG_CFLAGS)           \
-       $(GSTREAMER_CFLAGS)
+       $(NULL)
 
 noinst_HEADERS = \
        render_handler.h
@@ -85,13 +74,20 @@
 
 if USE_RENDERER_CAIRO
 RENDER_SOURCES = render_handler_cairo.cpp
+AM_LDFLAGS += $(CAIRO_LIBS)
+INCLUDES += $(CAIRO_CFLAGS)
 endif
+
 if USE_RENDERER_OPENGL
 RENDER_SOURCES = render_handler_ogl.cpp
+AM_LDFLAGS += $(OPENGL_LIBS) # $(GLEXT_LIBS)           
+INCLUDES += $(USE_OPENGL_CFLAGS) # $(GLEXT_CFLAGS)     
 endif
 
 if USE_SOUND_GST
 SOUND_SOURCES = sound_handler_gst.cpp 
+AM_LDFLAGS += $(GSTREAMER_LIBS) 
+INCLUDES += $(GSTREAMER_CFLAGS)
 endif
 
 if USE_SOUND_SDL