summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiltjo Posthuma <hiltjo@codemadness.org>2016-03-24 19:09:41 +0100
committerFRIGN <dev@frign.de>2016-04-03 20:39:13 +0200
commit7f295f8c100a504c305d537bd3fde6492f15ef7a (patch)
treeb8c1065460185229147f5e719d8658a6222864b3
parent264979bf52261cb461212be8978c2a4697aa2e80 (diff)
don't link against unneeded libs
- jpg2ff requires libjpeg - ff2png, png2ff requires libpng (and libz) - ff2ppm has no dependencies
-rw-r--r--Makefile16
-rw-r--r--config.mk6
2 files changed, 16 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 63b4d0a..ac85a0f 100644
--- a/Makefile
+++ b/Makefile
@@ -8,11 +8,21 @@ HDR = arg.h
MAN1 = 2ff.1 ${BIN:=.1}
MAN5 = farbfeld.5
-all: png2ff ff2png jpg2ff ff2ppm
+all: ${BIN}
+
+png2ff ff2png:
+ @echo CC $@
+ @${CC} -o $@ ${CFLAGS} ${CPPFLAGS} -L${PNGLIB} -lpng -I${PNGINC} \
+ ${LDFLAGS} $@.c
+
+jpg2ff:
+ @echo CC $@
+ @${CC} -o $@ ${CFLAGS} ${CPPFLAGS} -L${JPGLIB} -ljpeg -I${JPGINC} \
+ ${LDFLAGS} $@.c
.c:
- @echo CC $<
- @${CC} -o $@ ${CFLAGS} ${LIBS} ${LDFLAGS} $<
+ @echo CC $@
+ @${CC} -o $@ ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} $<
clean:
@echo cleaning
diff --git a/config.mk b/config.mk
index 94a4570..4ecba54 100644
--- a/config.mk
+++ b/config.mk
@@ -13,12 +13,12 @@ PNGINC = /usr/local/include
JPGLIB = /usr/local/lib
JPGINC = /usr/local/include
-INCS = -I${PNGINC} -I${JPGINC}
-LIBS = -L${PNGLIB} -L${JPGLIB} -lpng -ljpeg
+INCS =
+LIBS =
# flags
CPPFLAGS = -D_DEFAULT_SOURCE
-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS}
LDFLAGS = -s ${LIBS}
# compiler and linker