Mercurialcrosstool-ng / annotate
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>
Sat Oct 03 18:49:23 2009 +0200 (2009-10-03)
changeset 1560 79a609170a83
parent 236 42650dc4e95e
permissions -rw-r--r--
configure: split has_or_abort in two: one to check, one to abort

Split the has_or_abort function in two:
- one that checks if the tool if found,
- one that calls the above check, and aborts if not found

The rational behind this is to be able to check for a tool
and if not found, fallback to using our bundled version,
should the need arise (and I get time).
yann@236 
     1
 
diff -dur duma_2_5_1.orig/Makefile duma_2_5_1/Makefile
yann@236 
     2
 
--- duma_2_5_1.orig/Makefile	2007-07-11 17:49:43.000000000 +0200
yann@236 
     3
 
+++ duma_2_5_1/Makefile	2007-07-11 17:50:46.000000000 +0200
yann@236 
     4
 
@@ -115,9 +115,14 @@
yann@236 
     5
 
 	dumatest.c tstheap.c dumatestpp.cpp testoperators.cpp \
yann@236 
     6
 
 	createconf.c
yann@236 
     7
yann@236 
     8
 
-OBJECTS = dumapp.o duma.o sem_inc.o print.o
yann@236 
     9
 
+OBJECTS = duma.o sem_inc.o print.o
yann@236 
    10
 
+SO_OBJECTS = duma_so.o sem_inc_so.o print_so.o
yann@236 
    11
 
+
yann@236 
    12
 
+ifeq ($(DUMA_CPP),1)
yann@236 
    13
 
+OBJECTS += dumapp.o
yann@236 
    14
 
+SO_OBJECTS += dumapp_so.o
yann@236 
    15
 
+endif
yann@236 
    16
yann@236 
    17
 
-SO_OBJECTS = dumapp_so.o duma_so.o sem_inc_so.o print_so.o
yann@236 
    18
yann@236 
    19
 
 all:	libduma.a $(DUMASO) tstheap dumatest dumatestpp testoperators tstheap_so dumatestpp_so
yann@236 
    20
 
 	@ echo "Testing DUMA."
crosstool-ng