Clean up thirdparty / system library makefile variables.

1 files changed, 32 insertions, 20 deletions

diff --git a/Makethird b/Makethird
index 1e044b81..db3a9cee 100644
--- a/Makethird
+++ b/Makethird
@@ -48,8 +48,7 @@ endif
 # --- FreeType 2 ---
 
 ifneq "$(wildcard $(FREETYPE_DIR)/README)" ""
-CFLAGS += -I$(FREETYPE_DIR)/include
-LIBS := $(filter-out -lfreetype, $(LIBS))
+
 FREETYPE_LIB := $(OUT)/libfreetype.a
 
 FREETYPE_SRC := \
@@ -104,16 +103,16 @@ $(OUT)/ft_%.o: $(FREETYPE_DIR)/src/truetype/%.c	| $(OUT)
 $(OUT)/ft_%.o: $(FREETYPE_DIR)/src/type1/%.c	| $(OUT)
 	$(CC_CMD) $(FT_CFLAGS)
 
+FREETYPE_CFLAGS := -I$(FREETYPE_DIR)/include
 else
-SYS_FREETYPE_CFLAGS := $(SYS_FREETYPE_CFLAGS)
-CFLAGS += $(SYS_FREETYPE_CFLAGS)
+FREETYPE_CFLAGS := $(SYS_FREETYPE_CFLAGS)
+FREETYPE_LIBS := $(SYS_FREETYPE_LIBS)
 endif
 
 # --- JBIG2DEC ---
 
 ifneq "$(wildcard $(JBIG2DEC_DIR)/README)" ""
-CFLAGS += -I$(JBIG2DEC_DIR)
-LIBS := $(filter-out -ljbig2dec, $(LIBS))
+
 JBIG2DEC_LIB := $(OUT)/libjbig2dec.a
 
 JBIG2DEC_SRC := \
@@ -136,13 +135,17 @@ JBIG2DEC_SRC := \
 $(JBIG2DEC_LIB): $(addprefix $(OUT)/, $(JBIG2DEC_SRC:%.c=%.o))
 $(OUT)/%.o: $(JBIG2DEC_DIR)/%.c | $(OUT)
 	$(CC_CMD) -DHAVE_STDINT_H
+
+JBIG2DEC_CFLAGS := -I$(JBIG2DEC_DIR)
+else
+JBIG2DEC_CFLAGS := $(SYS_JBIG2DEC_CFLAGS)
+JBIG2DEC_LIBS := $(SYS_JBIG2DEC_LIBS)
 endif
 
 # --- JPEG library from IJG ---
 
 ifneq "$(wildcard $(JPEG_DIR)/README)" ""
-CFLAGS += -I$(JPEG_DIR)
-LIBS := $(filter-out -ljpeg, $(LIBS))
+
 JPEG_LIB := $(OUT)/libjpeg.a
 
 JPEG_SRC := \
@@ -181,13 +184,17 @@ JPEG_SRC := \
 $(JPEG_LIB): $(addprefix $(OUT)/jpeg_, $(JPEG_SRC:%.c=%.o))
 $(OUT)/jpeg_%.o: $(JPEG_DIR)/%.c | $(OUT)
 	$(CC_CMD) -Dmain=xxxmain
+
+JPEG_CFLAGS := -I$(JPEG_DIR)
+else
+JPEG_CFLAGS := $(SYS_JPEG_CFLAGS)
+JPEG_LIBS := $(SYS_JPEG_LIBS)
 endif
 
 # --- OpenJPEG ---
 
 ifneq "$(wildcard $(OPENJPEG_DIR)/README)" ""
-CFLAGS += -I$(OPENJPEG_DIR)/src/lib/openjp2
-LIBS := $(filter-out -lopenjpeg, $(LIBS))
+
 OPENJPEG_LIB := $(OUT)/libopenjpeg.a
 
 OPENJPEG_SRC := \
@@ -219,16 +226,17 @@ OPENJPEG_SRC := \
 $(OPENJPEG_LIB): $(addprefix $(OUT)/opj_, $(OPENJPEG_SRC:%.c=%.o))
 $(OUT)/opj_%.o: $(OPENJPEG_DIR)/src/lib/openjp2/%.c | $(OUT)
 	$(CC_CMD) -DOPJ_STATIC -DOPJ_HAVE_STDINT_H
+
+OPENJPEG_CFLAGS += -I$(OPENJPEG_DIR)/src/lib/openjp2
 else
-SYS_OPENJPEG_CFLAGS := $(SYS_OPENJPEG_CFLAGS)
-CFLAGS += $(SYS_OPENJPEG_CFLAGS)
+OPENJPEG_CFLAGS := $(SYS_OPENJPEG_CFLAGS)
+OPENJPEG_LIBS := $(SYS_OPENJPEG_LIBS)
 endif
 
 # --- ZLIB ---
 
 ifneq "$(wildcard $(ZLIB_DIR)/README)" ""
-CFLAGS += -I$(ZLIB_DIR) -Dverbose=-1
-LIBS := $(filter-out -lz, $(LIBS))
+
 ZLIB_LIB := $(OUT)/libz.a
 
 ZLIB_SRC := \
@@ -245,16 +253,20 @@ ZLIB_SRC := \
 
 $(ZLIB_LIB): $(addprefix $(OUT)/zlib_, $(ZLIB_SRC:%.c=%.o))
 $(OUT)/zlib_%.o: $(ZLIB_DIR)/%.c | $(OUT)
-	$(CC_CMD)
+	$(CC_CMD) -Dverbose=-1
+
+ZLIB_CFLAGS := -I$(ZLIB_DIR)
+else
+ZLIB_CFLAGS := $(SYS_ZLIB_CFLAGS)
+ZLIB_LIBS := $(SYS_ZLIB_LIBS)
 endif
 
 # --- X11 ---
 
 ifeq "$(NOX11)" ""
-SYS_X11_CFLAGS := $(SYS_X11_CFLAGS)
-SYS_X11_LIBS := $(SYS_X11_LIBS)
-CFLAGS += $(SYS_X11_CFLAGS)
+X11_CFLAGS := $(SYS_X11_CFLAGS)
+X11_LIBS := $(SYS_X11_LIBS)
 else
-SYS_X11_CFLAGS :=
-SYS_X11_LIBS :=
+X11_CFLAGS :=
+X11_LIBS :=
 endif