Clean up thirdparty / system library makefile variables.

3 files changed, 66 insertions, 29 deletions

diff --git a/Makefile b/Makefile
index 8dfe4d96..7cfbdb3d 100644
--- a/Makefile
+++ b/Makefile
@@ -13,18 +13,30 @@ default: all
 # XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that
 # set a variable that was set on the command line.
 CFLAGS += $(XCFLAGS) -Ifitz -Ipdf -Ixps -Icbz -Iimage -Iucdn -Iscripts
-LIBS += $(XLIBS) -lfreetype -ljbig2dec -ljpeg -lopenjpeg -lz -lm
+LIBS += $(XLIBS) -lm
 LIBS_V8 = $(LIBS) $(V8LIBS)
 
 include Makerules
 include Makethird
 
-THIRD_LIBS := $(FREETYPE_LIB)
+THIRD_LIBS += $(FREETYPE_LIB)
 THIRD_LIBS += $(JBIG2DEC_LIB)
 THIRD_LIBS += $(JPEG_LIB)
 THIRD_LIBS += $(OPENJPEG_LIB)
 THIRD_LIBS += $(ZLIB_LIB)
 
+LIBS += $(FREETYPE_LIBS)
+LIBS += $(JBIG2DEC_LIBS)
+LIBS += $(JPEG_LIBS)
+LIBS += $(OPENJPEG_LIBS)
+LIBS += $(ZLIB_LIBS)
+
+CFLAGS += $(FREETYPE_CFLAGS)
+CFLAGS += $(JBIG2DEC_CFLAGS)
+CFLAGS += $(JPEG_CFLAGS)
+CFLAGS += $(OPENJPEG_CFLAGS)
+CFLAGS += $(ZLIB_CFLAGS)
+
 ifeq "$(verbose)" ""
 QUIET_AR = @ echo ' ' ' ' AR $@ ;
 QUIET_CC = @ echo ' ' ' ' CC $@ ;
@@ -180,12 +192,12 @@ ifeq "$(NOX11)" ""
 MUVIEW := $(OUT)/mupdf
 $(MUVIEW) : $(FITZ_LIB) $(THIRD_LIBS)
 $(MUVIEW) : $(addprefix $(OUT)/, x11_main.o x11_image.o pdfapp.o)
-	$(LINK_CMD) $(SYS_X11_LIBS)
+	$(LINK_CMD) $(X11_LIBS)
 
 MUVIEW_V8 := $(OUT)/mupdf-v8
 $(MUVIEW_V8) : $(FITZ_V8_LIB) $(THIRD_LIBS)
 $(MUVIEW_V8) : $(addprefix $(OUT)/, x11_main.o x11_image.o pdfapp.o)
-	$(LINK_V8_CMD) $(SYS_X11_LIBS)
+	$(LINK_V8_CMD) $(X11_LIBS)
 endif
 
 MUJSTEST_V8 := $(OUT)/mujstest-v8
diff --git a/Makerules b/Makerules
index 82a664b4..4f849f95 100644
--- a/Makerules
+++ b/Makerules
@@ -25,17 +25,31 @@ endif
 
 # Mac OS X doesn't have pkg-config so we hard code paths.
 ifeq "$(OS)" "Darwin"
-SYS_FREETYPE_CFLAGS = -I/usr/X11R6/include/freetype2
 SYS_X11_CFLAGS = -I/usr/X11R6/include
 SYS_X11_LIBS = -L/usr/X11R6/lib -lX11 -lXext
+
+SYS_FREETYPE_CFLAGS = -I/usr/X11R6/include/freetype2
+SYS_FREETYPE_LIBS = -lfreetype
+SYS_OPENJPEG_LIBS = -lopenjpeg
+SYS_JBIG2DEC_LIBS = -ljbig2dec
+SYS_JPEG_LIBS = -ljpeg
+SYS_ZLIB_LIBS = -lz
+
 RANLIB_CMD = ranlib $@
 
-# Other Unixes use pkg-config for system third party libs
+# Other Unixes use pkg-config for system libraries.
 else
-SYS_FREETYPE_CFLAGS = $(shell pkg-config --cflags freetype2)
-SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjpeg1)
 SYS_X11_CFLAGS = $(shell pkg-config --cflags x11 xext)
 SYS_X11_LIBS = $(shell pkg-config --libs x11 xext)
+
+SYS_FREETYPE_CFLAGS = $(shell pkg-config --cflags freetype2)
+SYS_FREETYPE_LIBS = $(shell pkg-config --libs freetype2)
+SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjpeg1)
+SYS_OPENJPEG_LIBS = $(shell pkg-config --libs libopenjpeg1)
+SYS_JBIG2DEC_LIBS = -ljbig2dec
+SYS_JPEG_LIBS = -ljpeg
+SYS_ZLIB_LIBS = -lz
+
 endif
 
 # The following section is an example of how to simply do cross-compilation
@@ -105,4 +119,3 @@ RANLIB_CMD = $(PLATFORM_DEVELOPER_BIN_DIR)/ranlib $@
 CROSSCOMPILE=yes
 NOX11=yes
 endif
-
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