separate parse from findpkg

[zpackage] / Makefile

diff --git a/Makefile b/Makefile
index c52fc24b83dd8a1ffef6dadf62a52e2116b46985..9c3a63c6b38d7761d128c91ec773a466fde7a4a9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,8 @@ 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 dbquery.c script_hash.c
+         foreach_path.c vercmp.c findpkg.c quote.c dbquery.c script_hash.c \
+         parse.c
 
 LIBZPMOBJ=$(addprefix lib/, $(LIBZPMSRC:%.c=%.o))
 
@@ -136,8 +137,8 @@ zpm-findpkg: zpm-findpkg.o libzpm.a
 zpm-syncfs: zpm-syncfs.o libzpm.a libelf.a
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf -lm -ldl
 
-zpm-parse: zpm-parse.o libzpm.a
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
+zpm-parse: zpm-parse.o lib/parse.o
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
 
 zpm-quote: zpm-quote.o
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
@@ -175,4 +176,4 @@ 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
+               local.db t/ctap/prove.o $(ZPKGBIN)