[cairo-commit] cairo-demo/gameoflife Makefile,1.3,1.4 cgolwin.cpp,1.4,1.5

[Andrew Chant]

Committed by: chant

Update of /cvs/cairo/cairo-demo/gameoflife
In directory pdx:/tmp/cvs-serv14249

Modified Files:
	Makefile cgolwin.cpp 
Log Message:
applied patch from Patrick Griffin to use pkg-config for build.


Index: Makefile
===================================================================
RCS file: /cvs/cairo/cairo-demo/gameoflife/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile	25 Nov 2003 02:06:56 -0000	1.3
--- Makefile	23 Dec 2003 18:38:05 -0000	1.4
***************
*** 1,6 ****
  all: cgol
  
! cgol: cgol.cpp ctk.cpp main.cpp cgolwin.cpp ctk.h cgolwin.h cgol.h
! 	g++ -Wall -o cgol cgol.cpp main.cpp ctk.cpp cgolwin.cpp -L/usr/X11R6/lib -lX11  -I/usr/include/X11/Xft -I/usr/include/freetype2 -lcairo
  
  clean:
--- 1,13 ----
+ 
+ CFLAGS = `pkg-config --cflags cairo`
+ LDFLAGS =`pkg-config --libs cairo`
+ 
+ SOURCES = cgol.cpp ctk.cpp main.cpp cgolwin.cpp 
+ HEADERS = ctk.h cgolwin.h cgol.h
+ 
  all: cgol
  
! cgol: $(HEADERS) $(SOURCES)
! 	g++ -Wall -o cgol $(SOURCES) $(CFLAGS) $(LDFLAGS)
  
  clean:

Index: cgolwin.cpp
===================================================================
RCS file: /cvs/cairo/cairo-demo/gameoflife/cgolwin.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** cgolwin.cpp	25 Nov 2003 07:13:17 -0000	1.4
--- cgolwin.cpp	23 Dec 2003 18:38:05 -0000	1.5
***************
*** 24,28 ****
  
  
! #include <cairo-xlib.h>
  #include <math.h>
  #include <iostream>
--- 24,28 ----
  
  
! #include <cairo.h>
  #include <math.h>
  #include <iostream>