X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=Makefile;h=dce81347b8971d444c99da673230068a0bdfca4d;hb=1bfb5f3817fda4edc6044e56e8a7ef548cf4c0db;hp=c477580aad986979d694665fd663837939850af1;hpb=7513a528f61259a92473284fd96313adb7a41f49;p=zpackage

diff --git a/Makefile b/Makefile
index c477580..dce8134 100644
--- a/Makefile
+++ b/Makefile
@@ -13,26 +13,17 @@ 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))
 
-lzmaupdate:
-	find xz/src/liblzma -type d -name .deps -prune \
-		-o -type f -printf '%P\n' \
-		| xargs -IZ echo Z Z Z \
-		| xargs printf 'test -e lzma/%s && cp xz/src/liblzma/%s lzma/%s\n' \
-		| sh
-
-#lzma/lz/lz_decoder.o: lzma/lz/lz_decoder.c
-#lzma/lz/lz_encoder.o: lzma/lz/lz_encoder.c
+JSWSRC=lib/jsw/jsw_avltree.c \
+lib/jsw/jsw_atree.c \
+lib/jsw/jsw_hlib.c \
+lib/jsw/jsw_rbtree.c
 
-lzma/%.o: lzma/%.c
-	$(CC) $(CFLAGS) $(LZMAFLAGS) -c -o $@ $<
-
-lib/liblzma.a: $(LZMAOBJ)
-	ar rcuv $@ $?
+JSWOBJ=$(JSWSRC:%.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-findpkg zpm-shell zpm-soneed zpm-foreach-path
 
 SCRIPTS=zpm zpm-install zpm-merge zpm-list zpm-preserve zpm-test zpm-log \
 	zpm-contents
@@ -46,6 +37,25 @@ d:
 
 package: zpm-$(ZPMVER)-1.zpm
 
+lzmaupdate:
+	find xz/src/liblzma -type d -name .deps -prune \
+		-o -type f -printf '%P\n' \
+		| xargs -IZ echo Z Z Z \
+		| xargs printf 'test -e lzma/%s && cp xz/src/liblzma/%s lzma/%s\n' \
+		| sh
+
+#lzma/lz/lz_decoder.o: lzma/lz/lz_decoder.c
+#lzma/lz/lz_encoder.o: lzma/lz/lz_encoder.c
+
+lzma/%.o: lzma/%.c
+	$(CC) $(CFLAGS) $(LZMAFLAGS) -c -o $@ $<
+
+lib/liblzma.a: $(LZMAOBJ)
+	ar rcuv $@ $?
+
+lib/libjsw.a: $(JSWOBJ)
+	ar rcuv $@ $?
+
 ZPM:= ./zpm -P scripts:bin:.
 
 zpm-$(ZPMVER)-1.zpm: programs
@@ -101,6 +111,11 @@ zpm-init: zpm-init.o libzpm.a
 
 zpm-extract: zpm-extract.o libzpm.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
+	
+zpm-foreach-path.o: CFLAGS+=-Wno-unused
+
+zpm-foreach-path: zpm-foreach-path.o libzpm.a sqlite/sqlite3.h
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
 zpm-findpkg: zpm-findpkg.o libzpm.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
@@ -129,7 +144,8 @@ libzpm.a: lib/sha256.o lib/db.o lib/compress.o lib/uncompress.o lib/zpm.o \
 	lib/foreach_path.o \
 	lib/vercmp.o \
 	lib/sha256.o \
-	$(LZMAOBJ)
+	$(LZMAOBJ) \
+	$(JSWOBJ)
 	ar rcuv $@ $?
 
 libelf.a: elf/libelf.o
@@ -142,7 +158,7 @@ install: $(COMPILED)
 clean:
 	rm -f *.o sqlite/*.o lib/*.o $(LZMAOBJ) liblzma.a \
 		libelf.a libzpm.a zpm-addfile soname \
-		*.xz *.zpm \
+		*.xz \
 		local.db t/ctap/prove.o
 
 tmpinstall: