[cairo-commit] pycairo/cairo Makefile.am,1.15,1.16

[Steve Chaplin]

Committed by: stevech1097

Update of /cvs/cairo/pycairo/cairo
In directory gabe:/tmp/cvs-serv29856/cairo

Modified Files:
	Makefile.am 
Log Message:
SC

Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/pycairo/cairo/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile.am	17 May 2005 02:44:20 -0000	1.15
+++ Makefile.am	26 May 2005 08:26:21 -0000	1.16
@@ -1,6 +1,4 @@
 
-AM_CPPFLAGS = $(PYTHON_INCLUDES) $(CAIRO_CFLAGS) $(CAIRO_GTK_CFLAGS)
-
 pycairodir = $(pythondir)/cairo
 pycairoexecdir = $(pyexecdir)/cairo
 
@@ -10,9 +8,9 @@
 nodist_pycairo_PYTHON = __init__.py
 
 pycairoexec_LTLIBRARIES = _cairo.la
-
 _cairo_la_LDFLAGS = -module -avoid-version -export-symbols-regex init_cairo
 _cairo_la_LIBADD = $(CAIRO_LIBS)
+_cairo_la_CPPFLAGS = $(PYTHON_INCLUDES) $(CAIRO_CFLAGS)
 _cairo_la_SOURCES = \
   pycairo.h \
   pycairo-private.h \
@@ -24,20 +22,22 @@
   pycairo-surface.c \
   cairomodule.c
 
-if WITH_PYGTK
-pycairoexec_LTLIBRARIES += gtk.la
-endif
-gtk_la_LDFLAGS = -module -avoid-version -export-symbols-regex initgtk
-gtk_la_LIBADD = $(CAIRO_LIBS) $(CAIRO_GTK_LIBS)
-gtk_la_SOURCES = \
-  cairogtkmodule.c
-
 if HAVE_LIBSVG_CAIRO
 pycairoexec_LTLIBRARIES += svg.la
 svg_la_LDFLAGS = -module -avoid-version -export-symbols-regex initsvg
 svg_la_LIBADD  = $(CAIRO_LIBS) $(LIBSVG_CAIRO_LIBS)
+svg_la_CPPFLAGS = $(PYTHON_INCLUDES) $(CAIRO_CFLAGS)
 svg_la_SOURCES = \
   pycairosvg.h \
   pycairosvg-private.h \
   cairosvgmodule.c
 endif
+
+if WITH_PYGTK
+pycairoexec_LTLIBRARIES += gtk.la
+gtk_la_LDFLAGS = -module -avoid-version -export-symbols-regex initgtk
+gtk_la_LIBADD = $(CAIRO_LIBS) $(CAIRO_GTK_LIBS)
+gtk_la_CPPFLAGS = $(PYTHON_INCLUDES) $(CAIRO_CFLAGS) $(CAIRO_GTK_CFLAGS)
+gtk_la_SOURCES = \
+  cairogtkmodule.c
+endif