From c3f91d1a12a6fadaedd2e06de2566881b8a49e16 Mon Sep 17 00:00:00 2001 From: Mark Adler Date: Sun, 29 May 2016 22:09:41 -0700 Subject: [PATCH] Put libraries at end of load commands for as-needed use case. --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 6524ef3..5d8ea89 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,12 @@ CC=cc CFLAGS=-O3 -Wall -Wextra -LDFLAGS=-lz +LDFLAGS= +LIBS=-lm -lpthread -lz ZOPFLI=zopfli/src/zopfli/ # use gcc and gmake on Solaris pigz: pigz.o yarn.o try.o ${ZOPFLI}deflate.o ${ZOPFLI}blocksplitter.o ${ZOPFLI}tree.o ${ZOPFLI}lz77.o ${ZOPFLI}cache.o ${ZOPFLI}hash.o ${ZOPFLI}util.o ${ZOPFLI}squeeze.o ${ZOPFLI}katajainen.o - $(CC) $(LDFLAGS) -o pigz $^ -lpthread -lm + $(CC) $(LDFLAGS) -o pigz $^ $(LIBS) ln -f pigz unpigz pigz.o: pigz.c yarn.h try.h ${ZOPFLI}deflate.h ${ZOPFLI}util.h @@ -35,7 +36,7 @@ ${ZOPFLI}katajainen.o: ${ZOPFLI}katajainen.c ${ZOPFLI}katajainen.h dev: pigz pigzt pigzn pigzt: pigzt.o yarnt.o try.o ${ZOPFLI}deflate.o ${ZOPFLI}blocksplitter.o ${ZOPFLI}tree.o ${ZOPFLI}lz77.o ${ZOPFLI}cache.o ${ZOPFLI}hash.o ${ZOPFLI}util.o ${ZOPFLI}squeeze.o ${ZOPFLI}katajainen.o - $(CC) $(LDFLAGS) -o pigzt $^ -lpthread -lm + $(CC) $(LDFLAGS) -o pigzt $^ $(LIBS) pigzt.o: pigz.c yarn.h try.h $(CC) $(CFLAGS) -DDEBUG -g -c -o pigzt.o pigz.c @@ -44,7 +45,7 @@ yarnt.o: yarn.c yarn.h $(CC) $(CFLAGS) -DDEBUG -g -c -o yarnt.o yarn.c pigzn: pigzn.o tryn.o ${ZOPFLI}deflate.o ${ZOPFLI}blocksplitter.o ${ZOPFLI}tree.o ${ZOPFLI}lz77.o ${ZOPFLI}cache.o ${ZOPFLI}hash.o ${ZOPFLI}util.o ${ZOPFLI}squeeze.o ${ZOPFLI}katajainen.o - $(CC) $(LDFLAGS) -o pigzn $^ -lm + $(CC) $(LDFLAGS) -o pigzn $^ $(LIBS) pigzn.o: pigz.c try.h $(CC) $(CFLAGS) -DDEBUG -DNOTHREAD -g -c -o pigzn.o pigz.c