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

diff --git a/Makefile b/Makefile
index c52fc24..9cfc921 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
 
 LIBZPMOBJ=$(addprefix lib/, $(LIBZPMSRC:%.c=%.o))
 
@@ -27,10 +28,10 @@ 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-runscript zpm-soname zpm-syncfs zpm-packagehash
 
 SCRIPTS=zpm zpm-install zpm-merge zpm-list zpm-preserve zpm-test zpm-log \
-	zpm-contents zpm-uninstall
+	zpm-contents zpm-uninstall zpm-pathmod
 COMPILED=$(ZPKGBIN)
 PROGRAMS=$(SCRIPTS) $(COMPILED)
 
@@ -125,6 +126,9 @@ zpm-extract: zpm-extract.o libzpm.a
 zpm-runscript: zpm-runscript.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
@@ -134,10 +138,10 @@ zpm-findpkg: zpm-findpkg.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 +175,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)