moved sqlite3 into lib directory

diff --git a/Makefile b/Makefile
index 26e1a176f19cfc380b76b45f072b04a7c583de2c..97fd69072cb3c33f8b8e8633bbc3b42ebe34ef35 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-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
+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
@@ -18,7 +18,7 @@ lzma.o: lzma.c
 test: zpm-addfile zpm-extract
        prove -e '' t/*.t
 
-programs: elftype soname zpm-addfile zpm-extract
+programs: elftype soname zpm-addfile zpm-extract zpm-init
 
 uncompress: uncompress.o 
        $(CC) $(CFLAGS) -o $@ $+ -llzma -lsqlite3
@@ -30,10 +30,13 @@ soname: elf/soname.c
        $(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[] = {" > $@
@@ -42,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 $@ $+
 

diff --git a/sqlite3.c b/lib/sqlite3.c
similarity index 100%
rename from sqlite3.c
rename to lib/sqlite3.c

diff --git a/sqlite3.h b/lib/sqlite3.h
similarity index 100%
rename from sqlite3.h
rename to lib/sqlite3.h