X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=Makefile;h=74579e1cd58d5f4102a0c912274147f3fac10d76;hb=398752a85fda5b3d4497fb0918fd03de87b30fd5;hp=e845acc1ba1a39a68c1d88dce94ddabf10def339;hpb=c907b8ec08b06a4a256fd12b79b4bcf5088fbb19;p=zpackage

diff --git a/Makefile b/Makefile
index e845acc..74579e1 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,8 @@ ZPKGBIN=zpm-addfile zpm-extract zpm-init zpm-vercmp zpm-stat zpm-hash \
 
 SCRIPTS=zpm zpm-install zpm-merge zpm-list zpm-preserve zpm-test zpm-log \
 	zpm-contents zpm-uninstall zpm-pathmod zpm-rmpackage zpm-newpackage \
-	zpm-pkg zpm-add zpm-pkgfile zpm-gc
+	zpm-pkg zpm-add zpm-pkgfile zpm-gc zpm-repo zpm-update zpm-confgit
+MANPAGES=$(addprefix doc/, zpm.8 zpm-list.8 zpm-contents.8 zpm-hash.8 zpm-quote.8)
 COMPILED=$(ZPKGBIN)
 PROGRAMS=$(SCRIPTS) $(COMPILED)
 
@@ -72,16 +73,17 @@ lib/libjsw.a: $(JSWOBJ)
 
 ZPM:= ./zpm -P.
 
-zpm-$(ZPMVER)-1.zpm: programs
+zpm-$(ZPMVER)-1.zpm: programs $(MANPAGES)
 	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))
+	$(ZPM) add -v -u root -g root -f $@ -P /usr/share/man/man8 -S doc $(MANPAGES)
 
 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
@@ -158,17 +160,26 @@ zpm-parse: zpm-parse.o lib/parse.o
 zpm-quote: zpm-quote.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
 
+db.sql: schema/main.sql schema/syncconflicts.sql schema/syncinfo.sql
+	echo 'begin;' > $@
+	cat $+ >> $@
+	echo 'commit;' >> $@
+
 newdb.c: db.sql
 	echo "char createdb[] = {" > $@
 	xxd -i < $< >> $@
 	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/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
+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 +187,17 @@ 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
+install: $(COMPILED) $(MANPAGES)
+	test -d $(DESTDIR)/sbin || install -d $(DESTDIR)/sbin
+	install $(PROGRAMS) $(DESTDIR)/sbin
+	mkdir -p $(DESTDIR)/usr/share/man/man8
+	install -m644 $(MANPAGES) $(DESTDIR)/usr/share/man/man8
 
 scan-prep: clean sqlite/sqlite3.o sqlite/shell.o lib/liblzma.a
 	@echo scan-build -v -o report make -j10
@@ -194,4 +206,5 @@ clean:
 	rm -f *.o sqlite/*.o lib/*.o $(LZMAOBJ) liblzma.a \
 		libelf.a libzpm.a zpm-addfile soname \
 		*.xz \
-		local.db t/ctap/prove.o $(ZPKGBIN)
+		local.db t/ctap/prove.o $(ZPKGBIN) \
+		db.sql