summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaslo Hunhold <dev@frign.de>2017-04-14 16:04:14 +0200
committerLaslo Hunhold <dev@frign.de>2017-04-14 16:04:14 +0200
commit3a701d548362812f9c9b21e960c7abe50989a33e (patch)
tree62751015d476759997876bde4efb42449bcfd279
parent17f09e2cea4dda0f54841f7a273e347b53f4996e (diff)
Add PNG-LDFLAGS and JPG-LDFLAGS in config.mk
instead of per-tool-settings.
-rw-r--r--Makefile5
-rw-r--r--config.mk7
2 files changed, 7 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 4752fb6..5bf9332 100644
--- 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
index b6b0ce4..57e9eac 100644
--- 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