[xiph-commits] r16015 - in trunk/planarity: . po
xiphmont at svn.xiph.org
xiphmont at svn.xiph.org
Tue May 19 15:11:08 PDT 2009
Author: xiphmont
Date: 2009-05-19 15:11:08 -0700 (Tue, 19 May 2009)
New Revision: 16015
Modified:
trunk/planarity/Makefile
trunk/planarity/graph.c
trunk/planarity/po/cs.po
trunk/planarity/po/gPlanarity.pot
trunk/planarity/version.h
Log:
Update Makefile, eliminate static targets.
Eliminate prototype warning involving getline
Modified: trunk/planarity/Makefile
===================================================================
--- trunk/planarity/Makefile 2009-05-19 21:55:01 UTC (rev 16014)
+++ trunk/planarity/Makefile 2009-05-19 22:11:08 UTC (rev 16015)
@@ -28,11 +28,6 @@
SUBDIRS += po
endif
-
-# the very long LIBS entry is to build an executable that will
-# work for on most modern linux distros without any of the
-# bleeding-edge GTK 2.7/2.8 libs installed.
-
SRC = dialog_finish.c gameboard_logic.c dialog_pause.c gameboard_logic_button.c\
gameboard.c gameboard_logic_buttonbar.c gameboard_draw_box.c\
gameboard_logic_mouse.c gameboard_draw_button.c gameboard_logic_push.c\
@@ -55,30 +50,9 @@
gameboard_logic_fade.o graph_generate_mesh2.o graph_region.o
CAIROVER = >= 1.0.0
GTKVER = >= 2.7.2
-GCF = `pkg-config --static --cflags "gtk+-2.0 $(GTKVER) cairo $(CAIROVER) freetype2"`
-LDF = `pkg-config --static --libs "gtk+-2.0 $(GTKVER) cairo $(CAIROVER) freetype2"`
+GCF = `pkg-config --cflags "gtk+-2.0 $(GTKVER) cairo $(CAIROVER) freetype2"`
+LDF = `pkg-config --libs "gtk+-2.0 $(GTKVER) cairo $(CAIROVER) freetype2"`
-# a build with static Gtk 2.7+ generally requires that all of the Gtk
-# dependencies were built with static dependencies also pointing to
-# the local install
-
-SLDF = `pkg-config --static --libs-only-L "gtk+-2.0 $(GTKVER) cairo $(CAIROVER) freetype2"`
-GTK = /usr/local/lib
-EXPAT= /usr/lib/libexpat.a
-XINERAMA = /usr/X11R6/lib/libXinerama.a
-PNG = /usr/lib/libpng.a
-PIXMAN = /usr/lib/libpixman.a
-SLIBS = $(GTK)/libgtk-x11-2.0.a \
- $(GTK)/libgdk-x11-2.0.a $(GTK)/libgdk_pixbuf-2.0.a \
- $(GTK)/libpangocairo-1.0.a $(GTK)/libpangoft2-1.0.a \
- $(GTK)/libpangox-1.0.a $(GTK)/libpangoxft-1.0.a \
- $(GTK)/libpango-1.0.a $(GTK)/libcairo.a \
- $(GTK)/libatk-1.0.a $(GTK)/libgmodule-2.0.a \
- $(GTK)/libgobject-2.0.a $(GTK)/libglib-2.0.a \
- -lpthread $(EXPAT) -lfreetype -lz -lm -lc \
- -lXext -lXrandr $(XINERAMA) -lXcursor -lX11 $(PIXMAN)\
- -lXft $(PNG)
-
all: all-local all-recursive
all-local:
@@ -88,10 +62,6 @@
all-recursive:
for D in $(SUBDIRS); do make -C $$D || exit 1; done
-static:
- pkg-config --cflags "gtk+-2.0 $(GTKVER) cairo $(CAIROVER) freetype2" 1>/dev/null
- $(MAKE) static-target CFLAGS='-O2 -ffast-math $(GCF) $(ADD_DEF)'
-
debug:
pkg-config --cflags "gtk+-2.0 $(GTKVER) cairo $(CAIROVER) freetype2" 1>/dev/null
$(MAKE) target CFLAGS='-g -Wall -W -Wno-unused-parameter -D__NO_MATH_INLINES $(GCF) $(ADD_DEF)'
@@ -119,18 +89,10 @@
include $(SRC:.c=.d)
endif
-ifeq ($(MAKECMDGOALS),static-target)
-include $(SRC:.c=.d)
-endif
-
target: $(OBJ)
./touch-version
$(LD) $(OBJ) $(CFLAGS) -o $(TARGET) $(LIBS) $(LDF)
-static-target: $(OBJ)
- ./touch-version
- $(LD) $(OBJ) $(CFLAGS) -o $(TARGET) $(SLIBS) $(SLDF)
-
install: install-local install-recursive
install-local: target
Modified: trunk/planarity/graph.c
===================================================================
--- trunk/planarity/graph.c 2009-05-19 21:55:01 UTC (rev 16014)
+++ trunk/planarity/graph.c 2009-05-19 22:11:08 UTC (rev 16015)
@@ -867,7 +867,7 @@
int graph_read(graph *g,FILE *f){
char *line=NULL,c;
int i,x,y,ox,oy,sel,A,B;
- unsigned int n=0;
+ size_t n=0;
vertex **flat,*v;
long l;
Modified: trunk/planarity/po/cs.po
===================================================================
--- trunk/planarity/po/cs.po 2009-05-19 21:55:01 UTC (rev 16014)
+++ trunk/planarity/po/cs.po 2009-05-19 22:11:08 UTC (rev 16015)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: gPlanarity 11496\n"
"Report-Msgid-Bugs-To: Monty <monty at xiph.org>\n"
-"POT-Creation-Date: 2009-05-14 17:11-0400\n"
+"POT-Creation-Date: 2009-05-19 17:05-0400\n"
"PO-Revision-Date: 2007-05-15 17:58+0200\n"
"Last-Translator: Petr Pisar <petr.pisar at atlas.cz>\n"
"Language-Team: Czech <translation-team-cs at lists.sourceforge.net>\n"
Modified: trunk/planarity/po/gPlanarity.pot
===================================================================
--- trunk/planarity/po/gPlanarity.pot 2009-05-19 21:55:01 UTC (rev 16014)
+++ trunk/planarity/po/gPlanarity.pot 2009-05-19 22:11:08 UTC (rev 16015)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Monty <monty at xiph.org>\n"
-"POT-Creation-Date: 2009-05-14 17:11-0400\n"
+"POT-Creation-Date: 2009-05-19 17:05-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
Modified: trunk/planarity/version.h
===================================================================
--- trunk/planarity/version.h 2009-05-19 21:55:01 UTC (rev 16014)
+++ trunk/planarity/version.h 2009-05-19 22:11:08 UTC (rev 16015)
@@ -1,2 +1,2 @@
#define VERSION "$Id$ "
-/* DO NOT EDIT: Automated versioning hack [Tue May 19 21:57:10 Local time zone must be set--see zic manual page 2009] */
+/* DO NOT EDIT: Automated versioning hack [Tue May 19 17:05:29 EDT 2009] */
More information about the commits
mailing list