JSWOBJ=$(JSWSRC:%.c=%.o)
LIBZPMSRC=sha256.c db.c compress.c uncompress.c zpm.c zpm_hash.c \
foreach_path.c vercmp.c findpkg.c quote.c dbquery.c script_hash.c \
- parse.c integ.c
+ parse.c integ.c seterror.c notes.c
LIBZPMOBJ=$(addprefix lib/, $(LIBZPMSRC:%.c=%.o))
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-packagehash zpm-verify \
- zpm-elftype zpm-quote
+ zpm-script zpm-soname zpm-syncfs zpm-packagehash zpm-verify \
+ zpm-elftype zpm-quote zpm-note zpm-search
SCRIPTS=zpm zpm-install zpm-merge zpm-list zpm-preserve zpm-test zpm-log \
zpm-contents zpm-uninstall zpm-pathmod zpm-rmpackage zpm-newpackage \
- zpm-pkg zpm-add
+ zpm-pkg zpm-add zpm-pkgfile zpm-gc
COMPILED=$(ZPKGBIN)
PROGRAMS=$(SCRIPTS) $(COMPILED)
zpm-$(ZPMVER)-1.zpm: programs
rm -f $@
$(ZPM) newpackage -C zpm-$(ZPMVER)-1
- $(ZPM) add -u root -g root -f $@ -P /sbin zpm-$(ZPMVER)-1 $(sort $(PROGRAMS))
+ $(ZPM) add -v -u root -g root -f $@ -P /sbin zpm-$(ZPMVER)-1 $(sort $(PROGRAMS))
tarball: zpm-$(ZPMVER)-1.tar.xz
zpm-$(ZPMVER)-1.tar.xz: programs
rm -f $@
- tar -cJf $@ --transform='s|^|bin/|' \
+ tar -cJf $@ --transform='s|^|sbin/|' \
$(PROGRAMS)
lzma.c: mklzma
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-script.o: CFLAGS+=-Wno-unused-parameter
zpm-foreach-path: zpm-foreach-path.o libzpm.a sqlite/sqlite3.h
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
zpm-findpkg: zpm-findpkg.o libzpm.a
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
+zpm-search: zpm-search.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
echo ", 0};" >> $@
sqlite/sqlite3.o: sqlite/sqlite3.c sqlite/config.h
- $(CC) -Wall -std=c99 -Ilib -D_HAVE_SQLITE_CONFIG_H=1 -c -o $@ $<
+ $(CC) -O3 -Wall -std=c99 -Ilib -D_HAVE_SQLITE_CONFIG_H=1 -c -o $@ $<
+
+sqlite/extensions.o: sqlite/extensions.c
+ $(CC) -O3 -Wall -std=c99 -I. -DSQLITE_CORE=1 -c -o $@ $<
+
sqlite/shell.o: sqlite/shell.c sqlite/config.h
$(CC) -Wall -std=c99 -Ilib \
-DSQLITE_OMIT_LOAD_EXTENSION=1 \
+ '-DSQLITE_SHELL_INIT_PROC(x)=zpm_setup_extensions(x)' \
-D_POSIX_C_SOURCE=200112L -c -o $@ $<
lib/zpm.o: newdb.c
zpm-vercmp: zpm-vercmp.o lib/vercmp.o
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
-zpm-shell: sqlite/sqlite3.o sqlite/shell.o
+zpm-shell: sqlite/sqlite3.o sqlite/shell.o sqlite/extensions.o lib/vercmp.o
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
-
libelf.a: elf/libelf.o
ar rcuv $@ $?
install: $(COMPILED)
- test -d $(DESTDIR)/bin || install -d $(DESTDIR)/bin
- install -D $(PROGRAMS) $(DESTDIR)/bin
+ test -d $(DESTDIR)/sbin || install -d $(DESTDIR)/sbin
+ install $(PROGRAMS) $(DESTDIR)/sbin
scan-prep: clean sqlite/sqlite3.o sqlite/shell.o lib/liblzma.a
@echo scan-build -v -o report make -j10