fixup

[zpackage] / Makefile

diff --git a/Makefile b/Makefile
index 7595154acbc77079899420210029c0eb7ba80313..2be04baf45ff9158eb1bd6910b1943d899163bea 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,34 @@ 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
+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 -P scripts:bin:. newpackage -f $@ -v 0.1 zpm
+       ./zpm -P scripts:bin:. addtopackage -f $@ -P /usr/libexec/zpm -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|^|usr/libexec/zpm/|' \
+               --transform='s|^usr/libexec/zpm/zpm$$|usr/bin/zpm|' \
+               $(PROGRAMS)
+
 lzma.c: mklzma
        sh mklzma
 
@@ -30,7 +56,7 @@ stest: $(ZPKGBIN)
 test: $(ZPKGBIN)
        PATH=$(curdir)/t:$(curdir):$(PATH) prove -e '' t/*.t
 
-programs: elftype soname zpm-soneed zpm-addfile zpm-extract zpm-init \
+programs: elftype zpm-soname zpm-soneed zpm-addfile zpm-extract zpm-init \
        zpm-vercmp zpm-findpkg
 
 uncompress: uncompress.o 
@@ -39,7 +65,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
@@ -92,20 +118,11 @@ 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