add warnings to compile flags and fix

[zpackage] / Makefile

diff --git a/Makefile b/Makefile
index 18991523314f7e752ab8dec0dc4b197669b19825..ffb3f5baad52ac382af52c8aee53b89e30b5c887 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,42 +1,82 @@
-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
+CFLAGS=-Wall -W -Wextra -Werror -std=c99 -Ilib -Ielf -I. -Ilzma/api
+
+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.
 
 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
+curdir=$(shell pwd)
+
+ZPKGBIN=zpm-addfile zpm-extract zpm-init zpm-vercmp zpm-stat zpm-hash
+def: programs
 d:
        printf '%s\n' $(LZMAOBJ)
+       printf '%s\n' $(PATH)
+
+lzma.c: mklzma
+       sh mklzma
 
+lzma.o: lzma.c
+       gcc -std=c99 -Wall -c -o $@ $<
 
-programs: elftype soname zpm-addfile zpm-extract
+stest: $(ZPKGBIN)
+       PATH=$(curdir)/t:$(curdir):$(PATH) t/$(T).t
+
+test: $(ZPKGBIN)
+       PATH=$(curdir)/t:$(curdir):$(PATH) prove -e '' t/*.t
+
+programs: elftype soname zpm-soneed zpm-addfile zpm-extract zpm-init zpm-vercmp
 
 uncompress: uncompress.o 
-       $(CC) $(CFLAGS) -o $@ $+ -llzma -lsqlite3
+       $(CC) $(CFLAGS) -o $@ $+ -llzma
 
 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
+zpm-soneed: elf/needed.c
+       $(CC) -Ielf $(CFLAGS) -o $@ $+
+
+zpm-addfile: zpm-addfile.o libzpm.a libelf.a
+       $(CC) -Ielf $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
+
+zpm-hash: zpm-hash.o libzpm.a
+       $(CC) $(CFLAGS) $(LDFLAGS) -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 $@ $< -lsqlite3 -llzma -lzpm
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
 newdb.c: db.sql
        echo "char createdb[] = {" > $@
        xxd -i < $< >> $@
        echo ", 0};" >> $@
 
+lib/sqlite3.o: lib/sqlite3.c lib/config.h
+       $(CC) -Wall -std=c99 -Ilib -D_HAVE_SQLITE_CONFIG_H=1 -c -o $@ $<
 
-libzpm.a: lib/sha256.o lib/db.o lib/compress.o lib/uncompress.o newdb.o lib/zpm.o \
-       sqlite3.o \
+$(LZMAOBJ):
+       $(CC) $(CFLAGS) $(LZMAFLAGS) -c -o $@ $*.c
+
+lib/zpm.o: newdb.c
+
+zpm-vercmp: vercmp.o
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< 
+       
+libzpm.a: lib/sha256.o lib/db.o lib/compress.o lib/uncompress.o lib/zpm.o \
+       lib/sqlite3.o \
        $(LZMAOBJ)
-       ar rcuv $@ $+
+       ar rcuv $@ $?
+
+libelf.a: elf/libelf.o
+       ar rcuv $@ $?
 
 install: elftype
        install -D zpm $(DESTDIR)/bin/zpm
@@ -53,4 +93,4 @@ install: elftype
        #SPOOL=$(DESTDIR)/var/lib/admin/notes ./zpm-sequence -c notes
 
 clean:
-       rm -f *.o lib/*.o $(LZMAOBJ) liblzma.a
+       rm -f *.o lib/*.o $(LZMAOBJ) liblzma.a libelf.a libzpm.a zpm-addfile soname