X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=Makefile;h=0f71428306aeca96d135297bc1db6d7a004ced34;hb=4bcba29f166e9a93c109a43c68c20d630f2c2465;hp=bdcc455b6b439a0df129c0f75951d7b2a9117d7f;hpb=2b9bc43be66627b399b18a78fde46474091b0d1a;p=zpackage

diff --git a/Makefile b/Makefile
index bdcc455..0f71428 100644
--- a/Makefile
+++ b/Makefile
@@ -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)
 
@@ -33,15 +33,14 @@ 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)
+	$(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|^|usr/libexec/zpm/|' \
-		--transform='s|^usr/libexec/zpm/zpm$$|usr/bin/zpm|' \
+	tar -cJf $@ --transform='s|^|bin/|' \
 		$(PROGRAMS)
 
 lzma.c: mklzma
@@ -53,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 $@ $+
+
+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-vercmp zpm-findpkg zpm-merge
 
 uncompress: uncompress.o 
 	$(CC) $(CFLAGS) -o $@ $+ -llzma
@@ -95,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
@@ -109,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)
@@ -118,21 +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 \
-		*.xz *.zpm
+		*.xz *.zpm \
+		local.db