[cairo-commit] rendertest/src Makefile.am,1.4,1.5

[Dave Beckett]

Committed by: dajobe

Update of /cvs/cairo/rendertest/src
In directory gabe:/tmp/cvs-serv9958

Modified Files:
	Makefile.am 
Log Message:
2004-11-11  Dave Beckett  <Dave.Beckett at bristol.ac.uk>

	* src/Makefile.am: automake does not use <program-name>_CFLAGS so
	apply all CFLAGS needed to all programs


Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/rendertest/src/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.am	12 Sep 2004 03:05:47 -0000	1.4
+++ Makefile.am	11 Nov 2004 20:54:44 -0000	1.5
@@ -12,6 +12,11 @@
 	glitz.c \
 	glitz_common.h
 
+# automake does not use <program-name>_CFLAGS
+# so apply all CFLAGS needed to all programs
+INCLUDES = $(GLITZ_GLX_CFLAGS) $(GLITZ_AGL_CFLAGS) $(XCB_CFLAGS) \
+$(PIXMAN_CFLAGS) $(LIBPNG_CFLAGS)
+
 if RENDER_GLITZ_GLX_BACKEND
 glitz_glx_program = rendertest_glitz_glx
 
@@ -19,7 +24,6 @@
 	$(glitz_common_sources) \
 	glitz_glx.c
 
-rendertest_glitz_glx_CFLAGS = $(GLITZ_GLX_CFLAGS) $(LIBPNG_CFLAGS)
 rendertest_glitz_glx_LDADD = $(GLITZ_GLX_LIBS) $(LIBPNG_LIBS) -lm
 endif
 
@@ -30,7 +34,6 @@
 	$(glitz_common_sources) \
 	glitz_agl.c
 
-rendertest_glitz_agl_CFLAGS = $(GLITZ_AGL_CFLAGS) $(LIBPNG_CFLAGS)
 rendertest_glitz_agl_LDADD = $(GLITZ_AGL_LIBS) $(CARBON_LIBS) $(LIBPNG_LIBS) -lm
 endif
 
@@ -41,7 +44,6 @@
 	$(rendertest_common_sources) \
 	xcb.c
 
-rendertest_xcb_CFLAGS = $(XCB_CFLAGS) $(LIBPNG_CFLAGS)
 rendertest_xcb_LDADD = $(XCB_LIBS) $(LIBPNG_LIBS) -lm
 endif
 
@@ -52,7 +54,6 @@
 	$(rendertest_common_sources) \
 	pixman.c
 
-rendertest_pixman_CFLAGS = $(PIXMAN_CFLAGS) $(LIBPNG_CFLAGS)
 rendertest_pixman_LDADD = $(PIXMAN_LIBS) $(LIBPNG_LIBS) -lm
 endif