moved sqlite3 into lib directory

[zpackage] / Makefile

diff --git a/Makefile b/Makefile
index ff9f4c94eccdc6473a7a65e15e58e542a813c13a..97fd69072cb3c33f8b8e8633bbc3b42ebe34ef35 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,24 @@
-CFLAGS=-Wall -std=c99 -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 -D_POSIX_C_SOURCE=1
+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.
 
 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))
 
-def: libzpm.a
+def: programs
 d:
        printf '%s\n' $(LZMAOBJ)
 
-test: zpm-addfile
-       prove -e'' t/*.t
+lzma.c: mklzma
+       sh mklzma
 
-programs: elftype soname zpm-addfile zpm-extract
+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
@@ -21,13 +27,16 @@ 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
+       $(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) $(LDFLAGS) -o $@ $< -lsqlite3 -llzma -lzpm
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm
 
 newdb.c: db.sql
        echo "char createdb[] = {" > $@
@@ -36,7 +45,7 @@ newdb.c: db.sql
 
 
 libzpm.a: lib/sha256.o lib/db.o lib/compress.o lib/uncompress.o newdb.o lib/zpm.o \
-       sqlite3.o \
+       lib/sqlite3.o \
        $(LZMAOBJ)
        ar rcuv $@ $+
 
@@ -55,4 +64,4 @@ install: elftype
        #SPOOL=$(DESTDIR)/var/lib/admin/notes ./zpm-sequence -c notes
 
 clean:
-       rm -f *.o lib/*.o $(LZMAOBJ) liblzma.a zpm-addfile
+       rm -f *.o lib/*.o $(LZMAOBJ) liblzma.a zpm-addfile soname