configure.ac | 5 ----- scp2/source/gnome/module_gnome.scp | 5 ++--- solenv/gbuild/InstallModuleTarget.mk | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-)
New commits: commit 7740e945e0c74d057c424cced079adc766cc5604 Author: Matúš Kukan <matus.ku...@gmail.com> Date: Sun Dec 11 00:09:01 2016 +0100 gid_File_Bin_Gnome_Open_Url was removed ..in eaa7f30102df4df01171e5daf83cdddae1bb0cda Change-Id: I149ee4087dffe54fd63bacd3bb5aba67159fac72 diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp index e1c5862..200c300 100644 --- a/scp2/source/gnome/module_gnome.scp +++ b/scp2/source/gnome/module_gnome.scp @@ -27,11 +27,10 @@ Module gid_Module_Optional_Gnome PackageInfo = "packinfo_office.txt"; MOD_NAME_DESC(MODULE_OPTIONAL_GNOME); Styles = (); - Files = (auto_gnome_ALL, + Files = (auto_gnome_ALL #if ENABLE_GIO - gid_File_Share_Registry_Gnome_Xcd, + ,gid_File_Share_Registry_Gnome_Xcd #endif - gid_File_Bin_Gnome_Open_Url ); End commit 1e074a455ed9c7136868f10bce3e173b22c1564b Author: Matúš Kukan <matus.ku...@gmail.com> Date: Sat Dec 10 23:53:29 2016 +0100 Remove some not used SCPDEFS Change-Id: Ib85895c21cef9baeccc468b476cbd8170ee4c9ce diff --git a/configure.ac b/configure.ac index 6607ffa..2cf3ebf 100644 --- a/configure.ac +++ b/configure.ac @@ -2477,8 +2477,6 @@ fi if test "$enable_avmedia" = yes; then BUILD_TYPE="$BUILD_TYPE AVMEDIA" AC_DEFINE(HAVE_FEATURE_AVMEDIA) -else - SCPDEFS="$SCPDEFS -DDISABLE_AVMEDIA" fi # Decide whether to build database connectivity stuff (including @@ -2539,7 +2537,6 @@ if test "$enable_dynamic_loading" = yes; then BUILD_TYPE="$BUILD_TYPE DYNLOADING" else DISABLE_DYNLOADING='TRUE' - SCPDEFS="$SCPDEFS -DDISABLE_DYNLOADING" fi AC_SUBST(DISABLE_DYNLOADING) @@ -3169,7 +3166,6 @@ fi if test "$cross_compiling" = "yes"; then export CROSS_COMPILING=TRUE - SCPDEFS="$SCPDEFS -DCROSS_COMPILING" else CROSS_COMPILING= BUILD_TYPE="$BUILD_TYPE NATIVE" @@ -7560,7 +7556,6 @@ fi ENABLE_LWP= if test "$enable_lotuswordpro" = "yes"; then ENABLE_LWP="TRUE" - SCPDEFS="$SCPDEFS -DDISABLE_LWP" fi AC_SUBST(ENABLE_LWP) diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk index 54848b0..d24b201 100644 --- a/solenv/gbuild/InstallModuleTarget.mk +++ b/solenv/gbuild/InstallModuleTarget.mk @@ -68,7 +68,7 @@ $(call gb_Output_announce,$(2),$(true),SPP,2) $(call gb_Helper_abbreviate_dirs,\ $(gb_ScpPreprocessTarget_COMMAND) \ -+ -P \ - $(SCPDEFS) $(SCP_DEFS) -DDLLPOSTFIX=$(gb_Library_DLLPOSTFIX) \ + $(SCPDEFS) $(SCP_DEFS) \ $(SCP_INCLUDE) $(SCP_TEMPLATE_INCLUDE) \ $(if $(ENABLE_JAVA),-DENABLE_JAVA) \ $(SCP_SOURCE) > $(1) \
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits