patches/duma/2_5_15/110-separate_cpp.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue Aug 02 18:26:53 2011 +0200 (2011-08-02)
changeset 2592 4908eb2b6f17
parent 747 d3e603e7c17c
permissions -rw-r--r--
scripts/functions: cvs retrieval first tries the mirror for tarballs

The cvs download helper looks for the local tarballs dir to see if it
can find a pre-downloaded tarball, and if it does not find it, does
the actual fetch to upstream via cvs.

In the process, it does not even try to get a tarball from the local
mirror, which can be useful if the mirror has been pre-populated
manually (or with a previously downloaded tree).

Fake a tarball get with the standard tarball-download helper, but
without specifying any upstream URL, which makes the helper directly
try the LAN mirror.

Of course, if no mirror is specified, no URL wil be available, and
the standard cvs retrieval will kick in.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
yann@1436
     1
diff -durN duma_2_5_15.orig/GNUmakefile duma_2_5_15/GNUmakefile
yann@1436
     2
--- duma_2_5_15.orig/GNUmakefile	2009-06-19 16:41:53.000000000 +0200
yann@1436
     3
+++ duma_2_5_15/GNUmakefile	2009-06-19 16:43:53.000000000 +0200
yann@1436
     4
@@ -289,9 +289,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@1436
     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@1436
    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@1436
    18
 # Make all the top-level targets the makefile knows about.
yann@572
    19
 all:	libduma.a tstheap$(EXEPOSTFIX) dumatest$(EXEPOSTFIX) thread-test$(EXEPOSTFIX) testmt$(EXEPOSTFIX) dumatestpp$(EXEPOSTFIX) testoperators$(EXEPOSTFIX) $(DUMA_DYN_DEPS)