CFLAGS=-Wall -W -Wextra -Werror -Wno-implicit-fallthrough -std=c99 -Ilib -Isqlite -Ielf -I. -Ilzma/api
-ZPMVER:=$(shell git tag --list 'v[0-9]*' | sed -e 's/^v//' | sort -nr | head -1)
-ifeq ($(strip $(ZPMVER)),)
- ZPMVER:=0.1.3
-endif
+ZPMVER:=$(shell git describe --tags --match 'v[0-9]*' | sed -e 's/^v//' | sed -e 's/-g.\+//' | sed -e 's/-/./g')
LZMAFLAGS=-Ilzma/api -Ilzma/tuklib -Ilzma/lzma -Ilzma/common -Ilzma/check -Ilzma/lz -Ilzma/rangecoder -Ilzma/simple -Ilzma/delta -DHAVE_CHECK_CRC64 -DHAVE_CHECK_CRC32 -DHAVE_ENCODER_LZMA2 -DHAVE_DECODER_LZMA2 -DHAVE_MF_BT4
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 \
+ zpm-runscript
SCRIPTS=zpm zpm-install zpm-merge zpm-list zpm-preserve zpm-test zpm-log \
zpm-contents
lib/libjsw.a: $(JSWOBJ)
ar rcuv $@ $?
-ZPM:= ./zpm -P scripts:bin:.
+ZPM:= ./zpm -P.
zpm-$(ZPMVER)-1.zpm: programs
rm -f $@
- $(ZPM) newpackage -f $@ -v $(ZPMVER) zpm
- $(ZPM) addtopackage -u root -g root -f $@ -P /sbin -v $(ZPMVER) zpm $(PROGRAMS)
+ $(ZPM) newpackage -C zpm-$(ZPMVER)-1
+ $(ZPM) add -u root -g root -f $@ -P /sbin zpm-$(ZPMVER)-1 $(sort $(PROGRAMS))
tarball: zpm-$(ZPMVER)-1.tar.xz
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
zpm-extract: zpm-extract.o libzpm.a
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
+
+zpm-runscript: zpm-runscript.o libzpm.a
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
zpm-foreach-path.o: CFLAGS+=-Wno-unused