ooo-build r12293 - in trunk: . patches/dev300

[tml svn gnome org]

Author: tml
Date: Tue Apr 22 21:08:22 2008
New Revision: 12293
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12293&view=rev

Log:
2008-04-23  Tor Lillqvist  <tml novell com>

	* patches/dev300/buildfix-no-UPD-in-library-names.diff
	* patches/dev300/buildfix-no-UPD-in-library-names-linuxonly.diff:
	Move patch to file that is created by the LinuxOnly
	speed-local-link-except.diff to separate diff that is applied on
	LinuxOnly.



Added:
   trunk/patches/dev300/buildfix-no-UPD-in-library-names-linuxonly.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/buildfix-no-UPD-in-library-names.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Apr 22 21:08:22 2008
@@ -2198,6 +2198,11 @@
 # FIXME: should be in the respective patches
 buildfix-no-UPD-in-library-names.diff, jholesov
 
+
+[ LinuxOnly ]
+buildfix-no-UPD-in-library-names-linuxonly.diff, jholesov
+
+
 [ UnstableLibwpd ]
 libwpd-testing.diff
 libwpg-testing.diff

Added: trunk/patches/dev300/buildfix-no-UPD-in-library-names-linuxonly.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/buildfix-no-UPD-in-library-names-linuxonly.diff	Tue Apr 22 21:08:22 2008
@@ -0,0 +1,13 @@
+diff --git cppu/source/except/makefile.mk cppu/source/except/makefile.mk
+index 795f365..66e6328 100644
+--- cppu/source/except/makefile.mk
++++ cppu/source/except/makefile.mk
+@@ -11,7 +11,7 @@ ENABLE_EXCEPTIONS=TRUE
+ LIB1TARGET= $(SLB)$/$(TARGET).lib
+ LIB1OBJFILES= $(SLO)$/except.obj
+ 
+-SHL1TARGET=exlink$(UPD)$(DLLPOSTFIX)
++SHL1TARGET=exlink$(DLLPOSTFIX)
+ SHL1LIBS=$(LIB1TARGET)
+ SHL1STDLIBS= $(SALLIB) $(SALHELPERLIB) $(REGLIB) $(CPPULIB)
+ 

Modified: trunk/patches/dev300/buildfix-no-UPD-in-library-names.diff
==============================================================================
--- trunk/patches/dev300/buildfix-no-UPD-in-library-names.diff	(original)
+++ trunk/patches/dev300/buildfix-no-UPD-in-library-names.diff	Tue Apr 22 21:08:22 2008
@@ -1,16 +1,3 @@
-diff --git cppu/source/except/makefile.mk cppu/source/except/makefile.mk
-index 795f365..66e6328 100644
---- cppu/source/except/makefile.mk
-+++ cppu/source/except/makefile.mk
-@@ -11,7 +11,7 @@ ENABLE_EXCEPTIONS=TRUE
- LIB1TARGET= $(SLB)$/$(TARGET).lib
- LIB1OBJFILES= $(SLO)$/except.obj
- 
--SHL1TARGET=exlink$(UPD)$(DLLPOSTFIX)
-+SHL1TARGET=exlink$(DLLPOSTFIX)
- SHL1LIBS=$(LIB1TARGET)
- SHL1STDLIBS= $(SALLIB) $(SALHELPERLIB) $(REGLIB) $(CPPULIB)
- 
 diff --git desktop/source/pagein/makefile.mk desktop/source/pagein/makefile.mk
 index d904eeb..c0d81bd 100644
 --- desktop/source/pagein/makefile.mk