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/makefile.mk | |
| 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/makefile.mk')
| -rw-r--r-- | cppunit/makefile.mk | 5 |
1 files changed, 3 insertions, 2 deletions
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 |