patches/duma/2_5_12/110-separate_cpp.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Mon Mar 28 01:05:18 2011 +0200 (2011-03-28)
changeset 2362 0888065f8c4d
parent 430 5b7efc8dbf85
permissions -rw-r--r--
cc/gcc: cleanup the _or_later logic

So far, we've had a version always select appropriate _or_later option,
which in turn would select all previous _or_later options.

Because the dependencies on companion libs were cumulative, that was
working OK. But the upcoming 4.6 will no longer depend on libelf, so
we can't keep the cumulative scheme we've been using so far.

Have each release family select the corresponding dependencies, instead
of relying on selecting previous _or_later.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
yann@430
     1
diff -durN duma_2_5_12.orig/Makefile duma_2_5_12/Makefile
yann@430
     2
--- duma_2_5_12.orig/Makefile	2007-09-07 21:57:45.000000000 +0200
yann@430
     3
+++ duma_2_5_12/Makefile	2007-09-07 21:58:35.000000000 +0200
yann@430
     4
@@ -231,9 +231,13 @@
yann@430
     5
 	dumatest.c tstheap.c thread-test.c testmt.c dumatestpp.cpp testoperators.cpp \
yann@430
     6
 	createconf.c
yann@430
     7
yann@430
     8
-OBJECTS = dumapp.o duma.o sem_inc.o print.o
yann@430
     9
+OBJECTS = duma.o sem_inc.o print.o
yann@430
    10
+SO_OBJECTS = duma_so.o sem_inc_so.o print_so.o
yann@430
    11
yann@430
    12
-SO_OBJECTS = dumapp_so.o duma_so.o sem_inc_so.o print_so.o
yann@430
    13
+ifeq ($(DUMA_CPP),1)
yann@430
    14
+OBJECTS += dumapp.o
yann@430
    15
+SO_OBJECTS += dumapp_so.o
yann@430
    16
+endif
yann@430
    17
yann@430
    18
 all:	libduma.a tstheap$(EXEPOSTFIX) dumatest$(EXEPOSTFIX) thread-test$(EXEPOSTFIX) testmt$(EXEPOSTFIX) dumatestpp$(EXEPOSTFIX) testoperators$(EXEPOSTFIX) $(DUMA_DYN_DEPS)
yann@430
    19
 	@ $(ECHOLF)