2 files changed, 24 insertions, 25 deletions
diff --git a/Makerules b/Makerules
index 106957d3..7f4dcefb 100644
--- a/Makerules
+++ b/Makerules
@@ -23,31 +23,19 @@ else
 $(error unknown build setting: '$(build)')
 endif
 
-ifeq "$(OS)" "Linux"
-SYS_FREETYPE_INC := $(shell pkg-config --cflags freetype2)
-SYS_OPENJPEG_INC := $(shell pkg-config --cflags libopenjpeg)
-X11_LIBS := $(shell pkg-config --libs x11 xext)
-endif
-
-ifeq "$(OS)" "FreeBSD"
-SYS_FREETYPE_INC := $(shell pkg-config --cflags freetype2)
-LDFLAGS += -L/usr/local/lib
-X11_LIBS := $(shell pkg-config --libs x11 xext)
-endif
-
-ifeq "$(OS)" "SunOS"
-SYS_FREETYPE_INC := $(shell pkg-config --cflags freetype2)
-LDFLAGS += -L/usr/local/lib
-X11_LIBS := $(shell pkg-config --libs x11 xext)
-endif
-
-# Mac OS X build depends on some thirdparty libs
+# Mac OS X doesn't have pkg-config so we hard code paths.
 ifeq "$(OS)" "Darwin"
-SYS_FREETYPE_INC := -I/usr/X11R6/include/freetype2
-CFLAGS += -I/usr/X11R6/include
-LDFLAGS += -L/usr/X11R6/lib
+SYS_FREETYPE_CFLAGS = -I/usr/X11R6/include/freetype2
+SYS_X11_CFLAGS = -I/usr/X11R6/include
+SYS_X11_LIBS = -L/usr/X11R6/lib -lX11 -lXext
 RANLIB_CMD = ranlib $@
-X11_LIBS := -lX11 -lXext
+
+# Other Unixes use pkg-config for system third party libs
+else
+SYS_FREETYPE_CFLAGS = $(shell pkg-config --cflags freetype2)
+SYS_OPENJPEG_CFLAGS = $(shell pkg-config --cflags libopenjpeg)
+SYS_X11_CFLAGS = $(shell pkg-config --cflags x11 xext)
+SYS_X11_LIBS = $(shell pkg-config --libs x11 xext)
 endif
 
 # The following section is an example of how to simply do cross-compilation
diff --git a/Makethird b/Makethird
index 1646d965..832b0645 100644
--- a/Makethird
+++ b/Makethird
@@ -105,7 +105,8 @@ $(OUT)/ft_%.o: $(FREETYPE_DIR)/src/type1/%.c	| $(OUT)
 	$(CC_CMD) $(FT_CFLAGS)
 
 else
-CFLAGS += $(SYS_FREETYPE_INC)
+SYS_FREETYPE_CFLAGS := $(SYS_FREETYPE_CFLAGS)
+CFLAGS += $(SYS_FREETYPE_CFLAGS)
 endif
 
 # --- JBIG2DEC ---
@@ -218,7 +219,8 @@ $(OPENJPEG_LIB): $(addprefix $(OUT)/opj_, $(OPENJPEG_SRC:%.c=%.o))
 $(OUT)/opj_%.o: $(OPENJPEG_DIR)/libopenjpeg/%.c | $(OUT)
 	$(CC_CMD) -DOPJ_STATIC
 else
-CFLAGS += $(SYS_OPENJPEG_INC)
+SYS_OPENJPEG_CFLAGS := $(SYS_OPENJPEG_CFLAGS)
+CFLAGS += $(SYS_OPENJPEG_CFLAGS)
 endif
 
 # --- ZLIB ---
@@ -244,3 +246,12 @@ $(ZLIB_LIB): $(addprefix $(OUT)/zlib_, $(ZLIB_SRC:%.c=%.o))
 $(OUT)/zlib_%.o: $(ZLIB_DIR)/%.c | $(OUT)
 	$(CC_CMD)
 endif
+
+# --- X11 ---
+
+ifeq "$(NOX11)" ""
+SYS_X11_CFLAGS := $(SYS_X11_CFLAGS)
+SYS_X11_LIBS := $(SYS_X11_LIBS)
+CFLAGS += $(SYS_X11_CFLAGS)
+LIBS += $(SYS_X11_LIBS)
+endif