patches/duma/2_5_14/110-separate_cpp.patch
author Remy Bohmer <linux@bohmer.net>
Sun Jul 11 22:23:34 2010 +0200 (2010-07-11)
changeset 2021 3e52a1510f87
parent 572 944e145f3890
permissions -rw-r--r--
debug/gdb: Fix compilation for Mingw hosts

GDB requires PDcurses instead of ncurses while running on Windows.
So, do not always compile ncurses in case GDB needs to build.

PDcurses is provided by an earlier build step and is not described in
this file.

Signed-off-by: Remy Bohmer <linux@bohmer.net>
[yann.morin.1998@anciense.nib.fr: we already have a way to detect ncurses usage]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
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