changeset 168:f3eccc24bdb2

merge 73c4e93d331c and 69e32729cd06
author Thinker K.F. Li <thinker@branda.to>
date Fri, 31 Oct 2008 00:08:40 +0800
parents 73c4e93d331c (diff) 69e32729cd06 (current diff)
children f3366433eee5
files
diffstat 1 files changed, 9 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/examples/tank/Makefile	Fri Oct 24 13:18:39 2008 +0800
+++ b/examples/tank/Makefile	Fri Oct 31 00:08:40 2008 +0800
@@ -4,14 +4,17 @@
 SVGCS =	$(SVGS:C/\.svg/.c/)
 SVGOS = $(SVGS:C/\.svg/.o/)
 MBS =	$(SVGS:C/\.svg/.mb/)
-SVG2CODE=	../../tools/svg2code.py
-MB_C_HEADER=    ../../tools/mb_c_header.m4
-MB_C_SOURCE=    ../../tools/mb_c_source.m4
+SVG2CODE=	svg2code.py
+MB_C_HEADER=    mb_c_header.m4
+MB_C_SOURCE=    mb_c_source.m4
 M4 =	m4
-M4FLAGS ?=	-I /usr/local/share/mb 
+M4MACRODIR?=	/usr/local/share/mb
+M4FLAGS ?=	-I $(M4MACRODIR)
 LDFLAGS +=	
-LIBS +=		-lmbfly -lX11 -L/usr/local/lib `pkg-config --libs cairo` -L../../src
-CFLAGS +=	-I/usr/local/include `pkg-config --cflags cairo` -I../../src
+INCDIR?=	/usr/local/include
+LIBDIR?=	/usr/local/lib
+LIBS +=		-lmbfly -lX11 -L$(LIBDIR) `pkg-config --libs cairo` -L../../src
+CFLAGS +=	-I$(INCDIR) `pkg-config --cflags cairo` -I../../src
 BIN = tank
 
 all:	tank