basctl/Module_basctl.mk | 5 ++++- configure.in | 6 ++++++ connectivity/qa/connectivity/tools/makefile.mk | 8 ++++++-- connectivity/qa/makefile.mk | 4 +++- 4 files changed, 19 insertions(+), 4 deletions(-)
New commits: commit e52c70e051c41a1832fdc771d3c5fcdc82c96726 Author: Tor Lillqvist <t...@iki.fi> Date: Thu Feb 2 18:13:25 2012 +0200 Look for Xcode 3 also in /Xcode3 where I have it ;) diff --git a/configure.in b/configure.in index 2fb8d28..61d9bfa 100644 --- a/configure.in +++ b/configure.in @@ -2113,6 +2113,9 @@ if test "$_os" = "Darwin" ; then if test ! -d "$MACOSX_SDK_PATH"; then MACOSX_SDK_PATH="/Developer-old/SDKs/MacOSX10.4u.sdk" fi + if test ! -d "$MACOSX_SDK_PATH"; then + MACOSX_SDK_PATH="/Xcode3/SDKs/MacOSX10.4u.sdk" + fi macosx_sdk_value="1040" ;; 10.5) @@ -2120,6 +2123,9 @@ if test "$_os" = "Darwin" ; then if test ! -d "$MACOSX_SDK_PATH"; then MACOSX_SDK_PATH="/Developer-old/SDKs/MacOSX10.5.sdk" fi + if test ! -d "$MACOSX_SDK_PATH"; then + MACOSX_SDK_PATH="/Xcode3/SDKs/MacOSX10.4u.sdk" + fi macosx_sdk_value="1050" AC_MSG_WARN([Building with a SDK > 10.4 is experimental]) echo "Building with a SDK > 10.4 is experimental" >> warn commit 6ab3556b44daef93f8a504592ae1decafcd0cfe0 Author: Tor Lillqvist <t...@iki.fi> Date: Thu Feb 2 18:12:02 2012 +0200 Do Package_xml also for iOS so that packimages doesn't fail diff --git a/basctl/Module_basctl.mk b/basctl/Module_basctl.mk index 22bf325..b61cbcd 100644 --- a/basctl/Module_basctl.mk +++ b/basctl/Module_basctl.mk @@ -33,9 +33,12 @@ ifneq (IOS,$(OS)) $(eval $(call gb_Module_add_targets,basctl,\ AllLangResTarget_basctl \ Library_basctl \ - Package_xml \ )) endif +$(eval $(call gb_Module_add_targets,basctl,\ + Package_xml \ +)) + # vim: set noet sw=4 ts=4: commit aa5404b92f99541ecfe0b95168e80d705d0fc111 Author: Tor Lillqvist <t...@iki.fi> Date: Thu Feb 2 17:55:48 2012 +0200 Silence a few lines of pointless verbiage diff --git a/connectivity/qa/connectivity/tools/makefile.mk b/connectivity/qa/connectivity/tools/makefile.mk index 897a85f..4cd76ff 100755 --- a/connectivity/qa/connectivity/tools/makefile.mk +++ b/connectivity/qa/connectivity/tools/makefile.mk @@ -34,13 +34,17 @@ PACKAGE = connectivity/tools .INCLUDE: settings.mk .IF "$(SOLAR_JAVA)" == "" + all: - @echo "Java not available. Build skipped" +# nothing + .ELSE .IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/QADEVOOO//)" + all: - @echo "QADEVOO not set. Build skipped" +# nothing + .ELSE #----- compile .java files ----------------------------------------- diff --git a/connectivity/qa/makefile.mk b/connectivity/qa/makefile.mk index 76028ad..c3179d5 100755 --- a/connectivity/qa/makefile.mk +++ b/connectivity/qa/makefile.mk @@ -34,8 +34,10 @@ PACKAGE = complex/connectivity .INCLUDE: settings.mk .IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/QADEVOOO//)" + all: - @echo "QADEVOO not set. Build skipped" +# nothing + .ELSE #----- compile .java files ----------------------------------------- _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits