[SCM] Create, display and manipulate the world coordinate system branch, debian, updated. bf3b3daaf2967b45706e268a66e826f84842ee9e

Ole Streicher debian at liska.ath.cx
Fri Feb 8 12:43:49 UTC 2013 

The following commit has been merged in the debian branch:
commit 9d5cf59c9db0e09031214126a42b3ffc93b2c6bf
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Feb 8 13:40:32 2013 +0100

    Forward CFLAGS, CPPFLAGS, LDFLAGS for fortification

diff --git a/debian/patches/rename_libwcs.patch b/debian/patches/rename_libwcs.patch
index 9f53459..a22a826 100644
--- a/debian/patches/rename_libwcs.patch
+++ b/debian/patches/rename_libwcs.patch
@@ -1,6 +1,7 @@
 Author: Ole Streicher <debian at liska.ath.cx>
 Description: Rename libwcs to libwcstools to avoid conflicts with Mark
- Calabretta's wcslib package. Also, build and a dynamic library.
+ Calabretta's wcslib package. Also, build a dynamic library and forward
+ CFLAGS, CPPFLAGS and LDFLAGS for fortification.
 --- a/libwcs/Makefile
 +++ b/libwcs/Makefile
 @@ -1,5 +1,5 @@
@@ -23,7 +24,7 @@ Description: Rename libwcs to libwcstools to avoid conflicts with Mark
  	ranlib $@
  
 +libwcstools.so.0.0.0: $(OBJS)
-+	$(CC) -shared -o $@ -Wl,-soname,libwcstools.so.0 $? -lm
++	$(CC) $(LDFLAGS) -shared -o $@ -Wl,-soname,libwcstools.so.0 $? -lm
 +	ln -s libwcstools.so.0.0.0 libwcstools.so.0
 +	ln -s libwcstools.so.0.0.0 libwcstools.so
 +
@@ -38,12 +39,10 @@ Description: Rename libwcs to libwcstools to avoid conflicts with Mark
 +	rm -f *.a *.o *.so *.so.*
 --- a/Makefile
 +++ b/Makefile
-@@ -1,8 +1,8 @@
+@@ -1,13 +1,11 @@
 -CFLAGS= -g -D_FILE_OFFSET_BITS=64
 -CC= cc
 -LIBWCS = libwcs/libwcs.a
-+#CFLAGS= -g -D_FILE_OFFSET_BITS=64
-+CC= gcc
 +LIBWCS = libwcs/libwcstools.so
  LIBNED = libned/libned.a
 -LIBS = $(LIBWCS) -lm
@@ -51,12 +50,259 @@ Description: Rename libwcs to libwcstools to avoid conflicts with Mark
  #LIBS = $(LIBWCS) -lm -lnsl -lsocket
  BIN = bin
  .PRECIOUS: ${LIBWCS} ${LIBNED}
-@@ -178,7 +178,7 @@
+ .c.o:
+-	$(CC) -c $(CFLAGS) $(DEFS) $<
++	$(CC) -c $(CFLAGS) $(CPPFLAGS) $(DEFS) $<
+ 
+ all:	cphead delwcs delhead edhead fixpix gethead i2f imcat imhead immatch \
+ 	imrot imsize imstar imwcs scat sethead addpix getpix setpix sky2xy \
+@@ -17,178 +15,178 @@
+ 	simpos nedpos bincat
+ 
+ addpix: addpix.c $(LIBWCS) libwcs/fitsfile.h
+-	$(CC) $(CFLAGS) -o $(BIN)/addpix addpix.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/addpix addpix.c $(LIBS)
+ 
+ bincat: bincat.c $(LIBWCS) libwcs/fitsfile.h libwcs/wcs.h
+-	$(CC) $(CFLAGS) -o $(BIN)/bincat bincat.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/bincat bincat.c $(LIBS)
+ 
+ char2sp: char2sp.c $(LIBWCS) libwcs/fitsfile.h
+-	$(CC) $(CFLAGS) -o $(BIN)/char2sp char2sp.c $(LIBWCS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/char2sp char2sp.c $(LIBWCS)
+ 
+ conpix: conpix.c $(LIBWCS) libwcs/fitsfile.h
+-	$(CC) $(CFLAGS) -o $(BIN)/conpix conpix.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/conpix conpix.c $(LIBS)
+ 
+ cphead: cphead.c $(LIBWCS) libwcs/fitsfile.h
+-	$(CC) $(CFLAGS) -o $(BIN)/cphead cphead.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/cphead cphead.c $(LIBS)
+ 
+ crlf: crlf.c
+-	$(CC) $(CFLAGS) -o $(BIN)/crlf crlf.c
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/crlf crlf.c
+ 
+ delwcs: delwcs.c $(LIBWCS) libwcs/fitsfile.h
+-	$(CC) $(CFLAGS) -o $(BIN)/delwcs delwcs.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/delwcs delwcs.c $(LIBS)
+ 
+ delhead: delhead.c $(LIBWCS) libwcs/fitsfile.h
+-	$(CC) $(CFLAGS) -o $(BIN)/delhead delhead.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/delhead delhead.c $(LIBS)
+ 
+ edhead: edhead.c $(LIBWCS) libwcs/fitsfile.h
+-	$(CC) $(CFLAGS) -o $(BIN)/edhead edhead.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/edhead edhead.c $(LIBS)
+ 
+ filename: filename.c
+-	$(CC) $(CFLAGS) -o $(BIN)/filename filename.c
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/filename filename.c
+ 
+ filedir: filedir.c
+-	$(CC) $(CFLAGS) -o $(BIN)/filedir filedir.c
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/filedir filedir.c
+ 
+ fileroot: fileroot.c
+-	$(CC) $(CFLAGS) -o $(BIN)/fileroot fileroot.c
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/fileroot fileroot.c
+ 
+ filext: filext.c
+-	$(CC) $(CFLAGS) -o $(BIN)/filext filext.c
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/filext filext.c
+ 
+ fixpix: fixpix.c $(LIBWCS) libwcs/fitsfile.h
+-	$(CC) $(CFLAGS) -o $(BIN)/fixpix fixpix.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/fixpix fixpix.c $(LIBS)
+ 
+ getcol: getcol.c $(LIBWCS) libwcs/wcscat.h
+-	$(CC) $(CFLAGS) -o $(BIN)/getcol getcol.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/getcol getcol.c $(LIBS)
+ 
+ getdate: getdate.c $(LIBWCS) libwcs/wcscat.h
+-	$(CC) $(CFLAGS) -o $(BIN)/getdate getdate.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/getdate getdate.c $(LIBS)
+ 
+ gethead: gethead.c $(LIBWCS) libwcs/wcs.h libwcs/fitsfile.h libwcs/wcscat.h
+-	$(CC) $(CFLAGS) -o $(BIN)/gethead gethead.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/gethead gethead.c $(LIBS)
+ 
+ getfits: getfits.c $(LIBWCS) libwcs/fitsfile.h libwcs/wcs.h libwcs/wcscat.h
+-	$(CC) $(CFLAGS) -o $(BIN)/getfits getfits.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/getfits getfits.c $(LIBS)
+ 
+ getpix: getpix.c $(LIBWCS) libwcs/wcs.h libwcs/fitsfile.h libwcs/wcscat.h
+-	$(CC) $(CFLAGS) -o $(BIN)/getpix getpix.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/getpix getpix.c $(LIBS)
+ 
+ gettab: gettab.c $(LIBWCS) libwcs/wcscat.h
+-	$(CC) $(CFLAGS) -o $(BIN)/gettab gettab.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/gettab gettab.c $(LIBS)
+ 
+ httpget: httpget.c $(LIBWCS) libwcs/wcscat.h
+-	$(CC) $(CFLAGS) -o $(BIN)/httpget httpget.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/httpget httpget.c $(LIBS)
+ 
+ i2f: i2f.c $(LIBWCS) libwcs/fitsfile.h
+-	$(CC) $(CFLAGS) -o $(BIN)/i2f i2f.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/i2f i2f.c $(LIBS)
+ 
+ imcat: imcat.c $(LIBWCS) libwcs/fitsfile.h libwcs/wcs.h
+-	$(CC) $(CFLAGS) -o $(BIN)/imcat imcat.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/imcat imcat.c $(LIBS)
+ 
+ imfill: imfill.c $(LIBWCS) libwcs/fitsfile.h
+-	$(CC) $(CFLAGS) -o $(BIN)/imfill imfill.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/imfill imfill.c $(LIBS)
+ 
+ imresize: imresize.c $(LIBWCS) libwcs/fitsfile.h
+-	$(CC) $(CFLAGS) -o $(BIN)/imresize imresize.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/imresize imresize.c $(LIBS)
+ 
+ imsmooth: imsmooth.c $(LIBWCS) libwcs/fitsfile.h
+-	$(CC) $(CFLAGS) -o $(BIN)/imsmooth imsmooth.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/imsmooth imsmooth.c $(LIBS)
+ 
+ imhead: imhead.c $(LIBWCS) libwcs/fitsfile.h libwcs/wcs.h
+-	$(CC) $(CFLAGS) -o $(BIN)/imhead imhead.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/imhead imhead.c $(LIBS)
+ 
+ imrot: imrot.c $(LIBWCS) libwcs/fitsfile.h
+-	$(CC) $(CFLAGS) -o $(BIN)/imrot imrot.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/imrot imrot.c $(LIBS)
+ 
+ imsize: imsize.c $(LIBWCS) libwcs/fitsfile.h libwcs/wcs.h
+-	$(CC) $(CFLAGS) -o $(BIN)/imsize imsize.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/imsize imsize.c $(LIBS)
+ 
+ imstack: imstack.c $(LIBWCS) libwcs/fitsfile.h
+-	$(CC) $(CFLAGS) -o $(BIN)/imstack imstack.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/imstack imstack.c $(LIBS)
+ 
+ imextract: imextract.c $(LIBWCS) libwcs/fitsfile.h libwcs/wcscat.h
+-	$(CC) $(CFLAGS) -o $(BIN)/imextract imextract.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/imextract imextract.c $(LIBS)
+ 
+ imstar: imstar.c $(LIBWCS) libwcs/fitsfile.h libwcs/wcs.h libwcs/lwcs.h libwcs/wcscat.h
+-	$(CC) $(CFLAGS) -o $(BIN)/imstar imstar.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/imstar imstar.c $(LIBS)
+ 
+ isfits: isfits.c $(LIBWCS) libwcs/fitshead.h
+-	$(CC) $(CFLAGS) -o $(BIN)/isfits isfits.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/isfits isfits.c $(LIBS)
+ 
+ isnum: isnum.c $(LIBWCS) libwcs/fitshead.h
+-	$(CC) $(CFLAGS) -o $(BIN)/isnum isnum.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/isnum isnum.c $(LIBS)
+ 
+ isrange: isrange.c
+-	$(CC) $(CFLAGS) -o $(BIN)/isrange isrange.c
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/isrange isrange.c
+ 
+ imwcs: imwcs.c $(LIBWCS) libwcs/fitsfile.h libwcs/lwcs.h
+-	$(CC) $(CFLAGS) -o $(BIN)/imwcs imwcs.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/imwcs imwcs.c $(LIBS)
+ 
+ immatch: immatch.c $(LIBWCS) libwcs/fitsfile.h libwcs/lwcs.h
+-	$(CC) $(CFLAGS) -o $(BIN)/immatch immatch.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/immatch immatch.c $(LIBS)
+ 
+ immwcs: immwcs.c $(LIBWCS) libwcs/fitsfile.h libwcs/lwcs.h
+-	$(CC) $(CFLAGS) -o $(BIN)/immwcs immwcs.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/immwcs immwcs.c $(LIBS)
+ 
+ keyhead: keyhead.c $(LIBWCS) libwcs/fitsfile.h libwcs/wcs.h
+-	$(CC) $(CFLAGS) -o $(BIN)/keyhead keyhead.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/keyhead keyhead.c $(LIBS)
+ 
+ matchcat: matchcat.c $(LIBWCS) libwcs/wcscat.h libwcs/wcs.h
+-	$(CC) $(CFLAGS) -o $(BIN)/matchcat matchcat.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/matchcat matchcat.c $(LIBS)
+ 
+ nedname: nedname.c $(LIBWCS) $(LIBNED) libwcs/wcs.h libned/ned_client.h
+-	$(CC) $(CFLAGS) -o $(BIN)/nedname nedname.c $(LIBS) $(LIBNED)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/nedname nedname.c $(LIBS) $(LIBNED)
+ 
+ nedpos: nedpos.c $(LIBWCS) $(LIBNED) libwcs/wcs.h libned/ned_client.h
+-	$(CC) $(CFLAGS) -o $(BIN)/nedpos nedpos.c $(LIBS) $(LIBNED)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/nedpos nedpos.c $(LIBS) $(LIBNED)
+ 
+ newfits: newfits.c $(LIBWCS) libwcs/fitshead.h libwcs/wcs.h
+-	$(CC) $(CFLAGS) -o $(BIN)/newfits newfits.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/newfits newfits.c $(LIBS)
+ 
+ remap: remap.c $(LIBWCS) libwcs/fitsfile.h libwcs/wcs.h
+-	$(CC) $(CFLAGS) -o $(BIN)/remap remap.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/remap remap.c $(LIBS)
+ 
+ scat: scat.c $(LIBWCS) libwcs/wcscat.h libwcs/wcs.h
+-	$(CC) $(CFLAGS) -o $(BIN)/scat scat.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/scat scat.c $(LIBS)
+ 
+ sethead: sethead.c $(LIBWCS) libwcs/fitsfile.h libwcs/wcs.h
+-	$(CC) $(CFLAGS) -o $(BIN)/sethead sethead.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/sethead sethead.c $(LIBS)
+ 
+ setpix: setpix.c $(LIBWCS) libwcs/fitsfile.h libwcs/wcscat.h
+-	$(CC) $(CFLAGS) -o $(BIN)/setpix setpix.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/setpix setpix.c $(LIBS)
+ 
+ sky2xy: sky2xy.c $(LIBWCS) libwcs/wcs.h libwcs/fitsfile.h
+-	$(CC) $(CFLAGS) -o $(BIN)/sky2xy sky2xy.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/sky2xy sky2xy.c $(LIBS)
+ 
+ skycoor: skycoor.c $(LIBWCS) libwcs/wcs.h libwcs/wcscat.h
+-	$(CC) $(CFLAGS) -o $(BIN)/skycoor skycoor.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/skycoor skycoor.c $(LIBS)
+ 
+ sp2char: sp2char.c $(LIBWCS) libwcs/fitsfile.h
+-	$(CC) $(CFLAGS) -o $(BIN)/sp2char sp2char.c $(LIBWCS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/sp2char sp2char.c $(LIBWCS)
+ 
+ subpix: subpix.c $(LIBWCS) libwcs/fitsfile.h
+-	$(CC) $(CFLAGS) -o $(BIN)/subpix subpix.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/subpix subpix.c $(LIBS)
+ 
+ sumpix: sumpix.c $(LIBWCS) libwcs/fitsfile.h libwcs/wcscat.h
+-	$(CC) $(CFLAGS) -o $(BIN)/sumpix sumpix.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/sumpix sumpix.c $(LIBS)
+ 
+ wcshead: wcshead.c $(LIBWCS) libwcs/fitsfile.h
+-	$(CC) $(CFLAGS) -o $(BIN)/wcshead wcshead.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/wcshead wcshead.c $(LIBS)
+ 
  xy2sky: xy2sky.c $(LIBWCS) libwcs/wcs.h libwcs/wcscat.h
- 	$(CC) $(CFLAGS) -o $(BIN)/xy2sky xy2sky.c $(LIBS)
+-	$(CC) $(CFLAGS) -o $(BIN)/xy2sky xy2sky.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/xy2sky xy2sky.c $(LIBS)
  
 -simpos: simpos.c libwcs/libwcs.a
+-	$(CC) $(CFLAGS) -o $(BIN)/simpos simpos.c $(LIBS)
 +simpos: simpos.c $(LIBWCS)
- 	$(CC) $(CFLAGS) -o $(BIN)/simpos simpos.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/simpos simpos.c $(LIBS)
  
  gsc2cat: gsc2cat.c $(LIBWCS)
+-	$(CC) $(CFLAGS) -o $(BIN)/gsc2cat gsc2cat.c $(LIBS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/gsc2cat gsc2cat.c $(LIBS)
+ 
+ tmcat: tmcat.c
+-	$(CC) $(CFLAGS) -o $(BIN)/tmcat tmcat.c
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/tmcat tmcat.c
+ 
+ tmcate: tmcate.c
+-	$(CC) $(CFLAGS) -o $(BIN)/tmcate tmcate.c
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(BIN)/tmcate tmcate.c
+ 
+ $(LIBWCS): libwcs/*.c libwcs/*.h
+ 	cd libwcs; make
+--- a/libned/Makefile
++++ b/libned/Makefile
+@@ -5,9 +5,6 @@
+ # you need to link your object files with -lsocket and -lnsl to make executable.
+ 
+ 
+-CFLAGS = -g -D_NO_PROTO
+-CC = cc
+-
+ SRC = ned_cli.c ned_cif.c ned_err.c ned_sk.c
+ OBJ = ned_cli.o ned_cif.o ned_err.o ned_sk.o
+ 

-- 
Create, display and manipulate the world coordinate system

More information about the debian-science-commits mailing list