X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=Makefile;h=886c8eee5e7a1012bb1a072d5fcaee8428c8c867;hb=refs%2Ftags%2Fv0.4.3;hp=2541ac6f1b0b7fc980cb904f6d6a13f1e5d8b799;hpb=2d4d941e7a05a98755c2ba96426a444e6645432a;p=zpackage

diff --git a/Makefile b/Makefile
index 2541ac6..886c8ee 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,12 @@
-CC=clang
+CC=clang --target=x86_64-pc-linux-musl
 #CC=/usr/musl/bin/musl-gcc
-CFLAGS=-Wall -W -Wextra -Werror -Wno-implicit-fallthrough -std=c99 -Ilib -Isqlite -Ielf -I. -Ilzma/api
+CFLAGS=-Wall -W -Wextra -Werror -Wno-implicit-fallthrough -std=c99 -Ilib -Isqlite -Ielf -I. -Ilzma/api --target=x86_64-pc-linux-musl
 
 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. -static
+LDFLAGS=-fuse-ld=lld -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
@@ -29,12 +29,13 @@ 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-script zpm-soname zpm-syncfs zpm-packagehash zpm-verify \
-	zpm-elftype zpm-quote zpm-note zpm-search
+	zpm-elftype zpm-quote zpm-note zpm-search zpm-add
 
 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-pkgfile zpm-gc zpm-repo zpm-update zpm-confgit
-MANPAGES=zpm.8 $(addprefix doc/zpm-, list.8 contents.8 hash.8 quote.8 pathmod.8 )
+	zpm-pkg zpm-pkgfile zpm-gc zpm-repo zpm-update zpm-confgit
+
+MANPAGES=doc/zpm.8 $(addprefix doc/zpm-, list.8 contents.8 hash.8 quote.8 pathmod.8 note.8 vercmp.8 repo.8)
 COMPILED=$(ZPKGBIN)
 PROGRAMS=$(SCRIPTS) $(COMPILED)
 
@@ -96,7 +97,7 @@ stest: $(ZPKGBIN)
 	PATH=$(curdir)/t:$(curdir):$(PATH) t/$(T).t
 
 t/ctap/prove: t/ctap/prove.o
-	$(CC) $(CFLAGS) -o $@ $+
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
 
 test: $(ZPKGBIN) t/ctap/prove
 	@PATH=$(curdir)/t:$(curdir):$(PATH) t/ctap/prove t/*.t
@@ -157,6 +158,9 @@ zpm-syncfs: zpm-syncfs.o libzpm.a libelf.a
 zpm-parse: zpm-parse.o lib/parse.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
 
+zpm-add: zpm-add.o lib/parse.o libzpm.a
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+ -lzpm -lelf
+
 zpm-quote: zpm-quote.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
 
@@ -206,5 +210,8 @@ 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 $(ZPKGBIN) \
-		db.sql
+		local.db \
+		t/ctap/*.o \
+		$(ZPKGBIN) \
+		db.sql \
+		elf/*.o lib/jsw/*.o