[freetype2] master 783cbcd: [mac] Fix Savannah bug #48417.

[suzuki toshiya]

branch: master
commit 783cbcd67dee48e431cea376e16d350dcbfcb317
Author: suzuki toshiya <address@hidden>
Commit: suzuki toshiya <address@hidden>

    [mac] Fix Savannah bug #48417.
    
    Mac OS X linker throws errors when `-exported_symbol_list' input
    file includes non-existing symbols.  Reported by Ryan Schmidt.
    
    * builds/exports.mk: Exclude ftmac.h from the headers for apinames
    by default.  Include it when ftmac.c would be compiled.
---
 ChangeLog         |   10 ++++++++++
 builds/exports.mk |    6 +++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 7761f37..8cf5015 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2016-07-07  suzuki toshiya  <address@hidden>
+
+       [mac] Fix Savannah bug #48417.
+
+       Mac OS X linker throws errors when `-exported_symbol_list' input
+       file includes non-existing symbols.  Reported by Ryan Schmidt.
+
+       * builds/exports.mk: Exclude ftmac.h from the headers for apinames
+       by default.  Include it when ftmac.c would be compiled.
+
 2016-07-06  Werner Lemberg  <address@hidden>
 
        * src/truetype/ttinterp.c (TInstruction_Function): Removed, unused.
diff --git a/builds/exports.mk b/builds/exports.mk
index 9685f1f..d5a5085 100644
--- a/builds/exports.mk
+++ b/builds/exports.mk
@@ -40,7 +40,11 @@ ifneq ($(EXPORTS_LIST),)
   endif
 
   # The list of public headers we're going to parse.
-  PUBLIC_HEADERS := $(wildcard $(PUBLIC_DIR)/*.h)
+  PUBLIC_HEADERS := $(filter-out $(PUBLIC_DIR)/ftmac.h, \
+                                 $(wildcard $(PUBLIC_DIR)/*.h))
+  ifneq ($(ftmac_c),)
+    PUBLIC_HEADERS += $(PUBLIC_DIR)/ftmac.h
+  endif
 
   # The `apinames' source and executable.  We use $E_BUILD as the host
   # executable suffix, which *includes* the final dot.