[Gnash-commit] gnash gui/Makefile.am plugin/Makefile.am

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    06/11/04 00:55:53

Modified files:
        gui            : Makefile.am 
        plugin         : Makefile.am 

Log message:
        Need Cairo CFLAGS to build any GTK program, even with AGG.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/Makefile.am?cvsroot=gnash&r1=1.51&r2=1.52

Patches:
Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- gui/Makefile.am     29 Oct 2006 18:34:10 -0000      1.40
+++ gui/Makefile.am     4 Nov 2006 00:55:53 -0000       1.41
@@ -17,7 +17,7 @@
 
 # 
 
-# $Id: Makefile.am,v 1.40 2006/10/29 18:34:10 rsavoye Exp $
+# $Id: Makefile.am,v 1.41 2006/11/04 00:55:53 rsavoye Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -32,6 +32,7 @@
         $(SDL_CFLAGS) \
         $(PANGO_CFLAGS) \
         $(GLIB_CFLAGS) \
+        $(CAIRO_CFLAGS) \
         $(ATK_CFLAGS) \
         $(DMALLOC_CFLAGS) \
         $(PNG_CFLAGS) \
@@ -74,7 +75,6 @@
 endif # ! USE_RENDERER_OPENGL
 
 if USE_RENDERER_CAIRO
- INCLUDES += $(CAIRO_CFLAGS) 
  AM_LDFLAGS += $(CAIRO_LIBS) 
  GTK_CAIRO_SRCS = gtk_glue_cairo.cpp gtk_glue_cairo.h
  KDE_CAIRO_SRCS = #kde_glue_cairo.cpp kde_glue_cairo.h
@@ -96,6 +96,7 @@
 endif
 
 if USE_GUI_GTK
+  AM_LDFLAGS += $(CAIRO_LIBS)
  GTK_SRCS = gtk.cpp gtksup.h gtk_glue.h $(GTK_CAIRO_SRCS) $(GTK_OPENGL_SRCS) 
$(GTK_AGG_SRCS) 
  AM_LDFLAGS += $(GTK2_LIBS) 
  INCLUDES += $(GTK2_CFLAGS)

Index: plugin/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/Makefile.am,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- plugin/Makefile.am  29 Oct 2006 18:34:16 -0000      1.51
+++ plugin/Makefile.am  4 Nov 2006 00:55:53 -0000       1.52
@@ -15,15 +15,12 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# 
-#
-
-# $Id: Makefile.am,v 1.51 2006/10/29 18:34:16 rsavoye Exp $
+# $Id: Makefile.am,v 1.52 2006/11/04 00:55:53 rsavoye Exp $
 
 AUTOMAKE_OPTIONS = 
 
 if KLASH
-KLASH = klash
+
 endif
 SUBDIRS = $(KLASH) # test mozilla-sdk
 
@@ -36,23 +33,18 @@
 
 INCLUDES = -I.. \
         -I$(srcdir) \
+        -I$(top_srcdir)/server \
+        -I$(top_srcdir)/server/parser \
         -I$(top_srcdir)/libbase \
         -I$(top_srcdir)/backend \
-        -I$(top_srcdir)/libgeometry \
-        -I$(top_srcdir)/server \
        -I$(srcdir)/mozilla-sdk \
        -I$(srcdir)/mozilla-sdk/include \
-       $(LIBXML_CFLAGS) \
-       $(GLEXT_CFLAGS) \
        $(GTK2_CFLAGS) \
-       $(PANGO_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(CAIRO_CFLAGS) \
        $(ATK_CFLAGS) \
-       $(SDL_CFLAGS) \
-       $(X_CFLAGS) \
-       $(DMALLOC_CFLAGS) \
-       $(OGG_CFLAGS)
+        $(PANGO_CFLAGS) \
+       $(NULL)
 
 
 AM_CXXFLAGS = $(INCLUDES)
@@ -95,33 +87,6 @@
 libgnashplugin_la_LIBADD   = \
        $(NULL)
 
-#      -lXi -lX11
-#      -lXmu
-#      $(X_LIBS)\
-#      $(X_EXTRA_LIBS)
-#
-#      $(GLIB_LIBS) \
-#      $(X_LIBS) \
-#      $(SDL_LIBS) \
-#      $(OPENGL_LIBS) \
-#      $(GLEXT_LIBS) \
-#      $(GTK2_LIBS) \
-#      $(PANGO_LIBS) \
-#      $(CAIRO_LIBS) \
-#      $(ATK_LIBS) \
-#      $(LIBXML_LIBS) \
-#      $(JPEG_LIBS) \
-#      $(PNG_LIBS) \
-#      $(DMALLOC_LIBS) \
-#      $(OGG_LIBS) \
-#      $(DMALLOC_LIBS) \
-#      $(top_builddir)/backend/libgnashbackend.la\
-#      $(top_builddir)/server/asobj/libgnashasobjs.la \
-#      $(top_builddir)/server/libgnashserver.la\
-#      $(top_builddir)/libgeometry/libgnashgeo.la\
-#      $(top_builddir)/libamf/libgnashamf.la \
-#
-
 if PLUGIN_LINK_UNDEFINED
 libgnashplugin_la_LDFLAGS = -avoid-version -L$(plugindir)
 else