Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/duma/2_5_1/110-separate_cpp.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Thu Apr 28 00:13:41 2011 +0200 (2011-04-28)
changeset 2412 20edcd78cf67
parent 236 42650dc4e95e
permissions -rw-r--r--
scripts/addToolsVersion: versions can be either in the .in or the .in.2

The components have their version selection handled either in the .in
file or the .in.2 file. Handle both cases.

Also, when dumping an existing version, keep the user's grep options
(ie. do override neither options nor colors).

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> 
     1 diff -dur duma_2_5_1.orig/Makefile duma_2_5_1/Makefile

     2 --- duma_2_5_1.orig/Makefile	2007-07-11 17:49:43.000000000 +0200

     3 +++ duma_2_5_1/Makefile	2007-07-11 17:50:46.000000000 +0200

     4 @@ -115,9 +115,14 @@

     5  	dumatest.c tstheap.c dumatestpp.cpp testoperators.cpp \

     6  	createconf.c

     7  

     8 -OBJECTS = dumapp.o duma.o sem_inc.o print.o

     9 +OBJECTS = duma.o sem_inc.o print.o

    10 +SO_OBJECTS = duma_so.o sem_inc_so.o print_so.o

    11 +

    12 +ifeq ($(DUMA_CPP),1)

    13 +OBJECTS += dumapp.o

    14 +SO_OBJECTS += dumapp_so.o

    15 +endif

    16  

    17 -SO_OBJECTS = dumapp_so.o duma_so.o sem_inc_so.o print_so.o

    18  

    19  all:	libduma.a $(DUMASO) tstheap dumatest dumatestpp testoperators tstheap_so dumatestpp_so

    20  	@ echo "Testing DUMA."
crosstool-ng