X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=Makefile;h=641e9129cfc2ca296eb1ca656714fc204af272d0;hb=f12e588273d9a3ffc97c20a7075845dff68905e4;hp=7904298438e80cc2007a8bbaee678c6adc0c6c3d;hpb=9e2f2f4108fdfb7abfea7772ae35270b915c2630;p=zpackage

diff --git a/Makefile b/Makefile
index 7904298..641e912 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,6 @@
 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
 
@@ -13,10 +10,22 @@ LZMACHECKSRC=lzma/check/check.c lzma/check/crc32_fast.c lzma/check/crc64_fast.c
 LZMASRC=$(shell ls lzma/lzma/*.c lzma/common/*.c lzma/lz/*.c) $(LZMACHECKSRC) lzma/rangecoder/price_table.c
 LZMAOBJ=$(filter-out lzma/common/stream_encoder_mt.o, $(LZMASRC:%.c=%.o))
 
+JSWSRC=lib/jsw/jsw_avltree.c \
+lib/jsw/jsw_atree.c \
+lib/jsw/jsw_hlib.c \
+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
+
+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
@@ -28,6 +37,11 @@ d:
 	printf '%s\n' $(LZMAOBJ)
 	printf '%s\n' $(PATH)
 
+libzpm.a: $(LIBZPMOBJ) sqlite/sqlite3.o \
+	$(LZMAOBJ) \
+	$(JSWOBJ)
+	ar rcuv $@ $?
+
 package: zpm-$(ZPMVER)-1.zpm
 
 lzmaupdate:
@@ -46,13 +60,15 @@ lzma/%.o: lzma/%.c
 lib/liblzma.a: $(LZMAOBJ)
 	ar rcuv $@ $?
 
+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
 
@@ -74,10 +90,9 @@ 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: elftype zpm-soname zpm-soneed zpm-addfile zpm-extract zpm-init \
-	zpm-vercmp zpm-findpkg zpm-merge
+programs: $(ZPKGBIN)
 
 uncompress: uncompress.o 
 	$(CC) $(CFLAGS) -o $@ $+ -llzma
@@ -102,6 +117,9 @@ zpm-init: zpm-init.o libzpm.a
 
 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
 
@@ -111,6 +129,15 @@ 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
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
+
 newdb.c: db.sql
 	echo "char createdb[] = {" > $@
 	xxd -i < $< >> $@
@@ -130,13 +157,6 @@ zpm-vercmp: zpm-vercmp.o lib/vercmp.o
 zpm-shell: sqlite/sqlite3.o sqlite/shell.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
 
-libzpm.a: lib/sha256.o lib/db.o lib/compress.o lib/uncompress.o lib/zpm.o \
-	sqlite/sqlite3.o lib/zpm_hash.o \
-	lib/foreach_path.o \
-	lib/vercmp.o \
-	lib/sha256.o \
-	$(LZMAOBJ)
-	ar rcuv $@ $?
 
 libelf.a: elf/libelf.o
 	ar rcuv $@ $?