X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=Makefile;h=e31ae2e35a550d1f3b067af317b9adb16ed3c9ec;hb=09dde8c2b752ea64d012778ad795b7e70cd9fada;hp=4685b57485687b39690ab03773bd5194a023786c;hpb=9e6fef55f1ee2245ed5f86b576ad8990d1b27da0;p=zpackage

diff --git a/Makefile b/Makefile
index 4685b57..e31ae2e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-CFLAGS=-Wall -std=c99 -Ilib -Ielf -I. -Ilzma/api
+CFLAGS=-Wall -W -Wextra -Werror -std=c99 -Ilib -Ielf -I. -Ilzma/api
 
 LZMAFLAGS=-Ilzma/api -Ilzma/tuklib -Ilzma/lzma -Ilzma/common -Ilzma/check -Ilzma/lz -Ilzma/rangecoder -Ilzma/simple -Ilzma/delta -DHAVE_CHECK_CRC64 -DHAVE_CHECK_CRC32 -DHAVE_ENCODER_LZMA2 -DHAVE_DECODER_LZMA2 -DHAVE_MF_BT4
 
@@ -10,7 +10,9 @@ LZMAOBJ=$(filter-out lzma/common/stream_encoder_mt.o, $(LZMASRC:%.c=%.o))
 
 curdir=$(shell pwd)
 
-ZPKGBIN=zpm-addfile zpm-extract zpm-init zpm-vercmp zpm-stat zpm-hash
+ZPKGBIN=zpm-addfile zpm-extract zpm-init zpm-vercmp zpm-stat zpm-hash \
+	zpm-findpkg
+
 def: programs
 d:
 	printf '%s\n' $(LZMAOBJ)
@@ -28,7 +30,8 @@ stest: $(ZPKGBIN)
 test: $(ZPKGBIN)
 	PATH=$(curdir)/t:$(curdir):$(PATH) prove -e '' t/*.t
 
-programs: elftype soname zpm-soneed zpm-addfile zpm-extract zpm-init zpm-vercmp
+programs: elftype soname zpm-soneed zpm-addfile zpm-extract zpm-init \
+	zpm-vercmp zpm-findpkg
 
 uncompress: uncompress.o 
 	$(CC) $(CFLAGS) -o $@ $+ -llzma
@@ -54,24 +57,28 @@ zpm-init: zpm-init.o libzpm.a
 zpm-extract: zpm-extract.o libzpm.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
+zpm-findpkg: zpm-findpkg.o libzpm.a
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
+
 newdb.c: db.sql
 	echo "char createdb[] = {" > $@
 	xxd -i < $< >> $@
 	echo ", 0};" >> $@
 
 lib/sqlite3.o: lib/sqlite3.c lib/config.h
-	$(CC) $(CFLAGS) -D_HAVE_SQLITE_CONFIG_H=1 -c -o $@ $<
+	$(CC) -Wall -std=c99 -Ilib -D_HAVE_SQLITE_CONFIG_H=1 -c -o $@ $<
 
 $(LZMAOBJ):
 	$(CC) $(CFLAGS) $(LZMAFLAGS) -c -o $@ $*.c
 
 lib/zpm.o: newdb.c
 
-zpm-vercmp: vercmp.o
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< 
+zpm-vercmp: zpm-vercmp.o lib/vercmp.o
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
 	
 libzpm.a: lib/sha256.o lib/db.o lib/compress.o lib/uncompress.o lib/zpm.o \
 	lib/sqlite3.o \
+	lib/vercmp.o \
 	$(LZMAOBJ)
 	ar rcuv $@ $?