documentation improvements

[zpackage] / Makefile

diff --git a/Makefile b/Makefile
index 33380f54cf81ad420c278f5276530a34305ca05d..c135bad4aef0f466087ab844d2699399234e532d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -29,12 +29,13 @@ 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-search
+       zpm-elftype zpm-quote zpm-note zpm-search zpm-add
 
 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-repo zpm-update zpm-confgit
-MANPAGES=zpm.8 $(addprefix doc/zpm-, list.8 contents.8 hash.8 quote.8 pathmod.8 )
+       zpm-pkg 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 note.8 vercmp.8 repo.8 gc.8)
 COMPILED=$(ZPKGBIN)
 PROGRAMS=$(SCRIPTS) $(COMPILED)
 
@@ -157,10 +158,13 @@ zpm-syncfs: zpm-syncfs.o libzpm.a libelf.a
 zpm-parse: zpm-parse.o lib/parse.o
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
 
+zpm-add: zpm-add.o libzpm.a libelf.a
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
+
 zpm-quote: zpm-quote.o
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
 
-db.sql: schema/main.sql schema/syncconflicts.sql schema/syncinfo.sql
+db.sql: schema/main.sql schema/syncconflicts.sql schema/syncinfo.sql schema/preserve_packages.sql schema/age.sql
        echo 'begin;' > $@
        cat $+ >> $@
        echo 'commit;' >> $@
@@ -202,11 +206,34 @@ install: $(COMPILED) $(MANPAGES)
 scan-prep: clean sqlite/sqlite3.o sqlite/shell.o lib/liblzma.a
        @echo scan-build -v -o report make -j10
 
+# crypto/tls items
+X255OBJ= \
+base.o \
+fe_0.o \
+fe_1.o \
+fe_add.o \
+fe_copy.o \
+fe_cswap.o \
+fe_frombytes.o \
+fe_invert.o \
+fe_mul.o \
+fe_mul121666.o \
+fe_sq.o \
+fe_sub.o \
+fe_tobytes.o \
+scalarmult.o
+
+x25519.o: $(addprefix crypto/ref10/, $(X255OBJ))
+       ld -o $@ -r $+
+
 clean:
        rm -f *.o sqlite/*.o lib/*.o $(LZMAOBJ) liblzma.a \
                libelf.a libzpm.a zpm-addfile soname \
                *.xz \
-               local.db 
+               local.db \
                t/ctap/*.o \
                $(ZPKGBIN) \
-               db.sql
+               db.sql \
+               elf/*.o lib/jsw/*.o \
+               $(addprefix crypto/ref10/, $(X255OBJ)) \
+               x25519.o