add where clause argument to findpkg

[zpackage] / Makefile

diff --git a/Makefile b/Makefile
index d13b9b6972deca660971012b2a2ec5880cf9c9e6..a294b3817d937c324377eb4551e931703fce20ed 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,12 @@
+CC=clang
+#CC=/usr/musl/bin/musl-gcc
 CFLAGS=-Wall -W -Wextra -Werror -Wno-implicit-fallthrough -std=c99 -Ilib -Isqlite -Ielf -I. -Ilzma/api
 
 ZPMVER:=$(shell git describe --tags --match 'v[0-9]*' | sed -e 's/^v//' | sed -e 's/-g.\+//' | sed -e 's/-/./g')
 
 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. -ldl
+LDFLAGS=-L. -static
 
 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
@@ -17,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))
 
@@ -25,14 +28,18 @@ 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)
 
 def: programs
+       strip $(ZPKGBIN)
+
 d:
        printf '%s\n' $(LZMAOBJ)
        printf '%s\n' $(PATH)
@@ -97,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 $@ $+
@@ -112,16 +119,22 @@ 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-foreach-path.o: CFLAGS+=-Wno-unused
+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
        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
@@ -129,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-syncfs: zpm-syncfs.o libzpm.a
+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
 
-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 $@ $<
@@ -147,7 +163,9 @@ 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 $@ $<
+       $(CC) -Wall -std=c99 -Ilib \
+               -DSQLITE_OMIT_LOAD_EXTENSION=1 \
+               -D_POSIX_C_SOURCE=200112L -c -o $@ $<
 
 lib/zpm.o: newdb.c
 
@@ -165,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)