[cairo-commit] cairo-demo/cairo_snippets ChangeLog, 1.21, 1.22 Makefile, 1.12, 1.13

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo-demo/cairo_snippets
In directory gabe:/tmp/cvs-serv17930

Modified Files:
	ChangeLog Makefile 
Log Message:

        * Makefile (CFLAGS): Actually use the settings of CFLAGS when
        compiling.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo-demo/cairo_snippets/ChangeLog,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- ChangeLog	11 Jan 2005 22:38:03 -0000	1.21
+++ ChangeLog	20 Jan 2005 16:34:24 -0000	1.22
@@ -1,3 +1,8 @@
+2005-01-20  Carl Worth  <cworth at cworth.org>
+
+	* Makefile (CFLAGS): Actually use the settings of CFLAGS when
+	compiling.
+
 2005-01-11  Øyvind Kolås  <pippin at freedesktop.org>
 
 	* prepare_snippets.c

Index: Makefile
===================================================================
RCS file: /cvs/cairo/cairo-demo/cairo_snippets/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Makefile	11 Jan 2005 22:38:03 -0000	1.12
+++ Makefile	20 Jan 2005 16:34:24 -0000	1.13
@@ -11,7 +11,7 @@
 CFLAGS += `pkg-config --cflags gtkcairo`
 LIBS   += `pkg-config --libs gtkcairo`
 
-CFLAGS += -g -Wall -O2
+CFLAGS += -g -Wall
 
 OBJS = png_io.o snippets.o
 
@@ -29,19 +29,19 @@
 		  *.png *.eps *.o *~
 
 cairo_snippets_html: cairo_snippets_html.o $(OBJS)
-	$(CC) $< $(OBJS) -o $@ $(LIBS)
+	$(CC) $(CFLAGS) $< $(OBJS) -o $@ $(LIBS)
 
 cairo_snippets_ps: cairo_snippets_ps.o $(OBJS)
-	$(CC) $< $(OBJS) -o $@ $(LIBS)
+	$(CC) $(CFLAGS) $< $(OBJS) -o $@ $(LIBS)
 
 cairo_snippets_pdf: cairo_snippets_pdf.o $(OBJS)
-	$(CC) $< $(OBJS) -o $@ $(LIBS)
+	$(CC) $(CFLAGS) $< $(OBJS) -o $@ $(LIBS)
 
 cairo_snippets_png: cairo_snippets_png.o $(OBJS)
-	$(CC) $< $(OBJS) -o $@ $(LIBS)
+	$(CC) $(CFLAGS) $< $(OBJS) -o $@ $(LIBS)
 
 cairo_snippets_gtk: cairo_snippets_gtk.o $(OBJS)
-	$(CC) $< $(OBJS) -o $@ $(LIBS)
+	$(CC) $(CFLAGS) $< $(OBJS) -o $@ $(LIBS)
 
 snippets.ps: cairo_snippets_ps
 	./cairo_snippets_ps