remove tmpinstall and tmpupgrade make targets

[zpackage] / Makefile

diff --git a/Makefile b/Makefile
index c876ce1588e64ab178e0434922e949f346427952..6045236a023e500c98ab759b6778960035911228 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ 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-runscript
+       zpm-runscript zpm-soname
 
 SCRIPTS=zpm zpm-install zpm-merge zpm-list zpm-preserve zpm-test zpm-log \
        zpm-contents
@@ -90,7 +90,7 @@ t/ctap/prove: t/ctap/prove.o
        $(CC) $(CFLAGS) -o $@ $+
 
 test: $(ZPKGBIN) t/ctap/prove
-       PATH=$(curdir)/t:$(curdir):$(PATH) t/ctap/prove t/*.t
+       @PATH=$(curdir)/t:$(curdir):$(PATH) t/ctap/prove t/*.t
 
 programs: $(ZPKGBIN)
 
@@ -129,11 +129,14 @@ 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-pkgfiles: zpm-pkgfiles.o libzpm.a
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf -lm
+
 zpm-parse: zpm-parse.o libzpm.a
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
-zpm-quote: zpm-quote.o libzpm.a
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
+zpm-quote: zpm-quote.o
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
 
 newdb.c: db.sql
        echo "char createdb[] = {" > $@
@@ -167,11 +170,3 @@ clean:
                libelf.a libzpm.a zpm-addfile soname \
                *.xz \
                local.db t/ctap/prove.o
-
-tmpinstall:
-       rm -rf tmp
-       mkdir tmp
-       ZPMDB=tmp/db.zpm ./zpm -P. install -R tmp -f zpm-0.1.2-1.zpm -u nw -g nw
-
-tmpupgrade:
-       ZPMDB=tmp/db.zpm ./zpm -P. install -R tmp -f zpm-$(ZPMVER)-1.zpm -u nw -g nw