[Scummvm-cvs-logs] CVS: residual/tools Makefile,1.7,1.8

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/residual/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31371

Modified Files:
	Makefile 
Log Message:
ops

Index: Makefile
===================================================================
RCS file: /cvsroot/scummvm/residual/tools/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile	13 Jan 2005 23:31:10 -0000	1.7
+++ Makefile	14 Jan 2005 08:05:19 -0000	1.8
@@ -1,13 +1,13 @@
 CXX = g++
-CXXFLAGS = -g -O2 -Wall -I../lua -I..
-CFLAGS = -g -O2 -Wall
-LDFLAGS =
+CXXFLAGS = $(CPPFLAGS) -g -O2 -Wall -I../lua -I..
+CFLAGS = $(CPPFLAGS) -g -O2 -Wall
+#LDFLAGS =
 LIBS =
 
 all: bmtoppm delua imc2wav int2flt mat2ppm set2fig unlab vima
 
 bmtoppm: bmtoppm.c
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ bmtoppm.c -lppm
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ bmtoppm.c -lppm -lpbm
 
 mat2ppm: mat2ppm.c
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ mat2ppm.c -lppm
@@ -21,8 +21,11 @@
 	../lua/lstring.o ../lua/lstrlib.o ../lua/ltable.o ../lua/ltask.o \
 	../lua/ltm.o ../lua/lundump.o ../lua/lvm.o ../lua/lzio.o $(LIBS)
 
+unlab: unlab.o util.o
+	$(CC) $(LDFLAGS) -o $@ $+
+
 .c.o:
-	$(CXX) $(CXXFLAGS) -c $<
+	$(CC) $(CXXFLAGS) -c $<
 
 clean:
 	-rm -f *.o bmtoppm delua imc2wav int2flt mat2ppm set2fig unlab vima