correct default make target

[zpackage] / Makefile

diff --git a/Makefile b/Makefile
index af5a5eb98f1dfb747b24db59e67d4470e111f93b..7904298438e80cc2007a8bbaee678c6adc0c6c3d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ LZMAOBJ=$(filter-out lzma/common/stream_encoder_mt.o, $(LZMASRC:%.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
@@ -30,6 +30,23 @@ 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 $@ $?
+
+
 ZPM:= ./zpm -P scripts:bin:.
 
 zpm-$(ZPMVER)-1.zpm: programs
@@ -85,6 +102,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
@@ -100,9 +122,6 @@ sqlite/sqlite3.o: sqlite/sqlite3.c sqlite/config.h
 sqlite/shell.o: sqlite/shell.c sqlite/config.h
        $(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
-
 lib/zpm.o: newdb.c
 
 zpm-vercmp: zpm-vercmp.o lib/vercmp.o
@@ -113,6 +132,7 @@ zpm-shell: sqlite/sqlite3.o sqlite/shell.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)
@@ -128,7 +148,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: