moved sqlite3 into lib directory

[zpackage] / Makefile

diff --git a/Makefile b/Makefile
index 053af317e05bcf4e425210a4d6bf306ddc58cc92..97fd69072cb3c33f8b8e8633bbc3b42ebe34ef35 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,24 @@
-CFLAGS=-Wall -std=c99 -I. -L.
+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
 LDFLAGS=-L.
 
-def: libzpm.a
+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))
 
-programs: elftype soname zpm-addfile zpm-extract
+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 zpm-extract
+       prove -e '' t/*.t
+
+programs: elftype soname zpm-addfile zpm-extract zpm-init
 
 uncompress: uncompress.o 
        $(CC) $(CFLAGS) -o $@ $+ -llzma -lsqlite3
@@ -12,20 +27,26 @@ 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) -o $@ $< -lsqlite3 -llzma -lzpm
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm
+
+zpm-init: zpm-init.o libzpm.a
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm
 
 zpm-extract: zpm-extract.o libzpm.a
-       $(CC) $(CFLAGS) -o $@ $< -lsqlite3 -llzma -lzpm
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm
 
 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
+libzpm.a: lib/sha256.o lib/db.o lib/compress.o lib/uncompress.o newdb.o lib/zpm.o \
+       lib/sqlite3.o \
+       $(LZMAOBJ)
        ar rcuv $@ $+
 
 install: elftype
@@ -43,4 +64,4 @@ install: elftype
        #SPOOL=$(DESTDIR)/var/lib/admin/notes ./zpm-sequence -c notes
 
 clean:
-       rm -f *.o
+       rm -f *.o lib/*.o $(LZMAOBJ) liblzma.a zpm-addfile soname