[med-svn] r1211 - trunk/packages/glam2/trunk/debian/patches

[charles-guest at alioth.debian.org]

Author: charles-guest
Date: 2008-01-29 06:29:07 +0000 (Tue, 29 Jan 2008)
New Revision: 1211

Modified:
   trunk/packages/glam2/trunk/debian/patches/Makefiles
Log:
Oops, should probably better use CFLAGS than CXXFLAGS.

Modified: trunk/packages/glam2/trunk/debian/patches/Makefiles
===================================================================
--- trunk/packages/glam2/trunk/debian/patches/Makefiles	2008-01-29 06:25:08 UTC (rev 1210)
+++ trunk/packages/glam2/trunk/debian/patches/Makefiles	2008-01-29 06:29:07 UTC (rev 1211)
@@ -5,9 +5,9 @@
 -purge: *.c *.h Makefile
 -	cc -Wall -O3 -o purge *.c -lm
 +# Renamed glam2-purge in Debian
-+CXXFLAGS = -g -Wall -O2
++CFLAGS = -g -Wall -O2
 +glam2-purge: *.c *.h Makefile
-+	cc $(CXXFLAGS) -o glam2-purge *.c -lm
++	cc $(CFLAGS) -o glam2-purge *.c -lm
 --- a/src/Makefile
 +++ b/src/Makefile
 @@ -6,6 +6,8 @@
@@ -15,7 +15,7 @@
  # -O3 means optimization level 3 (the maximum for gcc)
  # -lm means include the math library
 +# In Debian, optimisation level can be overriden by build options.
-+CXXFLAGS = -g -Wall -O2
++CFLAGS = -g -Wall -O2
  
  # Source files for glam2:
  GSRC = alphabet.c args.c column_sample.c dirichlet.c dna_prior.c	\
@@ -27,22 +27,22 @@
 -	cc -Wall -O3 -o glam2 $(GSRC) -lm
 +# The Debian package uses an fft-enabled version of glam2.
 +glam2nofft: $(GSRC) *.h Makefile
-+	cc $(CXXFLAGS) -o glam2nofft $(GSRC) -lm
++	cc $(CFLAGS) -o glam2nofft $(GSRC) -lm
  
  # Command for compiling glam2scan:
  glam2scan: $(SSRC) *.h Makefile
 -	cc -Wall -O3 -o glam2scan $(SSRC) -lm
-+	cc $(CXXFLAGS) -o glam2scan $(SSRC) -lm
++	cc $(CFLAGS) -o glam2scan $(SSRC) -lm
  
  # Command for compiling glam2format:
  glam2format: $(FSRC) *.h Makefile
 -	cc -Wall -O3 -o glam2format $(FSRC) -lm
-+	cc $(CXXFLAGS) -o glam2format $(FSRC) -lm
++	cc $(CFLAGS) -o glam2format $(FSRC) -lm
  
  # Command for compiling glam2mask:
  glam2mask: $(MSRC) *.h Makefile
 -	cc -Wall -O3 -o glam2mask $(MSRC) -lm
-+	cc $(CXXFLAGS) -o glam2mask $(MSRC) -lm
++	cc $(CFLAGS) -o glam2mask $(MSRC) -lm
  
  # Here follow commands for compiling special versions of the programs
  
@@ -51,7 +51,7 @@
 -	cc -Wall -O3 -DFFT -o glam2fft $(GSRC) convolve.c -lm -lfftw3
 +# glam2fft is simply renamed glam2 in Debian.
 +glam2: $(GSRC) convolve.c *.h Makefile
-+	cc $(CXXFLAGS) -DFFT -o glam2 $(GSRC) convolve.c -lm -lfftw3
++	cc $(CFLAGS) -DFFT -o glam2 $(GSRC) convolve.c -lm -lfftw3
  
  # Compile for debugging with gdb or valgrind, with extra compiler warnings:
  glam2_d: $(GSRC) *.h Makefile