From 47d448ea2c09d5394f907d0c447ada1045409126 Mon Sep 17 00:00:00 2001
From: Nathan Wagner <nw@hydaspes.if.org>
Date: Sun, 25 Sep 2016 04:05:12 -0500
Subject: [PATCH] moved sqlite3 into lib directory

---
 Makefile                   | 13 ++++++++-----
 sqlite3.c => lib/sqlite3.c |  0
 sqlite3.h => lib/sqlite3.h |  0
 3 files changed, 8 insertions(+), 5 deletions(-)
 rename sqlite3.c => lib/sqlite3.c (100%)
 rename sqlite3.h => lib/sqlite3.h (100%)

diff --git a/Makefile b/Makefile
index 26e1a17..97fd690 100644
--- 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
-- 
2.40.0