diff options
| author | sb <sb@openoffice.org> | 2010-06-30 15:38:26 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-06-30 15:38:26 +0200 |
| commit | 15a4ec2c3ecdec697f7cf7cc6c39ed68bfc64489 (patch) | |
| tree | 5cfc8cc79b554e9791e56e608f320b6d3302158f /cppunit | |
| parent | 05c8709f2cda853e5bd99784147f1344d2a275cc (diff) | |
| parent | 0e6d1583bc50cf27956f091ae8289ee164aefa1b (diff) | |
sb126: merged in DEV300_m84
Diffstat (limited to 'cppunit')
| -rw-r--r-- | cppunit/makefile.mk | 50 |
1 files changed, 44 insertions, 6 deletions
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk index 5ef6499726e5..f50f4aadc164 100644 --- a/cppunit/makefile.mk +++ b/cppunit/makefile.mk @@ -40,7 +40,8 @@ PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch # warnings.patch: see <https://sourceforge.net/tracker/?func=detail& # aid=2912630&group_id=11795&atid=311795> -.IF "$(OS)" == "WNT" && "$(COM)" == "MSC" +.IF "$(OS)" == "WNT" +.IF "$(COM)" == "MSC" # On Windows, CppUnit appears to support either the Unix-style configure/make # approach with cygwin and gcc (and libtool fails miserably if gcc is replaced @@ -70,6 +71,48 @@ OUTDIR2INC = include/cppunit $(PACKAGE_DIR)/$(CONFIGURE_FLAG_FILE): ooo-cppunit_dll.mk ooo-DllPlugInTester.mk .ELSE +.IF "$(COM)" == "GCC" +EXTRA_CFLAGS += -mthreads +LDFLAGS += -Wl,--enable-runtime-pseudo-reloc-v2 + +.IF "$(USE_SYSTEM_STL)" != "YES" + +OOO_STLPORT_CXXFLAGS = -I$(SOLARINCDIR)/stl +.IF "$(USE_STLP_DEBUG)" == "TRUE" +OOO_STLPORT_CXXFLAGS += -D_STLP_DEBUG +.END +OOO_STLPORT_CXXFLAGS += -DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) + +OOO_STLPORT_LDFLAGS = -L$(SOLARLIBDIR) +OOO_STLPORT_LIBS = $(LIBSTLPORT) + +.END + +CONFIGURE_ACTION = ./configure +CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) && \ + pwd $(PWDFLAGS))/$(TARFILE_ROOTDIR)/ooo-install \ + --disable-dependency-tracking --disable-static --disable-doxygen \ + --disable-html-docs --disable-latex-docs CC='$(CC)' CXX='$(CXX)' \ + CXXFLAGS='$(EXTRA_CFLAGS) $(OOO_STLPORT_CXXFLAGS)' \ + LDFLAGS='$(LDFLAGS) $(OOO_STLPORT_LDFLAGS)' \ + LIBS='$(OOO_STLPORT_LIBS) $(MY_LIBS)' + +BUILD_ACTION = $(GNUMAKE) +BUILD_FLAGS = install + +OUTDIR2INC = ooo-install/include/cppunit + +OUT2BIN = ooo-install/bin/DllPlugInTester.exe \ + ooo-install/bin/cygcppunit-1-12-1.dll + +.INCLUDE: set_ext.mk +.INCLUDE: target.mk +.INCLUDE: tg_ext.mk + +.ENDIF # "$(COM)" == "GCC" +.ENDIF # "$(COM)" == "MSC" + +.ELSE .IF "$(USE_SYSTEM_STL)" != "YES" @@ -134,10 +177,6 @@ BUILD_FLAGS = install OUTDIR2INC = ooo-install/include/cppunit -.IF "$(OS)" == "WNT" -OUT2BIN = ooo-install/bin/DllPlugInTester.exe \ - ooo-install/bin/cygcppunit-1-12-1.dll -.ELSE OUT2BIN = ooo-install/bin/DllPlugInTester .IF "$(OS)" == "MACOSX" OUT2LIB = ooo-install/lib/libcppunit-1.12.1.dylib @@ -145,7 +184,6 @@ EXTRPATH = NONE .ELSE OUT2LIB = ooo-install/lib/libcppunit-1.12.so.1 .END -.END .INCLUDE: set_ext.mk .INCLUDE: target.mk |