[cairo-commit] cairo/src Makefile.am,1.20,1.21

[Olivier Andrieu]

Committed by: oandrieu

Update of /cvs/cairo/cairo/src
In directory pdx:/tmp/cvs-serv14412/src

Modified Files:
	Makefile.am 
Log Message:
PNG backend support, removed references to X_LIBS and X_CFLAGS.

Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo/src/Makefile.am,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** a/Makefile.am	3 Feb 2004 07:24:14 -0000	1.20
--- b/Makefile.am	24 Feb 2004 20:27:13 -0000	1.21
***************
*** 6,9 ****
--- 6,13 ----
  endif
  
+ if CAIRO_HAS_PNG_SURFACE
+ libcairo_png_sources = cairo_png_surface.c
+ endif
+ 
  if CAIRO_HAS_XLIB_SURFACE
  libcairo_xlib_sources = cairo_xlib_surface.c
***************
*** 19,23 ****
  # term and automake does not care about it)
  FONTCONFIG_LIBS=@FONTCONFIG_LIBS@
- X_LIBS=@X_LIBS@
  XRENDER_LIBS=@XRENDER_LIBS@
  
--- 23,26 ----
***************
*** 44,47 ****
--- 47,51 ----
  	cairo_traps.c		\
  	$(libcairo_ps_sources)  \
+ 	$(libcairo_png_sources) \
  	$(libcairo_xlib_sources)\
  	$(libcairo_xcb_sources) \
***************
*** 50,54 ****
  libcairo_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
  
! INCLUDES = -I$(srcdir) $(CAIRO_CFLAGS) $(FONTCONFIG_CFLAGS) $(XRENDER_CFLAGS) $(X_CFLAGS) $(XCB_CFLAGS)
  
! libcairo_la_LIBADD = $(CAIRO_LIBS) $(FONTCONFIG_LIBS) $(XRENDER_LIBS) $(X_LIBS) $(XCB_LIBS) -lm
--- 54,58 ----
  libcairo_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
  
! INCLUDES = -I$(srcdir) $(CAIRO_CFLAGS) $(FONTCONFIG_CFLAGS) $(XRENDER_CFLAGS) $(XCB_CFLAGS) $(PNG_CFLAGS)
  
! libcairo_la_LIBADD = $(CAIRO_LIBS) $(FONTCONFIG_LIBS) $(XRENDER_LIBS) $(XCB_LIBS) $(PNG_LIBS) -lm