ZPKGBIN=zpm-addfile zpm-extract zpm-init zpm-vercmp zpm-stat zpm-hash \
zpm-findpkg zpm-shell zpm-soneed
-SCRIPTS=zpm zpm-install
+SCRIPTS=zpm zpm-install zpm-merge zpm-list
COMPILED=$(ZPKGBIN)
PROGRAMS=$(SCRIPTS) $(COMPILED)
zpm-0.1-1.zpm: programs
rm -f $@
- ./zpm -P scripts:bin:. newpackage -f $@ -v 0.1 zpm
- ./zpm -P scripts:bin:. addtopackage -f $@ -P /usr/libexec/zpm -v 0.1 zpm $(PROGRAMS)
+ $(ZPM) newpackage -f $@ -v 0.1 zpm
+ $(ZPM) addtopackage -u root -g root -f $@ -P /bin -v 0.1 zpm $(PROGRAMS)
tarball: zpm-0.1-1.tar.xz
zpm-0.1-1.tar.xz: programs
rm -f $@
- tar -cJf $@ --transform='s|^|usr/libexec/zpm/|' \
- --transform='s|^usr/libexec/zpm/zpm$$|usr/bin/zpm|' \
+ tar -cJf $@ --transform='s|^|bin/|' \
$(PROGRAMS)
lzma.c: mklzma
stest: $(ZPKGBIN)
PATH=$(curdir)/t:$(curdir):$(PATH) t/$(T).t
-test: $(ZPKGBIN)
- PATH=$(curdir)/t:$(curdir):$(PATH) prove -e '' t/*.t
+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
programs: elftype zpm-soname zpm-soneed zpm-addfile zpm-extract zpm-init \
- zpm-vercmp zpm-findpkg
+ zpm-vercmp zpm-findpkg zpm-merge
uncompress: uncompress.o
$(CC) $(CFLAGS) -o $@ $+ -llzma
$(CC) -Wall -std=c99 -Ilib -D_HAVE_SQLITE_CONFIG_H=1 -c -o $@ $<
sqlite/shell.o: sqlite/shell.c sqlite/config.h
- $(CC) -Wall -std=c99 -Ilib -D_HAVE_SQLITE_CONFIG_H=1 -c -o $@ $<
+ $(CC) -Wall -std=c99 -Ilib -D_POSIX_C_SOURCE=200112L -D_HAVE_SQLITE_CONFIG_H=1 -c -o $@ $<
$(LZMAOBJ):
$(CC) $(CFLAGS) $(LZMAFLAGS) -c -o $@ $*.c
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
libzpm.a: lib/sha256.o lib/db.o lib/compress.o lib/uncompress.o lib/zpm.o \
- sqlite/sqlite3.o \
+ sqlite/sqlite3.o lib/zpm_hash.o \
lib/vercmp.o \
lib/sha256.o \
$(LZMAOBJ)
clean:
rm -f *.o sqlite/*.o lib/*.o $(LZMAOBJ) liblzma.a \
libelf.a libzpm.a zpm-addfile soname \
- *.xz *.zpm
+ *.xz *.zpm \
+ local.db t/ctap/prove.o