From 24362c8045b7b8b28dba0509b8602c917f9ff84f Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Wed, 29 Jul 2009 15:33:56 +0000
Subject: [PATCH] CWS-TOOLING: integrate CWS cmcfixes61 2009-07-22 10:53:14
 +0200 cmc  r274224 : #i103714# duplicate patch 2009-07-22 10:45:26 +0200 cmc 
 r274223 : #i103715# fix up m68k makefile.mk 2009-07-22 10:32:16 +0200 cmc 
 r274222 : #i103714# || && new gcc warnings 2009-07-21 13:29:17 +0200 cmc 
 r274190 : #i103651# fix for subpixel gray line in cairo canvas animations
 2009-07-20 17:35:58 +0200 cmc  r274151 : #i103668# WaE over use of const
 2009-07-20 15:53:51 +0200 cmc  r274146 : #i103664# use boost::addressof
 instead 2009-07-20 15:38:40 +0200 cmc  r274145 : #i103451# long -> INT32 for
 these streamable values 2009-07-20 15:33:15 +0200 cmc  r274144 : #i103663
 clear low-hanging aliasing warnings 2009-07-20 15:28:23 +0200 cmc  r274143 :
 #i103662 clear low-hanging aliasing warnings 2009-07-20 15:21:46 +0200 cmc 
 r274142 : #i103661 clear low-hanging aliasing warnings 2009-07-20 15:16:05
 +0200 cmc  r274141 : #i103660 clear low-hanging aliasing warnings

---
 bridges/source/cpp_uno/gcc3_linux_m68k/makefile.mk | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_m68k/makefile.mk
index 32d4b0d27dc9..8371d653a25b 100644
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/makefile.mk
@@ -61,8 +61,7 @@ CFLAGSNOOPT=-O0
 SLOFILES= \
     $(SLO)$/cpp2uno.obj \
     $(SLO)$/except.obj \
-    $(SLO)$/uno2cpp.obj \
-    $(SLO)$/m68khelper.obj
+    $(SLO)$/uno2cpp.obj
 
 SHL1TARGET= $(TARGET)
 
@@ -83,6 +82,3 @@ SHL1STDLIBS= \
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-
-$(SLO)$/%.obj: %.s
-       $(CXX) -c -o $(SLO)$/$(@:b).o $< -fPIC ; touch $@