fix warnings and includes to compile on linux

[zpackage] / Makefile

diff --git a/Makefile b/Makefile
index 7c5bf53cd6968fa6cd2490b225167837f6c0c78e..457764fd2f2a094eadce8f44a95d9000cc1937de 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
-CFLAGS=-Wall -std=c99 -Ilib -I.
+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.
+LDFLAGS=-L. -ldl
 
 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
@@ -10,7 +10,9 @@ LZMAOBJ=$(filter-out lzma/common/stream_encoder_mt.o, $(LZMASRC:%.c=%.o))
 
 curdir=$(shell pwd)
 
-ZPKGBIN=zpm-addfile zpm-extract zpm-init
+ZPKGBIN=zpm-addfile zpm-extract zpm-init zpm-vercmp zpm-stat zpm-hash \
+       zpm-findpkg
+
 def: programs
 d:
        printf '%s\n' $(LZMAOBJ)
@@ -22,10 +24,14 @@ lzma.c: mklzma
 lzma.o: lzma.c
        gcc -std=c99 -Wall -c -o $@ $<
 
+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-addfile zpm-extract zpm-init
+programs: elftype soname zpm-soneed zpm-addfile zpm-extract zpm-init \
+       zpm-vercmp zpm-findpkg
 
 uncompress: uncompress.o 
        $(CC) $(CFLAGS) -o $@ $+ -llzma
@@ -36,17 +42,23 @@ elftype: elf/elftype.c
 soname: elf/soname.c
        $(CC) -Ielf $(CFLAGS) -o $@ $+
 
-zpm-addfile: zpm-addfile.o libzpm.a
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -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
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
 zpm-init: zpm-init.o libzpm.a
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
 zpm-extract: zpm-extract.o libzpm.a
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
+
+zpm-findpkg: zpm-findpkg.o libzpm.a
+       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
 newdb.c: db.sql
        echo "char createdb[] = {" > $@
@@ -54,15 +66,24 @@ newdb.c: db.sql
        echo ", 0};" >> $@
 
 lib/sqlite3.o: lib/sqlite3.c lib/config.h
-       $(CC) $(CFLAGS) -D_HAVE_SQLITE_CONFIG_H=1 -c -o $@ $<
+       $(CC) -Wall -std=c99 -Ilib -D_HAVE_SQLITE_CONFIG_H=1 -c -o $@ $<
 
 $(LZMAOBJ):
-       $(CC) $(CFLAGS) $(LZMAFLAGS) -c -o $@ $<
+       $(CC) $(CFLAGS) $(LZMAFLAGS) -c -o $@ $*.c
+
+lib/zpm.o: newdb.c
 
-libzpm.a: lib/sha256.o lib/db.o lib/compress.o lib/uncompress.o newdb.o lib/zpm.o \
+zpm-vercmp: zpm-vercmp.o lib/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 \
+       lib/vercmp.o \
        $(LZMAOBJ)
-       ar rcuv $@ $+
+       ar rcuv $@ $?
+
+libelf.a: elf/libelf.o
+       ar rcuv $@ $?
 
 install: elftype
        install -D zpm $(DESTDIR)/bin/zpm
@@ -79,4 +100,4 @@ install: elftype
        #SPOOL=$(DESTDIR)/var/lib/admin/notes ./zpm-sequence -c notes
 
 clean:
-       rm -f *.o lib/*.o $(LZMAOBJ) liblzma.a zpm-addfile soname
+       rm -f *.o lib/*.o $(LZMAOBJ) liblzma.a libelf.a libzpm.a zpm-addfile soname