From cc0b04f48f261c1deb8f4142e7ae0222fbec67fb Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 12 Jun 2018 18:24:54 -0400 Subject: [PATCH] [subset] Remove HB_SUBSET_BUILTIN Just include hb-static.cc in libharfbuzz-subset.so source list as well. Those building it built-in will include hb-static.cc once already. No need for any gymnastics. --- src/Makefile.sources | 1 + src/hb-subset.cc | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/Makefile.sources b/src/Makefile.sources index 299af9831..0bc9e589e 100644 --- a/src/Makefile.sources +++ b/src/Makefile.sources @@ -203,6 +203,7 @@ HB_ICU_headers = hb-icu.h # Sources for libharfbuzz-subset HB_SUBSET_sources = \ + hb-static.cc \ hb-subset.cc \ hb-subset-glyf.cc \ hb-subset-input.cc \ diff --git a/src/hb-subset.cc b/src/hb-subset.cc index 4098832be..b97c7633e 100644 --- a/src/hb-subset.cc +++ b/src/hb-subset.cc @@ -44,11 +44,6 @@ #include "hb-ot-post-table.hh" -#if !defined(HB_SUBSET_BUILTIN) -#include "hb-static.cc" -#endif - - struct hb_subset_profile_t { hb_object_header_t header; ASSERT_POD ();