yann@236: diff -dur duma_2_5_1/Makefile duma_2_5_1.orig/Makefile
yann@236: --- duma_2_5_1/Makefile	2006-06-18 06:02:13.000000000 +0200
yann@236: +++ duma_2_5_1.orig/Makefile	2007-07-11 17:49:43.000000000 +0200
yann@236: @@ -98,10 +98,6 @@
yann@236:    LIBS=-lpthread
yann@236:  endif
yann@236:  
yann@236: -
yann@236: -CC=gcc
yann@236: -CXX=g++
yann@236: -AR=ar
yann@236:  INSTALL=install
yann@236:  
yann@236:  ############################################################
yann@236: @@ -169,31 +165,31 @@
yann@236:  
yann@236:  createconf: createconf.o
yann@236:  	- rm -f createconf
yann@236: -	$(CC) $(CFLAGS) $(DUMA_OPTIONS) createconf.o -o createconf
yann@236: +	$(HOSTCC) $(CFLAGS) $(DUMA_OPTIONS) createconf.o -o createconf
yann@236:  
yann@236:  tstheap: libduma.a tstheap.o
yann@236:  	- rm -f tstheap
yann@236: -	$(CC) $(CFLAGS) tstheap.o libduma.a -o tstheap $(LIBS)
yann@236: +	$(HOSTCC) $(CFLAGS) tstheap.o libduma.a -o tstheap $(LIBS)
yann@236:  
yann@236:  dumatest: libduma.a dumatest.o
yann@236:  	- rm -f dumatest
yann@236: -	$(CC) $(CFLAGS) dumatest.o libduma.a -o dumatest $(LIBS)
yann@236: +	$(HOSTCC) $(CFLAGS) dumatest.o libduma.a -o dumatest $(LIBS)
yann@236:  
yann@236:  dumatestpp: libduma.a dumatestpp.o dumapp.h
yann@236:  	- rm -f dumatestpp
yann@236: -	$(CXX) $(CPPFLAGS) dumatestpp.o libduma.a -o dumatestpp $(LIBS)
yann@236: +	$(HOSTCXX) $(CPPFLAGS) dumatestpp.o libduma.a -o dumatestpp $(LIBS)
yann@236:  
yann@236:  testoperators: libduma.a testoperators.o dumapp.h
yann@236:  	- rm -f testoperators
yann@236: -	$(CXX) $(CPPFLAGS) testoperators.o libduma.a -o testoperators $(LIBS)
yann@236: +	$(HOSTCXX) $(CPPFLAGS) testoperators.o libduma.a -o testoperators $(LIBS)
yann@236:  
yann@236:  tstheap_so: tstheap_so.o
yann@236:  	- rm -f tstheap_so
yann@236: -	$(CC) $(CFLAGS) tstheap_so.o -o tstheap_so $(LIBS)
yann@236: +	$(HOSTCC) $(CFLAGS) tstheap_so.o -o tstheap_so $(LIBS)
yann@236:  
yann@236:  dumatestpp_so: dumatestpp_so.o
yann@236:  	- rm -f dumatestpp_so
yann@236: -	$(CXX) $(CPPFLAGS) dumatestpp_so.o -o dumatestpp_so $(LIBS)
yann@236: +	$(HOSTCXX) $(CPPFLAGS) dumatestpp_so.o -o dumatestpp_so $(LIBS)
yann@236:  
yann@236:  
yann@236:  $(OBJECTS) tstheap.o dumatest.o dumatestpp.o: duma.h
yann@236: @@ -211,7 +207,7 @@
yann@236:  # define rules how to build objects for createconf
yann@236:  #
yann@236:  createconf.o:
yann@236: -	$(CC) $(CFLAGS) $(DUMA_OPTIONS) -c createconf.c -o $@
yann@236: +	$(HOSTCC) $(CFLAGS) $(DUMA_OPTIONS) -c createconf.c -o $@
yann@236:  
yann@236:  
yann@236:  #
yann@236: @@ -230,13 +226,6 @@
yann@236:  print_so.o:	print.c print.h
yann@236:  	$(CC) $(CFLAGS) $(DUMA_SO_OPTIONS) -c print.c -o $@
yann@236:  
yann@236: -# DUMA_SO_OPTIONS needed cause duma.h is included explicitly
yann@236: -tstheap_so.o:
yann@236: -	$(CC) $(CFLAGS) $(DUMA_SO_OPTIONS) -c tstheap.c -o $@
yann@236: -
yann@236: -dumatestpp_so.o:
yann@236: -	$(CXX) $(CPPFLAGS) $(DUMA_SO_OPTIONS) -c dumatestpp.cpp -o $@
yann@236: -
yann@236:  #
yann@236:  # define rules how to build objects for static library
yann@236:  #
yann@236: @@ -259,17 +248,23 @@
yann@236:  #
yann@236:  
yann@236:  dumatest.o:	dumatest.c duma.h duma_config.h
yann@236: -	$(CC) $(CFLAGS) -c dumatest.c -o $@
yann@236: +	$(HOSTCC) $(CFLAGS) -c dumatest.c -o $@
yann@236:  
yann@236:  dumatestpp.o:	dumatestpp.cpp duma.h dumapp.h duma_config.h
yann@236: -	$(CXX) $(CPPFLAGS) -c dumatestpp.cpp -o $@
yann@236: +	$(HOSTCXX) $(CPPFLAGS) -c dumatestpp.cpp -o $@
yann@236:  
yann@236:  tstheap.o:	tstheap.c duma.h duma_config.h
yann@236: -	$(CC) $(CFLAGS) -c tstheap.c -o $@
yann@236: +	$(HOSTCC) $(CFLAGS) -c tstheap.c -o $@
yann@236:  
yann@236:  testoperators.o:	testoperators.cpp duma.h dumapp.h duma_config.h
yann@236: -	$(CXX) $(CPPFLAGS) -c testoperators.cpp -o $@
yann@236: +	$(HOSTCXX) $(CPPFLAGS) -c testoperators.cpp -o $@
yann@236: +
yann@236: +# DUMA_SO_OPTIONS needed cause duma.h is included explicitly
yann@236: +tstheap_so.o:
yann@236: +	$(HOSTCC) $(CFLAGS) $(DUMA_SO_OPTIONS) -c tstheap.c -o $@
yann@236:  
yann@236: +dumatestpp_so.o:
yann@236: +	$(HOSTCXX) $(CPPFLAGS) $(DUMA_SO_OPTIONS) -c dumatestpp.cpp -o $@
yann@236:  
yann@236:  #
yann@236:  # default rules
yann@236: @@ -280,5 +275,3 @@
yann@236:  #.cpp.o:
yann@236:  #	$(CXX) $(CPPFLAGS) -c $< -o $@
yann@236:  #
yann@236: -
yann@236: -