[xiph-commits] r10167 - trunk/planarity

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2005-10-16 17:29:05 -0700 (Sun, 16 Oct 2005)
New Revision: 10167

Modified:
   trunk/planarity/Makefile
   trunk/planarity/main.c
   trunk/planarity/version.h
Log:
Makefile fix for systems with non-bash sh
Correct location of a cairo header include


Modified: trunk/planarity/Makefile
===================================================================
--- trunk/planarity/Makefile	2005-10-17 00:26:34 UTC (rev 10166)
+++ trunk/planarity/Makefile	2005-10-17 00:29:05 UTC (rev 10167)
@@ -64,21 +64,21 @@
 
 all:    
 	pkg-config --cflags "gtk+-2.0 $(GTKVER) cairo $(CAIROVER)" 1>/dev/null
-	$(MAKE) target CFLAGS="-O2 -ffast-math $(GCF) $(ADD_DEF)"
+	$(MAKE) target CFLAGS='-O2 -ffast-math $(GCF) $(ADD_DEF)'
 	$(STRIP) $(TARGET)
 
 static:    
 	pkg-config --cflags "gtk+-2.0 $(GTKVER) cairo $(CAIROVER)" 1>/dev/null
-	$(MAKE) static-target CFLAGS="-O2 -ffast-math $(GCF) $(ADD_DEF) "	
+	$(MAKE) static-target CFLAGS='-O2 -ffast-math $(GCF) $(ADD_DEF)'	
 	$(STRIP) $(TARGET)
 
 debug:
 	pkg-config --cflags "gtk+-2.0 $(GTKVER) cairo $(CAIROVER)" 1>/dev/null
-	$(MAKE) target CFLAGS="-g -Wall -W -Wno-unused-parameter -D__NO_MATH_INLINES $(GCF) $(ADD_DEF)"
+	$(MAKE) target CFLAGS='-g -Wall -W -Wno-unused-parameter -D__NO_MATH_INLINES $(GCF) $(ADD_DEF)'
 
 profile:
 	pkg-config --cflags "gtk+-2.0 $(GTKVER) cairo $(CAIROVER)" 1>/dev/null
-	$(MAKE) target CFLAGS="-pg -g -O2 -ffast-math $(GCF) $(ADD_DEF)" LIBS="$(LIBS) -lgprof-helper "
+	$(MAKE) target CFLAGS='-pg -g -O2 -ffast-math $(GCF) $(ADD_DEF)" LIBS="$(LIBS) -lgprof-helper'
 
 clean:
 	rm -f $(OBJ) *.d *.d.* gmon.out $(TARGET)

Modified: trunk/planarity/main.c
===================================================================
--- trunk/planarity/main.c	2005-10-17 00:26:34 UTC (rev 10166)
+++ trunk/planarity/main.c	2005-10-17 00:29:05 UTC (rev 10167)
@@ -34,7 +34,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <gtk/gtk.h>
-#include <cairo/cairo-ft.h>
+#include <cairo-ft.h>
 #include <fontconfig/fontconfig.h>
 #include "version.h"
 #include "graph.h"

Modified: trunk/planarity/version.h
===================================================================
--- trunk/planarity/version.h	2005-10-17 00:26:34 UTC (rev 10166)
+++ trunk/planarity/version.h	2005-10-17 00:29:05 UTC (rev 10167)
@@ -1,2 +1,2 @@
 #define VERSION "$Id$ "
-/* DO NOT EDIT: Automated versioning hack [Sun Oct 16 18:35:50 EDT 2005] */
+/* DO NOT EDIT: Automated versioning hack [Sun Oct 16 20:28:38 EDT 2005] */