cleanup makefile and add library source

diff --git a/Makefile b/Makefile
index e55a72db61f7094e77d505b5d1e5cbeff9af1943..32a48ee78df6b8f7289d4cf4f42a3e49240b254f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,14 +17,14 @@ 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
+         foreach_path.c vercmp.o findpkg.c quote.c dbquery.c script_hash.c
 
 LIBZPMOBJ=$(addprefix lib/, $(LIBZPMSRC:%.c=%.o))
 
 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-findpkg zpm-shell zpm-soneed zpm-foreach-path zpm-parse
 
 SCRIPTS=zpm zpm-install zpm-merge zpm-list zpm-preserve zpm-test zpm-log \
        zpm-contents
@@ -91,8 +91,7 @@ t/ctap/prove: t/ctap/prove.o
 test: $(ZPKGBIN) t/ctap/prove
        PATH=$(curdir)/t:$(curdir):$(PATH) t/ctap/prove t/*.t
 
-programs: elftype zpm-soname zpm-soneed zpm-addfile zpm-extract zpm-init \
-       zpm-vercmp zpm-findpkg zpm-merge zpm-quote zpm-parse
+programs: $(ZPKGBIN)
 
 uncompress: uncompress.o 
        $(CC) $(CFLAGS) -o $@ $+ -llzma