rework zpm-merge

[zpackage] / Makefile

diff --git a/Makefile b/Makefile
index e845acc1ba1a39a68c1d88dce94ddabf10def339..bbc69913c556bd6013d9d3e7e0293b32c171db38 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -75,13 +75,13 @@ ZPM:= ./zpm -P.
 zpm-$(ZPMVER)-1.zpm: programs
        rm -f $@
        $(ZPM) newpackage -C zpm-$(ZPMVER)-1
-       $(ZPM) add -u root -g root -f $@ -P /sbin zpm-$(ZPMVER)-1 $(sort $(PROGRAMS))
+       $(ZPM) add -v -u root -g root -f $@ -P /sbin zpm-$(ZPMVER)-1 $(sort $(PROGRAMS))
 
 tarball: zpm-$(ZPMVER)-1.tar.xz
 
 zpm-$(ZPMVER)-1.tar.xz: programs
        rm -f $@
-       tar -cJf $@ --transform='s|^|bin/|' \
+       tar -cJf $@ --transform='s|^|sbin/|' \
                $(PROGRAMS)
 
 lzma.c: mklzma
@@ -164,11 +164,15 @@ newdb.c: db.sql
        echo ", 0};" >> $@
 
 sqlite/sqlite3.o: sqlite/sqlite3.c sqlite/config.h
-       $(CC) -Wall -std=c99 -Ilib -D_HAVE_SQLITE_CONFIG_H=1 -c -o $@ $<
+       $(CC) -O3 -Wall -std=c99 -Ilib -D_HAVE_SQLITE_CONFIG_H=1 -c -o $@ $<
 
-sqlite/shell.o: sqlite/shell.c sqlite/config.h
+sqlite/extensions.o: sqlite/extensions.c
+       $(CC) -O3 -Wall -std=c99 -I. -DSQLITE_CORE=1 -c -o $@ $<
+
+sqlite/shell.o: sqlite/shell.c sqlite/config.h Makefile
        $(CC) -Wall -std=c99 -Ilib \
                -DSQLITE_OMIT_LOAD_EXTENSION=1 \
+               '-DSQLITE_SHELL_INIT_PROC(x)=zpm_setup_extensions(x)' \
                -D_POSIX_C_SOURCE=200112L -c -o $@ $<
 
 lib/zpm.o: newdb.c
@@ -176,16 +180,15 @@ lib/zpm.o: newdb.c
 zpm-vercmp: zpm-vercmp.o lib/vercmp.o
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
        
-zpm-shell: sqlite/sqlite3.o sqlite/shell.o
+zpm-shell: sqlite/sqlite3.o sqlite/shell.o sqlite/extensions.o lib/vercmp.o
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
 
-
 libelf.a: elf/libelf.o
        ar rcuv $@ $?
 
 install: $(COMPILED)
-       test -d $(DESTDIR)/bin || install -d $(DESTDIR)/bin
-       install -D $(PROGRAMS) $(DESTDIR)/bin
+       test -d $(DESTDIR)/sbin || install -d $(DESTDIR)/sbin
+       install $(PROGRAMS) $(DESTDIR)/sbin
 
 scan-prep: clean sqlite/sqlite3.o sqlite/shell.o lib/liblzma.a
        @echo scan-build -v -o report make -j10