From d0d65fa2d6e1256d011982fe121ad0417e9014ca Mon Sep 17 00:00:00 2001
From: Tor Andersson <tor.andersson@artifex.com>
Date: Thu, 28 Nov 2013 15:07:03 +0100
Subject: Put thirdparty config headers in separate directories.

Only -I the config header directory if building the thirdparty library,
not if using the system library.

Fix bug 694808.
---
 Makethird | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Makethird')

diff --git a/Makethird b/Makethird
index d6db3b40..cc7478c2 100644
--- a/Makethird
+++ b/Makethird
@@ -108,7 +108,7 @@ $(FREETYPE_OUT)/%.o: $(FREETYPE_DIR)/src/truetype/%.c	| $(FREETYPE_OUT)
 $(FREETYPE_OUT)/%.o: $(FREETYPE_DIR)/src/type1/%.c	| $(FREETYPE_OUT)
 	$(CC_CMD) $(FT_CFLAGS)
 
-FREETYPE_CFLAGS := -I$(FREETYPE_DIR)/include
+FREETYPE_CFLAGS := -Iscripts/freetype -I$(FREETYPE_DIR)/include
 else
 FREETYPE_CFLAGS := $(SYS_FREETYPE_CFLAGS)
 FREETYPE_LIBS := $(SYS_FREETYPE_LIBS)
@@ -194,7 +194,7 @@ $(JPEG_OUT):
 $(JPEG_OUT)/%.o: $(JPEG_DIR)/%.c | $(JPEG_OUT)
 	$(CC_CMD) -Dmain=xxxmain
 
-JPEG_CFLAGS := -I$(JPEG_DIR)
+JPEG_CFLAGS := -Iscripts/jpeg -I$(JPEG_DIR)
 else
 JPEG_CFLAGS := $(SYS_JPEG_CFLAGS)
 JPEG_LIBS := $(SYS_JPEG_LIBS)
@@ -238,7 +238,7 @@ $(OPENJPEG_OUT):
 $(OPENJPEG_OUT)/%.o: $(OPENJPEG_DIR)/%.c | $(OPENJPEG_OUT)
 	$(CC_CMD) -DOPJ_STATIC -DOPJ_HAVE_STDINT_H
 
-OPENJPEG_CFLAGS += -I$(OPENJPEG_DIR)
+OPENJPEG_CFLAGS += -Iscripts/openjpeg -I$(OPENJPEG_DIR)
 else
 OPENJPEG_CFLAGS := $(SYS_OPENJPEG_CFLAGS)
 OPENJPEG_LIBS := $(SYS_OPENJPEG_LIBS)
-- 
cgit v1.2.3