fixup

[zpackage] / Makefile

diff --git a/Makefile b/Makefile
index 7595154acbc77079899420210029c0eb7ba80313..d890cbc563c1d42887fb1a4e52c4c491988b5043 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,9 @@
-CFLAGS=-Wall -W -Wextra -Werror -std=c99 -Ilib -Isqlite -Ielf -I. -Ilzma/api
+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
+endif
 
 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
 
@@ -11,13 +16,33 @@ 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-findpkg zpm-shell zpm-soneed
+
+SCRIPTS=zpm zpm-install zpm-merge zpm-list
+COMPILED=$(ZPKGBIN)
+PROGRAMS=$(SCRIPTS) $(COMPILED)
 
 def: programs
 d:
        printf '%s\n' $(LZMAOBJ)
        printf '%s\n' $(PATH)
 
+package: zpm-0.1-1.zpm
+
+ZPM:= ./zpm -P scripts:bin:.
+
+zpm-0.1-1.zpm: programs
+       rm -f $@
+       $(ZPM) newpackage -f $@ -v 0.1 zpm
+       $(ZPM) addtopackage -u root -g root -f $@ -P /bin -v 0.1 zpm $(PROGRAMS)
+
+tarball: zpm-0.1-1.tar.xz
+
+zpm-0.1-1.tar.xz: programs
+       rm -f $@
+       tar -cJf $@ --transform='s|^|bin/|' \
+               $(PROGRAMS)
+
 lzma.c: mklzma
        sh mklzma
 
@@ -27,11 +52,14 @@ lzma.o: lzma.c
 stest: $(ZPKGBIN)
        PATH=$(curdir)/t:$(curdir):$(PATH) t/$(T).t
 
-test: $(ZPKGBIN)
-       PATH=$(curdir)/t:$(curdir):$(PATH) prove -e '' t/*.t
+t/ctap/prove: t/ctap/prove.o
+       $(CC) $(CFLAGS) -o $@ $+
 
-programs: elftype soname zpm-soneed zpm-addfile zpm-extract zpm-init \
-       zpm-vercmp zpm-findpkg
+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
 
 uncompress: uncompress.o 
        $(CC) $(CFLAGS) -o $@ $+ -llzma
@@ -39,7 +67,7 @@ uncompress: uncompress.o
 elftype: elf/elftype.c
        $(CC) $(CFLAGS) -o $@ $+
 
-soname: elf/soname.c
+zpm-soname: elf/soname.c
        $(CC) -Ielf $(CFLAGS) -o $@ $+
 
 zpm-soneed: elf/needed.c
@@ -69,7 +97,7 @@ sqlite/sqlite3.o: sqlite/sqlite3.c sqlite/config.h
        $(CC) -Wall -std=c99 -Ilib -D_HAVE_SQLITE_CONFIG_H=1 -c -o $@ $<
 
 sqlite/shell.o: sqlite/shell.c sqlite/config.h
-       $(CC) -Wall -std=c99 -Ilib -D_HAVE_SQLITE_CONFIG_H=1 -c -o $@ $<
+       $(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
@@ -83,7 +111,7 @@ 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 \
+       sqlite/sqlite3.o lib/zpm_hash.o \
        lib/vercmp.o \
        lib/sha256.o \
        $(LZMAOBJ)
@@ -92,20 +120,12 @@ libzpm.a: lib/sha256.o lib/db.o lib/compress.o lib/uncompress.o lib/zpm.o \
 libelf.a: elf/libelf.o
        ar rcuv $@ $?
 
-install: elftype
-       install -D zpm $(DESTDIR)/bin/zpm
-       install -D zpm-note $(DESTDIR)/bin/zpm-note
-       install -D zpm-bug $(DESTDIR)/bin/zpm-bug
-       install -D zpm-sequence $(DESTDIR)/bin/zpm-sequence
-       install -D zpm-preserve $(DESTDIR)/bin/zpm-preserve
-       install -d -m2770 -o root -g adm $(DESTDIR)/var/lib/admin
-       install -d -m2770 -o root -g adm $(DESTDIR)/var/lib/admin/notes
-       install -d -m2770 -o root -g adm $(DESTDIR)/var/lib/admin/notes/open
-       install -d -m2770 -o root -g adm $(DESTDIR)/var/lib/admin/notes/ack
-       install -D elftype $(DESTDIR)/usr/sbin/elftype
-       install -D soname $(DESTDIR)/usr/sbin/soname
-       #SPOOL=$(DESTDIR)/var/lib/admin/notes ./zpm-sequence -c notes
+install: $(COMPILED)
+       test -d $(DESTDIR)/bin || install -d $(DESTDIR)/bin
+       install -D $(PROGRAMS) $(DESTDIR)/bin
 
 clean:
        rm -f *.o sqlite/*.o lib/*.o $(LZMAOBJ) liblzma.a \
-               libelf.a libzpm.a zpm-addfile soname
+               libelf.a libzpm.a zpm-addfile soname \
+               *.xz *.zpm \
+               local.db t/ctap/prove.o