[Libreoffice-commits] .: sal/cppunittester sal/qa sal/systools sal/typesconfig
Tor Lillqvist
tml at kemper.freedesktop.org
Sun Jun 5 23:18:59 PDT 2011
sal/cppunittester/makefile.mk | 2 +-
sal/qa/ByteSequence/makefile.mk | 2 +-
sal/qa/OStringBuffer/makefile.mk | 2 +-
sal/qa/makefile.mk | 2 +-
sal/qa/osl/condition/makefile.mk | 2 +-
sal/qa/osl/file/makefile.mk | 2 +-
sal/qa/osl/getsystempathfromfileurl/makefile.mk | 2 +-
sal/qa/osl/module/makefile.mk | 2 +-
sal/qa/osl/process/makefile.mk | 2 +-
sal/qa/osl/security/makefile.mk | 2 +-
sal/qa/rtl/alloc/makefile.mk | 2 +-
sal/qa/rtl/cipher/makefile.mk | 2 +-
sal/qa/rtl/crc32/makefile.mk | 2 +-
sal/qa/rtl/doublelock/makefile.mk | 2 +-
sal/qa/rtl/locale/makefile.mk | 2 +-
sal/qa/rtl/oustringbuffer/makefile.mk | 2 +-
sal/qa/rtl/strings/makefile.mk | 2 +-
sal/qa/sal/makefile.mk | 2 +-
sal/systools/win32/uwinapi/makefile.mk | 2 +-
sal/typesconfig/makefile.mk | 4 ++--
20 files changed, 21 insertions(+), 21 deletions(-)
New commits:
commit 5fa1572a51f6b7e8e02234c763d62cd8ec050a2a
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Jun 6 09:17:34 2011 +0300
Always compare CROSS_COMPILING explicitly to "YES"
diff --git a/sal/cppunittester/makefile.mk b/sal/cppunittester/makefile.mk
index 77ed453..65b600b 100644
--- a/sal/cppunittester/makefile.mk
+++ b/sal/cppunittester/makefile.mk
@@ -33,7 +33,7 @@ ENABLE_EXCEPTIONS = TRUE
.INCLUDE: settings.mk
-.IF "$(CROSS_COMPILING)"==""
+.IF "$(CROSS_COMPILING)"!="YES"
CFLAGSCXX += $(CPPUNIT_CFLAGS)
diff --git a/sal/qa/ByteSequence/makefile.mk b/sal/qa/ByteSequence/makefile.mk
index 3ba99aa..60d87c8 100644
--- a/sal/qa/ByteSequence/makefile.mk
+++ b/sal/qa/ByteSequence/makefile.mk
@@ -35,7 +35,7 @@ ENABLE_EXCEPTIONS = TRUE
CFLAGSCXX += $(CPPUNIT_CFLAGS)
-.IF "$(CROSS_COMPILING)"==""
+.IF "$(CROSS_COMPILING)"!="YES"
SHL1IMPLIB = i$(SHL1TARGET)
SHL1OBJS = $(SLO)/ByteSequence.obj
diff --git a/sal/qa/OStringBuffer/makefile.mk b/sal/qa/OStringBuffer/makefile.mk
index 0a73864..e6419b7 100644
--- a/sal/qa/OStringBuffer/makefile.mk
+++ b/sal/qa/OStringBuffer/makefile.mk
@@ -36,7 +36,7 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
-.IF "$(CROSS_COMPILING)"==""
+.IF "$(CROSS_COMPILING)"!="YES"
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
diff --git a/sal/qa/makefile.mk b/sal/qa/makefile.mk
index 529b3be..e9eec4d 100644
--- a/sal/qa/makefile.mk
+++ b/sal/qa/makefile.mk
@@ -47,7 +47,7 @@ TARGET=whole_sal_qa
ALLTAR : test_all
.ENDIF
-.IF "$(CROSS_COMPILING)"==""
+.IF "$(CROSS_COMPILING)"!="YES"
# OTHER STUFF ------------------------------------------------------
# test : test_all
diff --git a/sal/qa/osl/condition/makefile.mk b/sal/qa/osl/condition/makefile.mk
index 5de9f0f..89a4fb3 100644
--- a/sal/qa/osl/condition/makefile.mk
+++ b/sal/qa/osl/condition/makefile.mk
@@ -36,7 +36,7 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
-.IF "$(CROSS_COMPILING)"==""
+.IF "$(CROSS_COMPILING)"!="YES"
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
diff --git a/sal/qa/osl/file/makefile.mk b/sal/qa/osl/file/makefile.mk
index ba7c3e5..4cb2ffe 100644
--- a/sal/qa/osl/file/makefile.mk
+++ b/sal/qa/osl/file/makefile.mk
@@ -36,7 +36,7 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
-.IF "$(CROSS_COMPILING)"==""
+.IF "$(CROSS_COMPILING)"!="YES"
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
diff --git a/sal/qa/osl/getsystempathfromfileurl/makefile.mk b/sal/qa/osl/getsystempathfromfileurl/makefile.mk
index 1d68e93..769313a 100644
--- a/sal/qa/osl/getsystempathfromfileurl/makefile.mk
+++ b/sal/qa/osl/getsystempathfromfileurl/makefile.mk
@@ -37,7 +37,7 @@ ENABLE_EXCEPTIONS = TRUE
.INCLUDE: settings.mk
-.IF "$(CROSS_COMPILING)"==""
+.IF "$(CROSS_COMPILING)"!="YES"
CFLAGSCXX += $(CPPUNIT_CFLAGS)
diff --git a/sal/qa/osl/module/makefile.mk b/sal/qa/osl/module/makefile.mk
index 474bf63..22a4811 100644
--- a/sal/qa/osl/module/makefile.mk
+++ b/sal/qa/osl/module/makefile.mk
@@ -36,7 +36,7 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
-.IF "$(CROSS_COMPILING)"==""
+.IF "$(CROSS_COMPILING)"!="YES"
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
diff --git a/sal/qa/osl/process/makefile.mk b/sal/qa/osl/process/makefile.mk
index bec5e0e..17bac5f 100644
--- a/sal/qa/osl/process/makefile.mk
+++ b/sal/qa/osl/process/makefile.mk
@@ -35,7 +35,7 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
-.IF "$(CROSS_COMPILING)"==""
+.IF "$(CROSS_COMPILING)"!="YES"
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
diff --git a/sal/qa/osl/security/makefile.mk b/sal/qa/osl/security/makefile.mk
index c8c1beb..e6fbed4 100755
--- a/sal/qa/osl/security/makefile.mk
+++ b/sal/qa/osl/security/makefile.mk
@@ -36,7 +36,7 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
-.IF "$(CROSS_COMPILING)"==""
+.IF "$(CROSS_COMPILING)"!="YES"
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
diff --git a/sal/qa/rtl/alloc/makefile.mk b/sal/qa/rtl/alloc/makefile.mk
index 15d3ff3..d829b14 100755
--- a/sal/qa/rtl/alloc/makefile.mk
+++ b/sal/qa/rtl/alloc/makefile.mk
@@ -35,7 +35,7 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
-.IF "$(CROSS_COMPILING)"==""
+.IF "$(CROSS_COMPILING)"!="YES"
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
diff --git a/sal/qa/rtl/cipher/makefile.mk b/sal/qa/rtl/cipher/makefile.mk
index 7ba9b0b..30fc678 100644
--- a/sal/qa/rtl/cipher/makefile.mk
+++ b/sal/qa/rtl/cipher/makefile.mk
@@ -37,7 +37,7 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
-.IF "$(CROSS_COMPILING)"==""
+.IF "$(CROSS_COMPILING)"!="YES"
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
diff --git a/sal/qa/rtl/crc32/makefile.mk b/sal/qa/rtl/crc32/makefile.mk
index 7f74809..23e7fd2 100755
--- a/sal/qa/rtl/crc32/makefile.mk
+++ b/sal/qa/rtl/crc32/makefile.mk
@@ -35,7 +35,7 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
-.IF "$(CROSS_COMPILING)"==""
+.IF "$(CROSS_COMPILING)"!="YES"
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
diff --git a/sal/qa/rtl/doublelock/makefile.mk b/sal/qa/rtl/doublelock/makefile.mk
index 85765db..87ef35b 100644
--- a/sal/qa/rtl/doublelock/makefile.mk
+++ b/sal/qa/rtl/doublelock/makefile.mk
@@ -35,7 +35,7 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
-.IF "$(CROSS_COMPILING)"==""
+.IF "$(CROSS_COMPILING)"!="YES"
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
diff --git a/sal/qa/rtl/locale/makefile.mk b/sal/qa/rtl/locale/makefile.mk
index 1e757c6..fd97147 100644
--- a/sal/qa/rtl/locale/makefile.mk
+++ b/sal/qa/rtl/locale/makefile.mk
@@ -35,7 +35,7 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
-.IF "$(CROSS_COMPILING)"==""
+.IF "$(CROSS_COMPILING)"!="YES"
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
diff --git a/sal/qa/rtl/oustringbuffer/makefile.mk b/sal/qa/rtl/oustringbuffer/makefile.mk
index dc82e63..32583c2 100644
--- a/sal/qa/rtl/oustringbuffer/makefile.mk
+++ b/sal/qa/rtl/oustringbuffer/makefile.mk
@@ -34,7 +34,7 @@ ENABLE_EXCEPTIONS := TRUE
.INCLUDE: settings.mk
-.IF "$(CROSS_COMPILING)"==""
+.IF "$(CROSS_COMPILING)"!="YES"
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
diff --git a/sal/qa/rtl/strings/makefile.mk b/sal/qa/rtl/strings/makefile.mk
index 6ebfed7..821e04e 100644
--- a/sal/qa/rtl/strings/makefile.mk
+++ b/sal/qa/rtl/strings/makefile.mk
@@ -34,7 +34,7 @@ ENABLE_EXCEPTIONS := TRUE
.INCLUDE: settings.mk
-.IF "$(CROSS_COMPILING)"==""
+.IF "$(CROSS_COMPILING)"!="YES"
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
diff --git a/sal/qa/sal/makefile.mk b/sal/qa/sal/makefile.mk
index 783b301..78c8646 100644
--- a/sal/qa/sal/makefile.mk
+++ b/sal/qa/sal/makefile.mk
@@ -33,7 +33,7 @@ ENABLE_EXCEPTIONS := TRUE
.INCLUDE: settings.mk
-.IF "$(CROSS_COMPILING)"==""
+.IF "$(CROSS_COMPILING)"!="YES"
SHL1TARGET = $(TARGET)_types
SHL1OBJS = $(SLO)$/test_types.obj
diff --git a/sal/systools/win32/uwinapi/makefile.mk b/sal/systools/win32/uwinapi/makefile.mk
index 5713a53..1ec7706 100644
--- a/sal/systools/win32/uwinapi/makefile.mk
+++ b/sal/systools/win32/uwinapi/makefile.mk
@@ -49,7 +49,7 @@ CFLAGSCXX+=-Wno-unused-parameter -Wno-return-type
SLOFILES=
-.IF "$(CPU)"=="I" && "$(CROSS_COMPILING)"==""
+.IF "$(CPU)"=="I" && "$(CROSS_COMPILING)"!="YES"
SLOFILES+=\
$(SLO)$/CheckTokenMembership.obj\
diff --git a/sal/typesconfig/makefile.mk b/sal/typesconfig/makefile.mk
index ac106ab..662bd7d 100644
--- a/sal/typesconfig/makefile.mk
+++ b/sal/typesconfig/makefile.mk
@@ -42,7 +42,7 @@ CXXFLAGS+= $(LFS_CFLAGS)
# --- Files --------------------------------------------------------
-.IF "$(CROSS_COMPILING)"=="" && "$(COM)"!="MSC"
+.IF "$(CROSS_COMPILING)"!="YES" && "$(COM)"!="MSC"
APP1TARGET= $(TARGET)
APP1OBJS= $(OBJ)$/typesconfig.obj
@@ -61,7 +61,7 @@ ALLTAR : $(INCCOM)$/sal$/typesizes.h
.ENDIF
.ENDIF # "$(L10N-framework)"==""
-.IF "$(CROSS_COMPILING)"==""
+.IF "$(CROSS_COMPILING)"!="YES"
$(INCCOM)$/sal$/typesizes.h : $(BIN)$/$(TARGET)
-$(MKDIR) $(INCCOM)$/sal
More information about the Libreoffice-commits
mailing list