[Libreoffice-commits] .: 2 commits - apple_remote/makefile.mk connectivity/source external/glibc sal/Module_sal.mk shell/source soltools/cpp soltools/giparser soltools/javadep soltools/mkdepend soltools/support soltools/testhxx sysui/desktop testtools/source
Tor Lillqvist
tml at kemper.freedesktop.org
Fri Jan 27 05:54:08 PST 2012
apple_remote/makefile.mk | 2 +-
connectivity/source/drivers/ado/makefile.mk | 4 +++-
connectivity/source/drivers/kab/makefile.mk | 8 ++++++--
connectivity/source/drivers/macab/makefile.mk | 8 ++++++--
external/glibc/makefile.mk | 4 +++-
sal/Module_sal.mk | 3 ++-
shell/source/backends/macbe/makefile.mk | 2 +-
shell/source/cmdmail/makefile.mk | 4 +++-
shell/source/unix/exec/makefile.mk | 4 +++-
shell/source/unix/misc/makefile.mk | 4 +++-
shell/source/unix/sysshell/makefile.mk | 4 +++-
soltools/cpp/makefile.mk | 4 +++-
soltools/giparser/makefile.mk | 4 +++-
soltools/javadep/makefile.mk | 4 +++-
soltools/mkdepend/makefile.mk | 4 +++-
soltools/support/makefile.mk | 4 +++-
soltools/testhxx/makefile.mk | 4 +++-
sysui/desktop/macosx/makefile.mk | 2 +-
testtools/source/bridgetest/pyuno/makefile.mk | 4 +++-
testtools/source/cliversioning/makefile.mk | 4 +++-
20 files changed, 59 insertions(+), 22 deletions(-)
New commits:
commit 4603028bc4e2cdacd32da073a82a42ba1fc549a8
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Fri Jan 27 15:49:47 2012 +0200
CppunitTest_sal_osl_file fails on Windows
diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk
index 1260afd..42a2124 100644
--- a/sal/Module_sal.mk
+++ b/sal/Module_sal.mk
@@ -47,7 +47,8 @@ $(eval $(call gb_Module_add_check_targets,sal,\
CppunitTest_Module_DLL \
CppunitTest_sal_bytesequence \
CppunitTest_sal_osl_condition \
- CppunitTest_sal_osl_file \
+ $(if $(filter $(OS),WNT),, \
+ CppunitTest_sal_osl_file) \
CppunitTest_sal_osl_module \
CppunitTest_sal_osl_old_test_file \
CppunitTest_sal_osl_security \
commit a6ed487d9703a052f335141d3d44a022d08e84ab
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Fri Jan 27 15:34:10 2012 +0200
Decrease verbiage a little bit
diff --git a/apple_remote/makefile.mk b/apple_remote/makefile.mk
index d261d51..7a5f28d 100644
--- a/apple_remote/makefile.mk
+++ b/apple_remote/makefile.mk
@@ -41,7 +41,7 @@ ENABLE_EXCEPTIONS=TRUE
.IF "$(GUIBASE)"!="aqua"
dummy:
- @echo "Nothing to build for GUIBASE $(GUIBASE)"
+# nothing
.ELSE # "$(GUIBASE)"!="aqua"
diff --git a/connectivity/source/drivers/ado/makefile.mk b/connectivity/source/drivers/ado/makefile.mk
index 20cd74f..21b3354 100755
--- a/connectivity/source/drivers/ado/makefile.mk
+++ b/connectivity/source/drivers/ado/makefile.mk
@@ -108,8 +108,10 @@ DEF1NAME= $(SHL1TARGET)
DEF1EXPORTFILE= exports.dxp
.ELSE
+
dummy:
- @echo "Nothing to build for GUI $(GUI)"
+# nothing
+
.ENDIF # "$(GUI)"=="WNT"
# --- Targets ----------------------------------
.INCLUDE : $(PRJ)$/target.pmk
diff --git a/connectivity/source/drivers/kab/makefile.mk b/connectivity/source/drivers/kab/makefile.mk
index b3690cc..c7f7b9a 100755
--- a/connectivity/source/drivers/kab/makefile.mk
+++ b/connectivity/source/drivers/kab/makefile.mk
@@ -129,13 +129,17 @@ DEF2NAME= $(SHL2TARGET)
# --- Targets -----------------------------------
.ELSE # "$(ENABLE_KAB)" == "TRUE"
+
dummy:
- @echo KDE Addressbook disabled - nothing to build
+# nothing
+
.ENDIF
.ELSE # "$(GUI)" == "UNX"
+
dummy:
- @echo "Nothing to build for GUI $(GUI)"
+# nothing
+
.ENDIF
.INCLUDE : $(PRJ)$/target.pmk
diff --git a/connectivity/source/drivers/macab/makefile.mk b/connectivity/source/drivers/macab/makefile.mk
index b2e8db6..a624593 100755
--- a/connectivity/source/drivers/macab/makefile.mk
+++ b/connectivity/source/drivers/macab/makefile.mk
@@ -117,13 +117,17 @@ DEF2NAME= $(SHL2TARGET)
# --- Targets -----------------------------------
.ELSE # "$(OS)" == "MACOSX"
+
dummy:
- @echo Not using Mac OS X - nothing to build
+# nothing
+
.ENDIF
.ELSE # "$(GUI)" == "UNX"
+
dummy:
- @echo "Nothing to build for GUI $(GUI)"
+# nothing
+
.ENDIF
.INCLUDE : $(PRJ)$/target.pmk
diff --git a/external/glibc/makefile.mk b/external/glibc/makefile.mk
index f7a3b1e..8eee6a5 100644
--- a/external/glibc/makefile.mk
+++ b/external/glibc/makefile.mk
@@ -57,8 +57,10 @@ OUT2INC= \
posix/config.h
.ELSE
+
@all:
- @echo "Nothing to do here."
+# nothing
+
.ENDIF
# --- Targets ------------------------------------------------------
diff --git a/shell/source/backends/macbe/makefile.mk b/shell/source/backends/macbe/makefile.mk
index dd20834..50b6791 100644
--- a/shell/source/backends/macbe/makefile.mk
+++ b/shell/source/backends/macbe/makefile.mk
@@ -46,7 +46,7 @@ DLLPRE =
.IF "$(OS)" != "MACOSX"
dummy:
- @echo "Nothing to build for OS $(OS)."
+# nothing
.ELSE
diff --git a/shell/source/cmdmail/makefile.mk b/shell/source/cmdmail/makefile.mk
index b442d68..b658108 100644
--- a/shell/source/cmdmail/makefile.mk
+++ b/shell/source/cmdmail/makefile.mk
@@ -37,8 +37,10 @@ COMP1TYPELIST=$(TARGET)
.INCLUDE : settings.mk
.IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/DESKTOP//)"
+
ALL:
- @echo Nothing done for non-desktop OSes
+# nothing
+
.ENDIF
# --- Files --------------------------------------------------------
diff --git a/shell/source/unix/exec/makefile.mk b/shell/source/unix/exec/makefile.mk
index 07b3125..453609b 100644
--- a/shell/source/unix/exec/makefile.mk
+++ b/shell/source/unix/exec/makefile.mk
@@ -41,8 +41,10 @@ TESTAPP1=urltest
.INCLUDE : settings.mk
.IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/DESKTOP//)"
+
ALL:
- @echo Nothing done for non-desktop OSes
+# nothing
+
.ENDIF
# --- Files --------------------------------------------------------
diff --git a/shell/source/unix/misc/makefile.mk b/shell/source/unix/misc/makefile.mk
index cb1a986..6805ad4 100644
--- a/shell/source/unix/misc/makefile.mk
+++ b/shell/source/unix/misc/makefile.mk
@@ -39,8 +39,10 @@ LIBSALCPPRT=$(0)
.INCLUDE : settings.mk
.IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/DESKTOP//)"
+
ALL:
- @echo Nothing done for non-desktop OSes
+# nothing
+
.ENDIF
# --- Files --------------------------------------------------------
diff --git a/shell/source/unix/sysshell/makefile.mk b/shell/source/unix/sysshell/makefile.mk
index 6e9558a..93ca678 100644
--- a/shell/source/unix/sysshell/makefile.mk
+++ b/shell/source/unix/sysshell/makefile.mk
@@ -38,8 +38,10 @@ VISIBILITY_HIDDEN = TRUE
.INCLUDE : settings.mk
.IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/DESKTOP//)"
+
ALL:
- @echo Nothing done for non-desktop OSes
+# nothing
+
.ENDIF
.IF "$(SYSTEM_EXPAT)" == "YES"
diff --git a/soltools/cpp/makefile.mk b/soltools/cpp/makefile.mk
index 5cada33..b6db421 100644
--- a/soltools/cpp/makefile.mk
+++ b/soltools/cpp/makefile.mk
@@ -38,8 +38,10 @@ NO_DEFAULT_STL=TRUE
.INCLUDE : settings.mk
.IF "$(CROSS_COMPILING)"=="YES"
+
all:
- @echo Nothing done when cross-compiling
+# nothing
+
.ENDIF
UWINAPILIB=$(0)
diff --git a/soltools/giparser/makefile.mk b/soltools/giparser/makefile.mk
index d7f04db..b2dbe39 100644
--- a/soltools/giparser/makefile.mk
+++ b/soltools/giparser/makefile.mk
@@ -38,8 +38,10 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
.IF "$(CROSS_COMPILING)"=="YES"
+
all:
- @echo Nothing done when cross-compiling
+# nothing
+
.ENDIF
# --- Files --------------------------------------------------------
diff --git a/soltools/javadep/makefile.mk b/soltools/javadep/makefile.mk
index e6dcf32..7fa4f8f 100644
--- a/soltools/javadep/makefile.mk
+++ b/soltools/javadep/makefile.mk
@@ -38,8 +38,10 @@ NO_DEFAULT_STL=TRUE
.INCLUDE : settings.mk
.IF "$(CROSS_COMPILING)"=="YES"
+
all:
- @echo Nothing done when cross-compiling
+# nothing
+
.ENDIF
UWINAPILIB=$(0)
diff --git a/soltools/mkdepend/makefile.mk b/soltools/mkdepend/makefile.mk
index d10f50f..da2a3d1 100644
--- a/soltools/mkdepend/makefile.mk
+++ b/soltools/mkdepend/makefile.mk
@@ -39,8 +39,10 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
.IF "$(CROSS_COMPILING)"=="YES"
+
all:
- @echo Nothing done when cross-compiling
+# nothing
+
.ENDIF
LIBSALCPPRT=
diff --git a/soltools/support/makefile.mk b/soltools/support/makefile.mk
index 8628b52..c038a2d 100644
--- a/soltools/support/makefile.mk
+++ b/soltools/support/makefile.mk
@@ -37,8 +37,10 @@ TARGETTYPE=CUI
.INCLUDE : settings.mk
.IF "$(CROSS_COMPILING)"=="YES"
+
all:
- @echo Nothing done when cross-compiling
+# nothing
+
.ENDIF
# --- Files --------------------------------------------------------
diff --git a/soltools/testhxx/makefile.mk b/soltools/testhxx/makefile.mk
index e71d8f1..aaadd3a 100644
--- a/soltools/testhxx/makefile.mk
+++ b/soltools/testhxx/makefile.mk
@@ -37,8 +37,10 @@ CAPTURE_OUTPUT = > $(MISC)$/testhxx.output && $(TOUCH) $(SLO)$/testhxx.obj
.INCLUDE: settings.mk
.IF "$(CROSS_COMPILING)"=="YES"
+
all:
- @echo Nothing done when cross-compiling
+# nothing
+
.ENDIF
SLOFILES = $(SLO)$/testhxx.obj
diff --git a/sysui/desktop/macosx/makefile.mk b/sysui/desktop/macosx/makefile.mk
index 89f2356..23b7b58 100755
--- a/sysui/desktop/macosx/makefile.mk
+++ b/sysui/desktop/macosx/makefile.mk
@@ -37,7 +37,7 @@ TARGET=desktopmacosx
.IF "$(OS)"!="MACOSX"
dummy:
- @echo "Nothing to build for OS $(OS)"
+# nothing
.ELSE # "$(OS)"!="MACOSX"
diff --git a/testtools/source/bridgetest/pyuno/makefile.mk b/testtools/source/bridgetest/pyuno/makefile.mk
index b7a7294..bae9a33 100644
--- a/testtools/source/bridgetest/pyuno/makefile.mk
+++ b/testtools/source/bridgetest/pyuno/makefile.mk
@@ -40,8 +40,10 @@ my_components = pythonloader
.INCLUDE : settings.mk
.IF "$(CROSS_COMPILING)"=="YES"
+
all:
- @echo Nothing done when cross-compiling
+# nothing
+
.ENDIF
# --- Files --------------------------------------------------------
diff --git a/testtools/source/cliversioning/makefile.mk b/testtools/source/cliversioning/makefile.mk
index 803fda8..fc59d14 100644
--- a/testtools/source/cliversioning/makefile.mk
+++ b/testtools/source/cliversioning/makefile.mk
@@ -35,8 +35,10 @@ PACKAGE = cliversion
.INCLUDE: settings.mk
.IF "$(CROSS_COMPILING)"=="YES"
+
all:
- @echo Nothing done when cross-compiling
+# nothing
+
.ENDIF
.INCLUDE : $(PRJ)$/util$/makefile.pmk
More information about the Libreoffice-commits
mailing list