-CFLAGS=-Wall -std=c99 -Ilib -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
-LDFLAGS=-L.
+LDFLAGS=-L. -ldl
LZMACHECKSRC=lzma/check/check.c lzma/check/crc32_fast.c lzma/check/crc64_fast.c lzma/check/crc32_table.c lzma/check/crc64_table.c
LZMASRC=$(shell ls lzma/lzma/*.c lzma/common/*.c lzma/lz/*.c) $(LZMACHECKSRC) lzma/rangecoder/price_table.c
curdir=$(shell pwd)
-ZPKGBIN=zpm-addfile zpm-extract zpm-init zpm-vercmp zpm-stat
+ZPKGBIN=zpm-addfile zpm-extract zpm-init zpm-vercmp zpm-stat zpm-hash \
+ 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
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 $@ $+
+
+test: $(ZPKGBIN) t/ctap/prove
+ PATH=$(curdir)/t:$(curdir):$(PATH) t/ctap/prove t/*.t
-programs: elftype soname zpm-soneed zpm-addfile zpm-extract zpm-init zpm-vercmp
+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
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
zpm-extract: zpm-extract.o libzpm.a
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
+zpm-findpkg: zpm-findpkg.o libzpm.a
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
+
newdb.c: db.sql
echo "char createdb[] = {" > $@
xxd -i < $< >> $@
echo ", 0};" >> $@
-lib/sqlite3.o: lib/sqlite3.c lib/config.h
- $(CC) $(CFLAGS) -D_HAVE_SQLITE_CONFIG_H=1 -c -o $@ $<
+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_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: vercmp.o
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
+zpm-vercmp: zpm-vercmp.o lib/vercmp.o
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
+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 \
- lib/sqlite3.o \
+ sqlite/sqlite3.o lib/zpm_hash.o \
+ lib/vercmp.o \
+ lib/sha256.o \
$(LZMAOBJ)
ar rcuv $@ $?
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 lib/*.o $(LZMAOBJ) liblzma.a libelf.a libzpm.a zpm-addfile soname
+ rm -f *.o sqlite/*.o lib/*.o $(LZMAOBJ) liblzma.a \
+ libelf.a libzpm.a zpm-addfile soname \
+ *.xz *.zpm \
+ local.db