fix makefile for recent changes

diff --git a/Makefile b/Makefile
index 97fd69072cb3c33f8b8e8633bbc3b42ebe34ef35..7c5bf53cd6968fa6cd2490b225167837f6c0c78e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,20 @@
-CFLAGS=-Wall -std=c99 -Ilib -I. -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
+CFLAGS=-Wall -std=c99 -Ilib -I.
+
+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
+
 LDFLAGS=-L.
 
 LZMACHECKSRC=lzma/check/check.c lzma/check/crc32_fast.c lzma/check/crc64_fast.c lzma/check/crc32_table.c lzma/check/crc64_table.c
 LZMASRC=$(shell ls lzma/lzma/*.c lzma/common/*.c lzma/lz/*.c) $(LZMACHECKSRC) lzma/rangecoder/price_table.c
 LZMAOBJ=$(filter-out lzma/common/stream_encoder_mt.o, $(LZMASRC:%.c=%.o))
 
+curdir=$(shell pwd)
+
+ZPKGBIN=zpm-addfile zpm-extract zpm-init
 def: programs
 d:
        printf '%s\n' $(LZMAOBJ)
+       printf '%s\n' $(PATH)
 
 lzma.c: mklzma
        sh mklzma
@@ -15,13 +22,13 @@ lzma.c: mklzma
 lzma.o: lzma.c
        gcc -std=c99 -Wall -c -o $@ $<
 
-test: zpm-addfile zpm-extract
-       prove -e '' t/*.t
+test: $(ZPKGBIN)
+       PATH=$(curdir)/t:$(curdir):$(PATH) prove -e '' t/*.t
 
 programs: elftype soname zpm-addfile zpm-extract zpm-init
 
 uncompress: uncompress.o 
-       $(CC) $(CFLAGS) -o $@ $+ -llzma -lsqlite3
+       $(CC) $(CFLAGS) -o $@ $+ -llzma
 
 elftype: elf/elftype.c
        $(CC) $(CFLAGS) -o $@ $+
@@ -32,6 +39,9 @@ soname: elf/soname.c
 zpm-addfile: zpm-addfile.o libzpm.a
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm
 
+zpm-hash: zpm-hash.o libzpm.a
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm
+
 zpm-init: zpm-init.o libzpm.a
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm
 
@@ -43,6 +53,11 @@ newdb.c: db.sql
        xxd -i < $< >> $@
        echo ", 0};" >> $@
 
+lib/sqlite3.o: lib/sqlite3.c lib/config.h
+       $(CC) $(CFLAGS) -D_HAVE_SQLITE_CONFIG_H=1 -c -o $@ $<
+
+$(LZMAOBJ):
+       $(CC) $(CFLAGS) $(LZMAFLAGS) -c -o $@ $<
 
 libzpm.a: lib/sha256.o lib/db.o lib/compress.o lib/uncompress.o newdb.o lib/zpm.o \
        lib/sqlite3.o \