commit 3a701d548362812f9c9b21e960c7abe50989a33e parent 17f09e2cea4dda0f54841f7a273e347b53f4996e Author: Laslo Hunhold <dev@frign.de> Date: Fri, 14 Apr 2017 16:04:14 +0200 Add PNG-LDFLAGS and JPG-LDFLAGS in config.mk instead of per-tool-settings. Diffstat:
| M | Makefile | | | 5 | +++++ |
| M | config.mk | | | 7 | ++----- |
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile @@ -11,6 +11,11 @@ SCR = 2ff MAN1 = 2ff.1 $(BIN:=.1) MAN5 = farbfeld.5 +png2ff-LDFLAGS = $(PNG-LDFLAGS) +ff2png-LDFLAGS = $(PNG-LDFLAGS) +jpg2ff-LDFLAGS = $(JPG-LDFLAGS) +ff2jpg-LDFLAGS = $(JPG-LDFLAGS) + all: $(BIN) $(BIN): $(REQ:=.o) diff --git a/config.mk b/config.mk @@ -11,11 +11,8 @@ MANPREFIX = ${PREFIX}/man CPPFLAGS = -D_DEFAULT_SOURCE CFLAGS = -std=c99 -pedantic -Wall -Wextra -Os LDFLAGS = -s - -png2ff-LDFLAGS = -lpng -ff2png-LDFLAGS = -lpng -jpg2ff-LDFLAGS = -ljpeg -ff2jpg-LDFLAGS = -ljpeg +PNG-LDFLAGS = -lpng +JPG-LDFLAGS = -ljpeg # compiler and linker CC = cc