X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=Makefile;h=a294b3817d937c324377eb4551e931703fce20ed;hb=b3db43c1429f5f07f625f8a59ec51eba5057e0c8;hp=c52fc24b83dd8a1ffef6dadf62a52e2116b46985;hpb=4a6ff66a5868ab54ec03f240d8160b7c87dd23f7;p=zpackage

diff --git a/Makefile b/Makefile
index c52fc24..a294b38 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,8 @@ lib/jsw/jsw_rbtree.c
 
 JSWOBJ=$(JSWSRC:%.c=%.o)
 LIBZPMSRC=sha256.c db.c compress.c uncompress.c zpm.c zpm_hash.c \
-	  foreach_path.c vercmp.o findpkg.c quote.c dbquery.c script_hash.c
+	  foreach_path.c vercmp.c findpkg.c quote.c dbquery.c script_hash.c \
+	  parse.c integ.c seterror.c notes.c
 
 LIBZPMOBJ=$(addprefix lib/, $(LIBZPMSRC:%.c=%.o))
 
@@ -27,10 +28,12 @@ curdir=$(shell pwd)
 
 ZPKGBIN=zpm-addfile zpm-extract zpm-init zpm-vercmp zpm-stat zpm-hash \
 	zpm-findpkg zpm-shell zpm-soneed zpm-foreach-path zpm-parse \
-	zpm-runscript zpm-soname zpm-syncfs
+	zpm-script zpm-soname zpm-syncfs zpm-packagehash zpm-verify \
+	zpm-elftype zpm-quote zpm-note
 
 SCRIPTS=zpm zpm-install zpm-merge zpm-list zpm-preserve zpm-test zpm-log \
-	zpm-contents zpm-uninstall
+	zpm-contents zpm-uninstall zpm-pathmod zpm-rmpackage zpm-newpackage \
+	zpm-pkg zpm-add zpm-pkgfile zpm-gc
 COMPILED=$(ZPKGBIN)
 PROGRAMS=$(SCRIPTS) $(COMPILED)
 
@@ -101,8 +104,8 @@ programs: $(ZPKGBIN)
 uncompress: uncompress.o 
 	$(CC) $(CFLAGS) -o $@ $+ -llzma
 
-elftype: elf/elftype.c
-	$(CC) $(CFLAGS) -o $@ $+
+zpm-elftype: elf/elftype.c
+	$(CC) -Ielf $(CFLAGS) -o $@ $+
 
 zpm-soname: elf/soname.c
 	$(CC) -Ielf $(CFLAGS) -o $@ $+
@@ -116,15 +119,21 @@ zpm-addfile: zpm-addfile.o libzpm.a libelf.a
 zpm-hash: zpm-hash.o libzpm.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
+zpm-verify: zpm-verify.o t/ctap/ctap.o libzpm.a
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< t/ctap/ctap.o -lzpm -lelf
+
 zpm-init: zpm-init.o libzpm.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
 zpm-extract: zpm-extract.o libzpm.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
-zpm-runscript: zpm-runscript.o libzpm.a
+zpm-script: zpm-script.o libzpm.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 	
+zpm-packagehash: zpm-packagehash.o libzpm.a
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
+
 zpm-foreach-path.o: CFLAGS+=-Wno-unused-parameter
 
 zpm-foreach-path: zpm-foreach-path.o libzpm.a sqlite/sqlite3.h
@@ -133,11 +142,14 @@ zpm-foreach-path: zpm-foreach-path.o libzpm.a sqlite/sqlite3.h
 zpm-findpkg: zpm-findpkg.o libzpm.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
+zpm-note: zpm-note.o libzpm.a
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
+
 zpm-syncfs: zpm-syncfs.o libzpm.a libelf.a
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf -lm -ldl
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf -lm
 
-zpm-parse: zpm-parse.o libzpm.a
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
+zpm-parse: zpm-parse.o lib/parse.o
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
 
 zpm-quote: zpm-quote.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
@@ -171,8 +183,11 @@ install: $(COMPILED)
 	test -d $(DESTDIR)/bin || install -d $(DESTDIR)/bin
 	install -D $(PROGRAMS) $(DESTDIR)/bin
 
+scan-prep: clean sqlite/sqlite3.o sqlite/shell.o lib/liblzma.a
+	@echo scan-build -v -o report make -j10
+
 clean:
 	rm -f *.o sqlite/*.o lib/*.o $(LZMAOBJ) liblzma.a \
 		libelf.a libzpm.a zpm-addfile soname \
 		*.xz \
-		local.db t/ctap/prove.o
+		local.db t/ctap/prove.o $(ZPKGBIN)