diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-10-31 13:44:37 +0100 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-10-31 12:51:31 +0000 |
| commit | 8215dcfe7d59f151d30612542c8a1fb4a5f40b95 (patch) | |
| tree | b7fa45bf4344cfa640256436e7fcdbf2c9aef51d | |
| parent | 660800d6f33a01ad53fc0f5717e1c33868440d2f (diff) | |
Build only what is needed: less probability to mess up
Change-Id: I1855e3c23380883df74f29aa8282f1c57e2e45bd
Reviewed-on: https://gerrit.libreoffice.org/6512
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
| -rw-r--r-- | external/libfreehand/ExternalProject_libfreehand.mk | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/external/libfreehand/ExternalProject_libfreehand.mk b/external/libfreehand/ExternalProject_libfreehand.mk index 24bda09ee4bc..ac03a4092ef8 100644 --- a/external/libfreehand/ExternalProject_libfreehand.mk +++ b/external/libfreehand/ExternalProject_libfreehand.mk @@ -16,9 +16,8 @@ $(eval $(call gb_ExternalProject_register_targets,libfreehand,\ )) $(eval $(call gb_ExternalProject_use_externals,libfreehand,\ - boost_headers \ - libxml2 \ wpd \ + wpg \ zlib \ )) @@ -33,12 +32,10 @@ $(call gb_ExternalProject_get_state_target,libfreehand,build) : --disable-debug \ --disable-werror \ --disable-weffc \ - --without-tools \ - BOOST_CFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS))" \ - XML_CFLAGS="$(if $(filter NO,$(SYSTEM_LIBXML)),-I$(call gb_UnpackedTarball_get_dir,xml2)/include,$(LIBXML_CFLAGS))" \ - XML_LIBS="$(LIBXML_LIBS)" \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - && $(MAKE) $(if $(VERBOSE)$(verbose),V=1) \ + && (cd $(EXTERNAL_WORKDIR)/src/lib && \ + $(if $(VERBOSE)$(verbose),V=1) \ + $(MAKE)) \ ) # vim: set noet sw=4 ts=4: |