documentation improvements

[zpackage] / Makefile

diff --git a/Makefile b/Makefile
index 886c8eee5e7a1012bb1a072d5fcaee8428c8c867..c135bad4aef0f466087ab844d2699399234e532d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@ 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-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)
+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)
 
@@ -158,13 +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 lib/parse.o libzpm.a
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+ -lzpm -lelf
+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;' >> $@
@@ -206,6 +206,26 @@ 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 \
@@ -214,4 +234,6 @@ clean:
                t/ctap/*.o \
                $(ZPKGBIN) \
                db.sql \
-               elf/*.o lib/jsw/*.o
+               elf/*.o lib/jsw/*.o \
+               $(addprefix crypto/ref10/, $(X255OBJ)) \
+               x25519.o