CMakeLists.txt | 3 +-- src/Makefile.am | 6 +++--- src/Makefile.sources | 12 ++++++------ 3 files changed, 10 insertions(+), 11 deletions(-)
New commits: commit cfd9f0679e88f3431c90d6de4b548055ca9b7201 Author: Behdad Esfahbod <beh...@behdad.org> Date: Fri Feb 23 10:24:47 2018 -0800 Fix "make dist" without gobject Cmake might need adjusting. diff --git a/src/Makefile.am b/src/Makefile.am index 1bf76c87..bb2c30e3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -212,13 +212,13 @@ EXTRA_DIST += harfbuzz-icu.pc.in if HAVE_GOBJECT lib_LTLIBRARIES += libharfbuzz-gobject.la libharfbuzz_gobject_la_LINK = $(chosen_linker) $(libharfbuzz_gobject_la_LDFLAGS) -libharfbuzz_gobject_la_SOURCES = $(HB_GOBJECT_sources) +libharfbuzz_gobject_la_SOURCES = $(HB_GOBJECT_DIST_sources) libharfbuzz_gobject_la_CPPFLAGS = $(HBCFLAGS) $(HBNOLIBCXXFLAGS) $(GOBJECT_CFLAGS) libharfbuzz_gobject_la_LDFLAGS = $(base_link_flags) libharfbuzz_gobject_la_LIBADD = $(GOBJECT_LIBS) libharfbuzz.la EXTRA_libharfbuzz_gobject_la_DEPENDENCIES = $(harfbuzz_gobject_def_dependency) -pkginclude_HEADERS += $(HB_GOBJECT_headers) -nodist_pkginclude_HEADERS += $(HB_GOBJECT_ENUM_headers) +pkginclude_HEADERS += $(HB_GOBJECT_DIST_headers) +nodist_pkginclude_HEADERS += $(HB_GOBJECT_NODIST_headers) pkgconfig_DATA += harfbuzz-gobject.pc BUILT_SOURCES += \ diff --git a/src/Makefile.sources b/src/Makefile.sources index 87fa807e..bf079931 100644 --- a/src/Makefile.sources +++ b/src/Makefile.sources @@ -200,9 +200,9 @@ HB_SUBSET_headers = \ hb-subset-private.hh \ $(NULL) -HB_GOBJECT_STRUCTS_sources = hb-gobject-structs.cc -HB_GOBJECT_STRUCTS_headers = hb-gobject-structs.h -HB_GOBJECT_ENUM_sources = hb-gobject-enums.cc -HB_GOBJECT_ENUM_headers = hb-gobject-enums.h -HB_GOBJECT_sources = $(HB_GOBJECT_STRUCTS_sources) $(HB_GOBJECT_ENUM_sources) -HB_GOBJECT_headers = hb-gobject.h $(HB_GOBJECT_STRUCTS_headers) $(HB_GOBJECT_ENUM_headers) +HB_GOBJECT_DIST_sources = hb-gobject-structs.cc +HB_GOBJECT_DIST_headers = hb-gobject.h hb-gobject-structs.h +HB_GOBJECT_NODIST_sources = hb-gobject-enums.cc +HB_GOBJECT_NODIST_headers = hb-gobject-enums.h +HB_GOBJECT_sources = $(HB_GOBJECT_DIST_sources) $(HB_GOBJECT_NODIST_sources) +HB_GOBJECT_headers = $(HB_GOBJECT_DIST_headers) $(HB_GOBJECT_NODIST_headers) commit 211eb33b216cd6be414ab673293c8305a7159596 Author: Ebrahim Byagowi <ebra...@gnu.org> Date: Thu Feb 22 11:26:01 2018 +0330 Remove check-defs.sh test from CMake diff --git a/CMakeLists.txt b/CMakeLists.txt index 0c19a4b9..6b4e1089 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -836,10 +836,9 @@ if (UNIX OR MINGW) ) add_test(NAME check-libstdc++.sh COMMAND ${PROJECT_SOURCE_DIR}/src/check-libstdc++.sh) add_test(NAME check-symbols.sh COMMAND ${PROJECT_SOURCE_DIR}/src/check-symbols.sh) - add_test(NAME check-defs.sh COMMAND ${PROJECT_SOURCE_DIR}/src/check-defs.sh) set_tests_properties( - check-static-inits.sh check-libstdc++.sh check-symbols.sh check-defs.sh + check-static-inits.sh check-libstdc++.sh check-symbols.sh PROPERTIES ENVIRONMENT "libs=.;srcdir=${PROJECT_SOURCE_DIR}/src" SKIP_RETURN_CODE 77) _______________________________________________ HarfBuzz mailing list HarfBuzz@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/harfbuzz