patches/duma/2_5_15/110-separate_cpp.patch
author Ray Donnelly <mingw.android@gmail.com>
Wed Jul 10 12:40:21 2013 +0100 (2013-07-10)
changeset 3223 58ca31386bfb
parent 747 d3e603e7c17c
permissions -rw-r--r--
Allow reordered MAKEFLAGS

-R and -r (-Rr) can be reordered to -r and -R (-rR).
This happens with MSYS1/2 gnu-make and mingw32-make,
and triggers "Recursion detected, bailing out..."

Signed-off-by: Ray Donnelly <mingw.android@gmail.com>
Message-Id: <CAOYw7dsdsg-XaDOwwEWJeUUSo2Vu_UD5GtkSgNTu59ai7yx0cQ@mail.gmail.com>
Patchwork-Id: 258027
     1 diff -durN duma_2_5_15.orig/GNUmakefile duma_2_5_15/GNUmakefile
     2 --- duma_2_5_15.orig/GNUmakefile	2009-06-19 16:41:53.000000000 +0200
     3 +++ duma_2_5_15/GNUmakefile	2009-06-19 16:43:53.000000000 +0200
     4 @@ -289,9 +289,13 @@
     5  	dumatest.c tstheap.c thread-test.c testmt.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 -SO_OBJECTS=dumapp_so.o duma_so.o sem_inc_so.o print_so.o
    13 +ifeq ($(DUMA_CPP),1)
    14 +OBJECTS += dumapp.o
    15 +SO_OBJECTS += dumapp_so.o
    16 +endif
    17  
    18  # Make all the top-level targets the makefile knows about.
    19  all:	libduma.a tstheap$(EXEPOSTFIX) dumatest$(EXEPOSTFIX) thread-test$(EXEPOSTFIX) testmt$(EXEPOSTFIX) dumatestpp$(EXEPOSTFIX) testoperators$(EXEPOSTFIX) $(DUMA_DYN_DEPS)