add library findpkg and quote

[zpackage] / Makefile

diff --git a/Makefile b/Makefile
index dce81347b8971d444c99da673230068a0bdfca4d..2e29167f354af6b1332bfd39544036d91f5d5b58 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,10 @@ lib/jsw/jsw_hlib.c \
 lib/jsw/jsw_rbtree.c
 
 JSWOBJ=$(JSWSRC:%.c=%.o)
+LIBZPMSRC=sha256.c db.c compress.c uncompress.c zpm.c zpm_hash.c \
+         foreach_path.c vercmp.o findpkg.c quote.c
+
+LIBZPMOBJ=$(addprefix lib/, $(LIBZPMSRC:%.c=%.o))
 
 curdir=$(shell pwd)
 
@@ -35,6 +39,11 @@ d:
        printf '%s\n' $(LZMAOBJ)
        printf '%s\n' $(PATH)
 
+libzpm.a: $(LIBZPMOBJ) sqlite/sqlite3.o \
+       $(LZMAOBJ) \
+       $(JSWOBJ)
+       ar rcuv $@ $?
+
 package: zpm-$(ZPMVER)-1.zpm
 
 lzmaupdate:
@@ -120,6 +129,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-quote: zpm-quote.o libzpm.a
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
+
 newdb.c: db.sql
        echo "char createdb[] = {" > $@
        xxd -i < $< >> $@
@@ -139,14 +151,6 @@ zpm-vercmp: zpm-vercmp.o lib/vercmp.o
 zpm-shell: sqlite/sqlite3.o sqlite/shell.o
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
 
-libzpm.a: lib/sha256.o lib/db.o lib/compress.o lib/uncompress.o lib/zpm.o \
-       sqlite/sqlite3.o lib/zpm_hash.o \
-       lib/foreach_path.o \
-       lib/vercmp.o \
-       lib/sha256.o \
-       $(LZMAOBJ) \
-       $(JSWOBJ)
-       ar rcuv $@ $?
 
 libelf.a: elf/libelf.o
        ar rcuv $@ $?