[wcstools] 01/01: Forward CC to libwcs

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch debian
in repository wcstools.

commit 3eca502241d363be5ce823c29b0db2f9ba55752d
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Jun 1 16:38:29 2015 +0200

    Forward CC to libwcs
---
 debian/patches/makefiles.patch | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/debian/patches/makefiles.patch b/debian/patches/makefiles.patch
index 9cae574..2d47df1 100644
--- a/debian/patches/makefiles.patch
+++ b/debian/patches/makefiles.patch
@@ -4,15 +4,14 @@ Description: Rename libwcs to libwcstools to avoid conflicts with Mark
  CFLAGS, CPPFLAGS and LDFLAGS for fortification.
 --- a/libwcs/Makefile
 +++ b/libwcs/Makefile
-@@ -1,5 +1,5 @@
+@@ -1,5 +1,4 @@
 -CFLAGS= -g -D_FILE_OFFSET_BITS=64
 -CC= cc
 +CFLAGS+= -fPIC
-+CC= gcc
  
  OBJS =	imsetwcs.o imgetwcs.o matchstar.o findstar.o daoread.o wcscon.o \
  	fitswcs.o wcsinit.o wcs.o ty2read.o webread.o tmcread.o \
-@@ -11,10 +11,17 @@
+@@ -11,10 +10,17 @@
  	sortstar.o platefit.o iget.o fileutil.o \
  	wcslib.o lin.o cel.o proj.o sph.o wcstrig.o distort.o poly.o
  
@@ -31,7 +30,7 @@ Description: Rename libwcs to libwcstools to avoid conflicts with Mark
  actread.o:	fitsfile.h wcscat.h wcs.h fitshead.h wcslib.h
  binread.o:	wcscat.h wcs.h fitshead.h wcslib.h
  ctgread.o:	wcscat.h wcs.h fitshead.h wcslib.h
-@@ -67,4 +74,4 @@
+@@ -67,4 +73,4 @@
  worldpos.o:	wcs.h fitshead.h wcslib.h
  
  clean:
@@ -39,11 +38,12 @@ Description: Rename libwcs to libwcstools to avoid conflicts with Mark
 +	rm -f *.a *.o *.so *.so.*
 --- a/Makefile
 +++ b/Makefile
-@@ -1,12 +1,10 @@
+@@ -1,12 +1,11 @@
 -CFLAGS= -g -D_FILE_OFFSET_BITS=64
 -CC= cc
 -LIBWCS = libwcs/libwcs.a
 -LIBS = $(LIBWCS) -lm
++CC = gcc
 +LIBWCS = libwcs/libwcstools.so
 +LIBS = -L libwcs -lwcstools -lm
  #LIBS = $(LIBWCS) -lm -lnsl -lsocket
@@ -55,7 +55,7 @@ Description: Rename libwcs to libwcstools to avoid conflicts with Mark
  
  all:	cphead delwcs delhead edhead fixpix gethead i2f imcat imhead immatch \
  	imrot imsize imstar imwcs scat sethead addpix getpix setpix sky2xy \
-@@ -16,175 +14,175 @@
+@@ -16,184 +15,183 @@
  	isfile simpos bincat
  
  addpix: addpix.c $(LIBWCS) libwcs/fitsfile.h
@@ -288,4 +288,16 @@ Description: Rename libwcs to libwcstools to avoid conflicts with Mark
 +	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/tmcate tmcate.c
  
  $(LIBWCS): libwcs/*.c libwcs/*.h
- 	cd libwcs; make
+-	cd libwcs; make
++	$(MAKE) CC=$(CC) -C libwcs
+ 
+ objclean:
+-	cd libwcs; make clean
++	$(MAKE) -C libwcs clean
+ 
+ binclean:
+ 	rm -f ./bin/*
+ 
+-clean:
+-	make objclean; make binclean
++clean: objclean binclean

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/wcstools.git