diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-09 09:55:09 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-09 09:55:09 +0100 |
| commit | 89c4f8907fb3cf30b7e0a8837c01f525b8609d00 (patch) | |
| tree | e3151b3bd808b097c08e29519e59d0fe906950df /cppunit | |
| parent | b54d64f2b8234f620b0f11fbc298dcb68119b408 (diff) | |
| parent | 890599fd2bd872aaa52a278febc7b72036ce0664 (diff) | |
Merge commit 'ooo/DEV300_m101' into intm101
Conflicts:
cppunit/ldflags.patch
hyphen/hyphen-2.4.patch
libegg/source/eggtrayicon.c
libtextcat/makefile.mk
Diffstat (limited to 'cppunit')
| -rw-r--r-- | cppunit/ldflags.patch | 7 | ||||
| -rw-r--r-- | cppunit/makefile.mk | 5 | ||||
| -rw-r--r-- | cppunit/prj/d.lst | 1 |
3 files changed, 7 insertions, 6 deletions
diff --git a/cppunit/ldflags.patch b/cppunit/ldflags.patch index 2fa4746242a6..ee8d5ed897ce 100644 --- a/cppunit/ldflags.patch +++ b/cppunit/ldflags.patch @@ -1,12 +1,11 @@ --- misc/cppunit-1.12.1/src/cppunit/Makefile.in 2008-02-20 06:59:55.000000000 +0100 -+++ misc/build/cppunit-1.12.1/src/cppunit/Makefile.in 2011-03-03 09:12:14.205508776 +0100 -@@ -300,7 +300,8 @@ ++++ misc/build/cppunit-1.12.1/src/cppunit/Makefile.in 2010-06-21 17:01:38.324370072 +0200 +@@ -300,7 +300,7 @@ libcppunit_la_LDFLAGS = \ -no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - -release $(LT_RELEASE) -+ -release $(LT_RELEASE) \ -+ @LIBADD_DL@ ++ -release $(LT_RELEASE) $(LIBADD_DL) all: all-am diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk index 7c4d548849b0..a842e425e7be 100644 --- a/cppunit/makefile.mk +++ b/cppunit/makefile.mk @@ -84,13 +84,14 @@ CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) && \ LDFLAGS='$(LDFLAGS)' \ LIBS='$(MY_LIBS)' -BUILD_ACTION = $(GNUMAKE) +BUILD_ACTION = $(GNUMAKE) -j$(EXTMAXPROCESS) BUILD_FLAGS = install OUTDIR2INC = ooo-install/include/cppunit OUT2BIN = ooo-install/bin/DllPlugInTester.exe \ ooo-install/bin/cygcppunit-1-12-1.dll +OUT2LIB = ooo-install/lib/libcppunit.dll.a .INCLUDE: set_ext.mk .INCLUDE: target.mk @@ -118,7 +119,7 @@ CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) && \ LDFLAGS='$(LDFLAGS)' \ LIBS='$(MY_LIBS)' -BUILD_ACTION = $(GNUMAKE) +BUILD_ACTION = $(GNUMAKE) -j$(EXTMAXPROCESS) BUILD_FLAGS = install OUTDIR2INC = ooo-install/include/cppunit diff --git a/cppunit/prj/d.lst b/cppunit/prj/d.lst index 3e30ad21bbf0..29dac2bc6ed7 100644 --- a/cppunit/prj/d.lst +++ b/cppunit/prj/d.lst @@ -17,6 +17,7 @@ mkdir: %_DEST%\inc%_EXT%\cppunit\ui\text ..\%__SRC%\lib\icppunit_dll.lib %_DEST%\lib%_EXT%\icppunit_dll.lib ..\%__SRC%\bin\cygcppunit-1-12-1.dll %_DEST%\bin%_EXT%\cygcppunit-1-12-1.dll +..\%__SRC%\lib\libcppunit.dll.a %_DEST%\lib%_EXT%\libcppunit.dll.a ..\%__SRC%\lib\libcppunit-1.12.1.dylib %_DEST%\lib%_EXT%\libcppunit-1.12.1.dylib symlink: %_DEST%\lib%_EXT%\libcppunit-1.12.1.dylib %_DEST%\lib%_EXT%\libcppunit.dylib |