diff options
author | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-08-02 21:33:36 (GMT) |
---|---|---|
committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-08-02 21:33:36 (GMT) |
commit | 76a9f0fd167ff69c10e597c56ee5c2398761beaf (patch) | |
tree | 84eed633c600477607b7d6477352283f4dc04980 /patches/duma/2_5_15/110-separate_cpp.patch | |
parent | 88cac8531b1b565e0844ecf91ed42dd77ba8c63a (diff) |
[debug-duma] Add latest versions
Add 2.5.15, propagate patchset from 2_5_14 up to 2_5_15.
Diffstat (limited to 'patches/duma/2_5_15/110-separate_cpp.patch')
-rw-r--r-- | patches/duma/2_5_15/110-separate_cpp.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/patches/duma/2_5_15/110-separate_cpp.patch b/patches/duma/2_5_15/110-separate_cpp.patch new file mode 100644 index 0000000..4bbccc7 --- /dev/null +++ b/patches/duma/2_5_15/110-separate_cpp.patch @@ -0,0 +1,19 @@ +diff -durN duma_2_5_15.orig/GNUmakefile duma_2_5_15/GNUmakefile +--- duma_2_5_15.orig/GNUmakefile 2009-06-19 16:41:53.000000000 +0200 ++++ duma_2_5_15/GNUmakefile 2009-06-19 16:43:53.000000000 +0200 +@@ -289,9 +289,13 @@ + dumatest.c tstheap.c thread-test.c testmt.c dumatestpp.cpp testoperators.cpp \ + createconf.c + +-OBJECTS=dumapp.o duma.o sem_inc.o print.o ++OBJECTS = duma.o sem_inc.o print.o ++SO_OBJECTS = duma_so.o sem_inc_so.o print_so.o + +-SO_OBJECTS=dumapp_so.o duma_so.o sem_inc_so.o print_so.o ++ifeq ($(DUMA_CPP),1) ++OBJECTS += dumapp.o ++SO_OBJECTS += dumapp_so.o ++endif + + # Make all the top-level targets the makefile knows about. + all: libduma.a tstheap$(EXEPOSTFIX) dumatest$(EXEPOSTFIX) thread-test$(EXEPOSTFIX) testmt$(EXEPOSTFIX) dumatestpp$(EXEPOSTFIX) testoperators$(EXEPOSTFIX) $(DUMA_DYN_DEPS) |