changes to get lzma to compile

[zpackage] / Makefile

diff --git a/Makefile b/Makefile
index 7270bde66368565c3159bfebc4d35c7d630e4bdb..7ed73d374298dddfeeafdddd2cce7c4efcb726a0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,10 +5,17 @@ LZMACHECKSRC=lzma/check/check.c lzma/check/crc32_fast.c lzma/check/crc64_fast.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))
 
-def: libzpm.a
+def: programs
 d:
        printf '%s\n' $(LZMAOBJ)
 
+lzma.c: mklzma
+       sh mklzma
+
+lzma.o: lzma.c
+       gcc -std=c99 -Wall -c -o $@ $<
+test: zpm-addfile
+       prove -e'' t/*.t
 
 programs: elftype soname zpm-addfile zpm-extract
 
@@ -19,7 +26,7 @@ elftype: elf/elftype.c
        $(CC) $(CFLAGS) -o $@ $+
 
 soname: elf/soname.c
-       $(CC) $(CFLAGS) -o $@ $+
+       $(CC) -Ielf $(CFLAGS) -o $@ $+
 
 zpm-addfile: zpm-addfile.o libzpm.a
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lsqlite3 -lzpm
@@ -30,7 +37,7 @@ zpm-extract: zpm-extract.o libzpm.a
 newdb.c: db.sql
        echo "char createdb[] = {" > $@
        xxd -i < $< >> $@
-       echo "};" >> $@
+       echo ", 0};" >> $@
 
 
 libzpm.a: lib/sha256.o lib/db.o lib/compress.o lib/uncompress.o newdb.o lib/zpm.o \
@@ -53,4 +60,4 @@ install: elftype
        #SPOOL=$(DESTDIR)/var/lib/admin/notes ./zpm-sequence -c notes
 
 clean:
-       rm -f *.o lib/*.o $(LZMAOBJ) liblzma.a
+       rm -f *.o lib/*.o $(LZMAOBJ) liblzma.a zpm-addfile soname