X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=Makefile;h=26e1a176f19cfc380b76b45f072b04a7c583de2c;hb=2e690698fef46656959d76b7d69b7162b734a96d;hp=ff9f4c94eccdc6473a7a65e15e58e542a813c13a;hpb=98344faf58c6ae59c9df9b46e4f0b0e49013846b;p=zpackage

diff --git a/Makefile b/Makefile
index ff9f4c9..26e1a17 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,22 @@
-CFLAGS=-Wall -std=c99 -I. -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 -D_POSIX_C_SOURCE=1
+CFLAGS=-Wall -std=c99 -I. -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.
 
 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
 LZMAOBJ=$(filter-out lzma/common/stream_encoder_mt.o, $(LZMASRC:%.c=%.o))
 
-def: libzpm.a
+def: programs
 d:
 	printf '%s\n' $(LZMAOBJ)
 
-test: zpm-addfile
-	prove -e'' t/*.t
+lzma.c: mklzma
+	sh mklzma
+
+lzma.o: lzma.c
+	gcc -std=c99 -Wall -c -o $@ $<
+
+test: zpm-addfile zpm-extract
+	prove -e '' t/*.t
 
 programs: elftype soname zpm-addfile zpm-extract
 
@@ -21,7 +27,7 @@ elftype: elf/elftype.c
 	$(CC) $(CFLAGS) -o $@ $+
 
 soname: elf/soname.c
-	$(CC) $(CFLAGS) -o $@ $+
+	$(CC) -Ielf $(CFLAGS) -o $@ $+
 
 zpm-addfile: zpm-addfile.o libzpm.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lsqlite3 -lzpm
@@ -55,4 +61,4 @@ install: elftype
 	#SPOOL=$(DESTDIR)/var/lib/admin/notes ./zpm-sequence -c notes
 
 clean:
-	rm -f *.o lib/*.o $(LZMAOBJ) liblzma.a zpm-addfile
+	rm -f *.o lib/*.o $(LZMAOBJ) liblzma.a zpm-addfile soname