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

diff --git a/Makefile b/Makefile
index 7a05ab2..dce8134 100644
--- a/Makefile
+++ b/Makefile
@@ -13,21 +13,12 @@ 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
-
-lzma/%.o: lzma/%.c
-	$(CC) $(CFLAGS) $(LZMAFLAGS) -c -o $@ $<
+JSWSRC=lib/jsw/jsw_avltree.c \
+lib/jsw/jsw_atree.c \
+lib/jsw/jsw_hlib.c \
+lib/jsw/jsw_rbtree.c
 
-lib/liblzma.a: $(LZMAOBJ)
-	ar rcuv $@ $?
+JSWOBJ=$(JSWSRC:%.c=%.o)
 
 curdir=$(shell pwd)
 
@@ -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
@@ -134,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