patches/duma/2_5_14/110-separate_cpp.patch
author Andreas Bießmann <andreas@biessmann.de>
Tue Mar 18 17:01:10 2014 +0100 (2014-03-18)
changeset 3296 d3a628e69a46
parent 572 944e145f3890
permissions -rw-r--r--
configure.ac: respect 'g' variants of libtool/libtoolize

BSD OS'es (OS X for me) provide GNU tools with prefixed 'g'. To find correct
versions of libtool/libtoolize on those systems search also for
glibtool/glibtoolize.

Signed-off-by: Andreas Bießmann <andreas@biessmann.de>
Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
[yann.morin.1998@free.fr: search for the g-variant first]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Message-Id: <2f1530b54afcb6a00e1d.1395158786@andreas-mbp.er.biessmann.org>
Patchwork-Id: 331467
yann@572
     1
diff -durN duma_2_5_14.orig/Makefile duma_2_5_14/Makefile
yann@572
     2
--- duma_2_5_14.orig/Makefile	2008-06-17 10:30:40.000000000 +0200
yann@572
     3
+++ duma_2_5_14/Makefile	2008-06-17 10:30:17.000000000 +0200
yann@572
     4
@@ -228,9 +228,13 @@
yann@572
     5
 	dumatest.c tstheap.c thread-test.c testmt.c dumatestpp.cpp testoperators.cpp \
yann@572
     6
 	createconf.c
yann@572
     7
 
yann@572
     8
-OBJECTS = dumapp.o duma.o sem_inc.o print.o
yann@572
     9
+OBJECTS = duma.o sem_inc.o print.o
yann@572
    10
+SO_OBJECTS = duma_so.o sem_inc_so.o print_so.o
yann@572
    11
 
yann@572
    12
-SO_OBJECTS = dumapp_so.o duma_so.o sem_inc_so.o print_so.o
yann@572
    13
+ifeq ($(DUMA_CPP),1)
yann@572
    14
+OBJECTS += dumapp.o
yann@572
    15
+SO_OBJECTS += dumapp_so.o
yann@572
    16
+endif
yann@572
    17
 
yann@572
    18
 all:	libduma.a tstheap$(EXEPOSTFIX) dumatest$(EXEPOSTFIX) thread-test$(EXEPOSTFIX) testmt$(EXEPOSTFIX) dumatestpp$(EXEPOSTFIX) testoperators$(EXEPOSTFIX) $(DUMA_DYN_DEPS)
yann@572
    19