ooo-build r14979 - in trunk: . patches/dev300 patches/emf+

[kyoshida svn gnome org]

Author: kyoshida
Date: Wed Dec 31 14:23:13 2008
New Revision: 14979
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14979&view=rev

Log:
2008-12-31  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/link-as-needed.diff:
	* patches/emf+/emf+-cppcanvas-emfplus.diff: restored the cppuhelper 
	linker flag in cppcanvas.  We still need it for --enable-dbgutil build.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/link-as-needed.diff
   trunk/patches/emf+/emf+-cppcanvas-emfplus.diff

Modified: trunk/patches/dev300/link-as-needed.diff
==============================================================================
--- trunk/patches/dev300/link-as-needed.diff	(original)
+++ trunk/patches/dev300/link-as-needed.diff	Wed Dec 31 14:23:13 2008
@@ -44,19 +44,6 @@
  
  OBJFILES = $(APP1OBJS)
  
-diff --git cppcanvas/util/makefile.mk cppcanvas/util/makefile.mk
-index 4fa5931..7a3cec0 100644
---- cppcanvas/util/makefile.mk
-+++ cppcanvas/util/makefile.mk
-@@ -50,7 +50,7 @@ LIB1FILES=\
- 
- SHL1TARGET= 	$(TARGET)$(DLLPOSTFIX)
- SHL1IMPLIB= 	i$(TARGET)
--SHL1STDLIBS=	$(TOOLSLIB) $(CPPULIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB) $(CPPUHELPERLIB) $(BASEGFXLIB)
-+SHL1STDLIBS=	$(TOOLSLIB) $(CPPULIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB) $(BASEGFXLIB)
- 
- SHL1LIBS=		$(SLB)$/$(TARGET).lib
- 
 diff --git svx/util/makefile.mk svx/util/makefile.mk
 index 4598098..d5de0b6 100644
 --- svx/util/makefile.mk

Modified: trunk/patches/emf+/emf+-cppcanvas-emfplus.diff
==============================================================================
--- trunk/patches/emf+/emf+-cppcanvas-emfplus.diff	(original)
+++ trunk/patches/emf+/emf+-cppcanvas-emfplus.diff	Wed Dec 31 14:23:13 2008
@@ -177,8 +177,8 @@
  
  SHL1TARGET= 	$(TARGET)$(UPD)$(DLLPOSTFIX)
  SHL1IMPLIB= 	i$(TARGET)
--SHL1STDLIBS=	$(TOOLSLIB) $(CPPULIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB) $(BASEGFXLIB)
-+SHL1STDLIBS=	$(TOOLSLIB) $(CPPULIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB) $(BASEGFXLIB) $(SVTOOLLIB)
+-SHL1STDLIBS=	$(TOOLSLIB) $(CPPULIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB) $(CPPUHELPERLIB) $(BASEGFXLIB)
++SHL1STDLIBS=	$(TOOLSLIB) $(CPPULIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CANVASTOOLSLIB) $(CPPUHELPERLIB) $(BASEGFXLIB) $(SVTOOLLIB)
  
  SHL1LIBS=		$(SLB)$/$(TARGET).lib