X-Git-Url: https://pd.if.org/git/?p=zpackage;a=blobdiff_plain;f=Makefile;h=85a5d13dcce9ba837bc686260b5e0d4ebf53026f;hp=d018fd3219b6b8203900c26d5b443abae98a45b5;hb=89a160b4762730e078ed8d2e5c212a51f17ac6f8;hpb=c02e8d831122a804f675a2f106b2e23af235be58

diff --git a/Makefile b/Makefile
index d018fd3..85a5d13 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
-CC=clang
+CC=clang --target=x86_64-pc-linux-musl
 #CC=/usr/musl/bin/musl-gcc
-CFLAGS=-Wall -W -Wextra -Werror -Wno-implicit-fallthrough -std=c99 -Ilib -Isqlite -Ielf -I. -Ilzma/api
+CFLAGS=-Wall -W -Wextra -Werror -Wno-implicit-fallthrough -std=c99 -Ilib -Isqlite -Ielf -I. -Ilzma/api --target=x86_64-pc-linux-musl
 
 ZPMVER:=$(shell git describe --tags --match 'v[0-9]*' | sed -e 's/^v//' | sed -e 's/-g.\+//' | sed -e 's/-/./g')
 
 LZMAFLAGS=-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. -static
+LDFLAGS=-fuse-ld=lld -L. -static
 
 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
@@ -29,11 +29,12 @@ curdir=$(shell pwd)
 ZPKGBIN=zpm-addfile zpm-extract zpm-init zpm-vercmp zpm-stat zpm-hash \
 	zpm-findpkg zpm-shell zpm-soneed zpm-foreach-path zpm-parse \
 	zpm-script zpm-soname zpm-syncfs zpm-packagehash zpm-verify \
-	zpm-elftype zpm-quote zpm-note
+	zpm-elftype zpm-quote zpm-note zpm-search
 
 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=doc/zpm.8 $(addprefix doc/zpm-, list.8 contents.8 hash.8 quote.8 pathmod.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
@@ -94,7 +96,7 @@ stest: $(ZPKGBIN)
 	PATH=$(curdir)/t:$(curdir):$(PATH) t/$(T).t
 
 t/ctap/prove: t/ctap/prove.o
-	$(CC) $(CFLAGS) -o $@ $+
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
 
 test: $(ZPKGBIN) t/ctap/prove
 	@PATH=$(curdir)/t:$(curdir):$(PATH) t/ctap/prove t/*.t
@@ -143,6 +145,9 @@ zpm-foreach-path: zpm-foreach-path.o libzpm.a sqlite/sqlite3.h
 zpm-findpkg: zpm-findpkg.o libzpm.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
+zpm-search: zpm-search.o libzpm.a
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
+
 zpm-note: zpm-note.o libzpm.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
@@ -155,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
@@ -173,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
@@ -191,4 +206,8 @@ 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/*.o \
+		$(ZPKGBIN) \
+		db.sql \
+		elf/*.o lib/jsw/*.o