separate zpm_hash function

[zpackage] / Makefile

diff --git a/Makefile b/Makefile
index d517fb2862f4b6973516fa7152e81781661ba30e..67854e0186401cba21b7e35da3f8dab05ef21e30 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-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)),)
@@ -18,7 +18,7 @@ curdir=$(shell pwd)
 ZPKGBIN=zpm-addfile zpm-extract zpm-init zpm-vercmp zpm-stat zpm-hash \
        zpm-findpkg zpm-shell zpm-soneed
 
-SCRIPTS=zpm zpm-install
+SCRIPTS=zpm zpm-install zpm-merge zpm-list
 COMPILED=$(ZPKGBIN)
 PROGRAMS=$(SCRIPTS) $(COMPILED)
 
@@ -31,17 +31,16 @@ package: zpm-0.1-1.zpm
 
 ZPM:= ./zpm -P scripts:bin:.
 
-zpm-0.1-1.zpm: programs scripts
+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)
+       $(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 scripts
+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|' \
+       tar -cJf $@ --transform='s|^|bin/|' \
                $(PROGRAMS)
 
 lzma.c: mklzma
@@ -56,8 +55,8 @@ stest: $(ZPKGBIN)
 test: $(ZPKGBIN)
        PATH=$(curdir)/t:$(curdir):$(PATH) prove -e '' t/*.t
 
-programs: elftype soname zpm-soneed zpm-addfile zpm-extract zpm-init \
-       zpm-vercmp zpm-findpkg
+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
@@ -65,7 +64,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
@@ -109,7 +108,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)
@@ -118,19 +117,9 @@ 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 \