Updated devel/cfitsio from 3.37 to 3.39 (from doc/changes.txt)

---------------------------------------
Version 3.39 - April 2016

   - added 2 new routines suggested by Eric Mandel:
      ffhisto3 is similar to ffhisto2, except that it does not close the
         original file.
      fits_open_extlist is similar to fits_open_data except that it opens
         the FITS file and then moves to the first extension in the user-input
	 list of 'good' extensions.

   - in ffpsvc and ffprec, it is necessary to treat CONTINUE, COMMENT, HISTORY,
     and blank name keywords as a special case which must be treated differently
     from other keywords because they have no value field and, by definition,
     have keyword names that are strictly limited in length.

   - added the Fortran wrapper routines for the 2 new string keyword reading
     routines (FTGSKY and FTGKSL), and documented all the routines in the
     FITSIO and CFITSIO users guides.

   - in ffinttyp, added explicit initialization of the input 'negative'
     argument to 0.

   - added new routine to return the length of the keyword value string:
         fits_get_key_strlen / ffgksl.
     This is primarily intended for use with string keywords
     that use the CONTINUE convention to continue the
     value over multiple header records, but this routine can be used
     to get the length of the value string for any type keyword.

   - added new routine to read string-valued keywords:
          fits_read_string_key / ffgsky
     This routine supports normal string keywords as well as long string
     keywords that use the CONTINUE convention. In many cases this routine
     may be more convenient to use then the older fits_read_key_longstr
     routine.

   - changed the prototype of fits_register_driver in fitsio2.h so that the
     pointer definition argument does not have the same name as the pointer
     itself (to work around a bug in the pgcc compiler).

   - added the missing FTDTDM fortran wrapper definition to f77_wrap3.c.

   - modified Makefile.in and configure.in to add LDFLAGS_BIN for task linker
     flages, which will be the same as LDFLAGS except on newer Mac OS X where
     an rpath flag is added.

   - modified Makefile.in to add a new "make utils" command which will build
     fpack, funpack, cookbook, fitscopy, imcopy, smem, speed, and testprog.
     These programs will be installed into $prfix/bin.

   - fixed a bug when attempting to modify the values in a variable-length
     bit ("X") column in a binary table.

   - reinstated the ability to write HIERARCH keywords that contain characters
     that would not be allowed in a normal 8-character keyword name, which had
     been disabled in the previous release.

Version 3.38 - February 2016

   - CRITICAL BUG FIX:
     The Intel 15 and 16 compilers (and potentially other compilers) may silently
     produce incorrect assembly code when compiling CFITSIO with the -O2 (or
     higher) optimization flag. In particular, this problem could cause  CFITSIO
     to incorrectly read the values of arrays of 32-bit integers in a  FITS file
     (i.e., images with BITPIX = 32 or table columns with TFORM = 'J')  when the
     array is being read into a 'long' integer array in cases where the long
     array elements are 8 bytes long.

     One way to test if a particular system is affected by this problem is to
     compile CFITSIO V3.37 (or earlier) with optimization enabled, and then
     compare the output of the testprog.c program with the testprog.out file
     that is distributed with CFITSIO. If there are any  differences in the
     files, then this system might be affected by this bug. Further tests
     should be performed to determine the exact cause.

     The root cause of this problem was traced to the fact that CFITSIO was
     aliasing an array of 32-bit integers and an array of 64-bit integers to the
     same memory location in order to obtain better data I/O efficiency when
     reading FITS files.  When CFITSIO modified the values in these arrays, it
     was essential that the processing be done in strict sequential order from
     one end of the array to the other end, as was implicit in the C code
     algorithm. In this case, however, the compiler adopted certain  loop
     optimization techniques that produced assembly code that violated  this
     assumption.  Technically, the CFITSIO code violates the "strict aliasing"
     assumption in ANSI C99, therefore the affected CFITSIO routines have been
     modified so that the aliasing of different data types to the same memory
     location no longer occurs.

   - fixed problem in configure and configure.in which caused the programs that
     are distributed with CFITSIO (most notably, fack and funpack) to be build
     without using any compiler optimization options, which could make them
     run more slowly than expected.

   - in imcompress.c, fixed bug where the rowspertile variable (declared as 'long')
     was mistakenly declared as a TLONGLONG variable in a call to fits_write_key.
     This could have caused the ZTILELEN keyword to be written incorrectly in
     the header of tile-compressed FITS tables on systems where sizeof(long) = 4.

   - in imcompress.c, implemented a new set of routines that safely convert
     shorter integer arrays into a longer integer arrays (e.g. short to int)
     where both arrays are aliased to the same memory location.  These
     special routines were needed to guard against certain compiler optimization
     techniques that could produce incorrect code.

   - modified the 4 FnNoise5_(type) routines in quantize.c to correctly
     count the number of non-null pixels in the input array.  Previously the
     count could be inaccurate if the image mainly consisted of null pixels.
     This could have caused certain floating point image tiles to be
     quantized during the image compression process, when in fact the tile
     did not satisfy all the criteria to be safely quantized.

   - in imcomp_copy_comp2img, added THEAP to the list of binary table
     keywords that may be present in the header of a compressed image
     and should not be copied to the uncompressed image header.

   - modified fits_copy_col to check that when copying a vector column, the
     vector length in the output column is the same as in the input column.
     Also modified the code to support the case where a column is being copied
     to an earlier position in the same table (which shifts the input column
     over 1 space).

   - added configure option (--with-bzip2) to support reading bzip2 compressed
     FITS files.  This also required modifications to drvrmem.c and drvrfile.c
     This depends on having the bzlib library installed on the
     local machine.  This patch was submitted by Dustin Lang.

   - replaced calls to 'memcpy' by 'memmove' in getcolb.c, getcold.c,
     getcole.c, and getcoli.c to support cases where the 2 memory areas
     overlap. (submitted by Aurelien Jarno)

   - modified the FITS keyword reading and writing routines to potentially
     support keywords with names longer than 8-characters.  This was implemented
     in anticipation of a new experimental FITS convention which allows longer
     keyword names.

   - in fits_quantize_double in quantize.c, test if iseed == N_RANDOM,
     to avoid the (unlikely) possibility of overflowing the random number
     array bounds. (The corresponding fits_quantize_float routine already
     performed this test).

   - in the FnNoise5_short routine in quantize.c, change the first 'if'
     statement from "if (nx < 5)" to "if )nx < 9)", in order to support the
     (very rare) case where the tile is from 5 to 8 pixels wide.  Also make
     the same change in the 3 other similar FnNoise5_* routines.

   - in the qtree_bitins64 routine in fits_hdecompress.c, must declare the
     plane_val variable as 'LONGLONG' instead of int.  This bug could have
     caused integer overflow errors when uncompressing integer*4 images that
     had been compressed with the Hcompress algorithm, but only in cases
     where the image contains large regions of pixels whose values are close
     to the maximum integer*4 value of 2**31.

   - in fits_hcompress.c, call the calloc function instead of malloc when
     allocating the signbits array, to eliminate the need to individually
     set each byte to zero.

   - in the ffinit routine, and in a couple other routines that call ffinit,
     initialize the *fptr input parameter to NULL, even if the input
     status parameter value is greater than zero.  This helps prevent
     errors later on if that fptr value is passed to ffclos.

   - modified ftcopy, in edithdu.c, to only abort if status > 0 rather
     than if status != 0. This had caused a problem in funpack in rare
     circumstances.

   - in imcompress.c changed all the calls to ffgdes to ffgdesll, to support
     compressed files greater than 2.1 GB in size.

   - fixed bug in ffeqtyll when it is called with 4th and 5th arguments
     set to NULL.

   - in fitsio.h, added the standard C++ guard around the declaration of the
     function fits_read_wcstab.  (reported by Tammo Jan Dijkema, Astron.)

   - in fitsio.h, changed the prototype variable name "zero" to "zeroval" to
     avoid conflict in code that uses a literal definition of 'zero' to mean 0.

   - tweaked Makefile.in and configure.in to use LDFLAGS instead of CFLAGS
     for linking, use Macros for library name, and let fpack and funpack
     link with shared library.

   - modified an 'ifdef' statement in cfileio.c to test for '__GLIBC__'
     instead of 'linux' when initializing support for multi-threading.

   - modified ffeqtyll to return an effective column data type of TDOUBLE
     in the case of a 'K' (64-bit integer) column that has non-integer
     TSCALn or TZEROn keywords.

   - modified ffgcls (which returns the value in a column as a formatted string)
     so that when reading a 'K' (TLONGLONG) column it returns a long long integer
     value if the column is not scaled, but returns a double floating point
     value if the column has non-integer TSCALn or TZEROn values.

   - modified fitsio.h to correctly define "OFF_T long long" when using
     the Borland compiler

   - converted the 'end of line' characters in simplerng.c file to the unix
     style, instead of PC DOS.

   - updated CMakeLists.txt CMake build file which is primarily used to
     build CFITSIO on Windows machines.

   - modified fits_get_keyclass to recognize ZQUANTIZ and ZDITHER0 as
     TYP_CMPRS_KEY type keywords, i.e., keywords used in tile compressed
     image files.

   - added test to see if HAVE_UNISTD_H is defined, as a condition for
     including unistd.h in drvrfile.c drvrnet.c, drvrsmem.c, and group.c.

   - modified the CMakelist.txt file to fix several issues (primarily for
     building CFITSIO on Windows machines)..

   - fixed bug when reading tile-compressed images that were compressed with
     the IRAF PLIO algorithm.  This bug did not affect fpack or funpack, but
     other software that reads the compressed image could be affected.  The
     bug would cause the data values to be offset by 32768 from the actual
     pixel values.

4 files changed, 73 insertions, 74 deletions

diff --git a/devel/cfitsio/Makefile b/devel/cfitsio/Makefile
index 6a9036c86a4..2f437991adb 100644
--- a/devel/cfitsio/Makefile
+++ b/devel/cfitsio/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2015/04/08 16:23:27 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.30 2016/06/18 09:06:11 mef Exp $
 
-DISTNAME=	cfitsio3370
+DISTNAME=	cfitsio3390
 PKGNAME=	${DISTNAME:S/o3/o-3./}
 CATEGORIES=	devel
 MASTER_SITES=	http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/
diff --git a/devel/cfitsio/PLIST b/devel/cfitsio/PLIST
index 1a21a0ae981..ea7301eb61b 100644
--- a/devel/cfitsio/PLIST
+++ b/devel/cfitsio/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.7 2015/04/08 16:23:27 hiramatsu Exp $
+@comment $NetBSD: PLIST,v 1.8 2016/06/18 09:06:11 mef Exp $
+bin/testprog
 include/drvrsmem.h
 include/fitsio.h
 include/fitsio2.h
diff --git a/devel/cfitsio/distinfo b/devel/cfitsio/distinfo
index e412b16cda5..89f8f2129c3 100644
--- a/devel/cfitsio/distinfo
+++ b/devel/cfitsio/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.13 2015/11/03 03:27:18 agc Exp $
+$NetBSD: distinfo,v 1.14 2016/06/18 09:06:11 mef Exp $
 
-SHA1 (cfitsio3370.tar.gz) = 48bd6389dcff3228508eec70384f2cae3a88ff32
-RMD160 (cfitsio3370.tar.gz) = 709e2d3e9d69abe84f93a8cbc343f05eddedf8b9
-SHA512 (cfitsio3370.tar.gz) = 97c820757513ac0c59c277b39b8f8a6d1cbc1b2d37ca8ee68d645533a37d25fcdba87e676eaaf3cfa557c34591e9476326d892e0f8c42d3e1372e1d6a4406d18
-Size (cfitsio3370.tar.gz) = 4738430 bytes
-SHA1 (patch-aa) = f0942f57ba02fe62d373cbfe9315b3e1f87ab05f
+SHA1 (cfitsio3390.tar.gz) = 818ee00793ae27dfc75752c2415d0a7230ad5066
+RMD160 (cfitsio3390.tar.gz) = 515146dd69dfacc0a41f5d2727332c81b9fa501b
+SHA512 (cfitsio3390.tar.gz) = 9e72fe58e1b2e45dfad23c5a60f9056a4e958b3b567751c5284d5d89992f0a2721aa44ede8655f0e1595eaea9d6ba4644b001c54274764f9d05f890d471e4534
+Size (cfitsio3390.tar.gz) = 4755390 bytes
+SHA1 (patch-aa) = cacbc44cd442096d094faef79a2bb47980df8543
 SHA1 (patch-ad) = 761aedc2ae885c119ac2726ba89aaa7c193a8834
diff --git a/devel/cfitsio/patches/patch-aa b/devel/cfitsio/patches/patch-aa
index 72dc88f4342..80d75b88f0a 100644
--- a/devel/cfitsio/patches/patch-aa
+++ b/devel/cfitsio/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.5 2015/04/08 16:23:28 hiramatsu Exp $
+$NetBSD: patch-aa,v 1.6 2016/06/18 09:06:11 mef Exp $
 
 Use libtool.
 
---- Makefile.in.orig	2014-06-04 03:51:29.000000000 +0900
-+++ Makefile.in	2015-04-08 21:11:43.000000000 +0900
-@@ -34,12 +34,13 @@
+--- Makefile.in.orig	2016-04-02 04:06:28.000000000 +0900
++++ Makefile.in	2016-06-18 17:30:44.000000000 +0900
+@@ -37,14 +37,15 @@ INSTALL_DIRS	= @INSTALL_ROOT@ ${CFITSIO_
  SHELL =		/bin/sh
  ARCHIVE =	@ARCHIVE@
  RANLIB =	@RANLIB@
@@ -12,92 +12,90 @@ Use libtool.
 +CC =		${LIBTOOL} --mode=compile @CC@
 +LD =		${LIBTOOL} --mode=link @CC@
  CFLAGS =	@CFLAGS@
+ CPPFLAGS =	@CPPFLAGS@
  SSE_FLAGS =	@SSE_FLAGS@
  FC =		@FC@
- LDFLAGS =	$(CFLAGS)
+ LDFLAGS =	@LDFLAGS@
+ LDFLAGS_BIN =	@LDFLAGS_BIN@
 -DEFS =		@DEFS@
 +DEFS =		@DEFS@ -Dunix
  LIBS =		@LIBS@
  FLEX =		flex
  BISON =		bison
-@@ -89,11 +90,10 @@
+@@ -94,11 +95,11 @@ all:
  all-nofitsio:
  		${MAKE} stand_alone "FITSIO_SRC="
  
--stand_alone:	libcfitsio.a
-+stand_alone:	libcfitsio.la
+-stand_alone:	lib${PACKAGE}.a
++stand_alone:	lib${PACKAGE}.la
  
--libcfitsio.a:	${OBJECTS}
--		${ARCHIVE} libcfitsio.a ${OBJECTS}; \
--		${RANLIB} libcfitsio.a;
-+libcfitsio.la:	${OBJECTS}
+-lib${PACKAGE}.a:	${OBJECTS}
+-		${ARCHIVE} $@ ${OBJECTS}; \
+-		${RANLIB} $@;
++lib${PACKAGE}.la:	${OBJECTS}
++		${ARCHIVE} $lib${PACKAGE}.la ${OBJECTS}; \
 +		${LIBTOOL} --mode=link @CC@ -o $@ ${OBJECTS:.o=.lo} -rpath ${PREFIX}/lib -version-info 3:0
  
- shared: libcfitsio${SHLIB_SUFFIX}
+ shared: lib${PACKAGE}${SHLIB_SUFFIX}
  
-@@ -104,10 +104,10 @@
+@@ -109,10 +110,10 @@ lib${PACKAGE}${SHLIB_SUFFIX}: ${OBJECTS}
  			ln -sf ${CFITSIO_SHLIB_SONAME} $@; \
  		fi
  
--install:	libcfitsio.a $(INSTALL_DIRS)
--		/bin/cp -a libcfitsio* ${CFITSIO_LIB}
+-install:	lib${PACKAGE}.a ${INSTALL_DIRS}
+-		/bin/cp -a lib${PACKAGE}* ${CFITSIO_LIB}
 -		/bin/cp fitsio.h fitsio2.h longnam.h drvrsmem.h ${CFITSIO_INCLUDE}
 -		/bin/cp cfitsio.pc ${CFITSIO_LIB}/pkgconfig
-+install:	libcfitsio.la $(INSTALL_DIRS)
++install:	lib${PACKAGE}.la ${INSTALL_DIRS}
 +		${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libcfitsio.la ${CFITSIO_LIB}
 +		${BSD_INSTALL_DATA} fitsio.h fitsio2.h longnam.h drvrsmem.h ${CFITSIO_INCLUDE}/
 +		${BSD_INSTALL_DATA} cfitsio.pc ${CFITSIO_LIB}/pkgconfig
- 
- .c.o:
- 		$(CC) -c -o ${<D}/${@F} $(CFLAGS) $(DEFS) $<
-@@ -115,32 +115,32 @@
+ 		@for task in ${FPACK_UTILS} ${UTILS}; do \
+ 		    if [ -f $$task ]; then \
+ 			if [ ! -d ${CFITSIO_BIN} ]; then mkdir -p ${CFITSIO_BIN}; fi; \
+@@ -133,29 +134,29 @@ utils:		${FPACK_UTILS} ${UTILS}
  swapproc.o:	swapproc.c
- 		$(CC) -c $(CFLAGS) $(SSE_FLAGS) $(DEFS) $<
+ 		${CC} -c ${CFLAGS} ${CPPFLAGS} ${SSE_FLAGS} ${DEFS} $<
  
--smem:		smem.o libcfitsio.a ${OBJECTS}
--		${CC} $(CFLAGS) $(DEFS) -o smem smem.o -L. -lcfitsio -lm
-+smem:		smem.o libcfitsio.la ${OBJECTS}
+-smem:		smem.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm
++smem:		smem.o lib${PACKAGE}.la ${OBJECTS}
 +		${LD} $(CFLAGS) $(DEFS) -o smem smem.o -L. -lcfitsio -lm
  
--testprog:	testprog.o libcfitsio.a ${OBJECTS}
--		${CC} $(CFLAGS) $(DEFS) -o testprog testprog.o -L. -lcfitsio -lm ${LIBS}
-+testprog:	testprog.o libcfitsio.la ${OBJECTS}
-+		${LD} $(CFLAGS) $(DEFS) -o testprog testprog.o -L. -lcfitsio -lm ${LIBS}
- 
--fpack:		fpack.o fpackutil.o libcfitsio.a ${OBJECTS}
--		${CC} $(CFLAGS) $(DEFS) -o fpack fpack.o fpackutil.o libcfitsio.a -lm ${LIBS}
-+fpack:		fpack.o fpackutil.o libcfitsio.la ${OBJECTS}
-+		${LD} $(CFLAGS) $(DEFS) -o fpack fpack.o fpackutil.o libcfitsio.a -lm ${LIBS}
- 
--funpack:	funpack.o fpackutil.o libcfitsio.a ${OBJECTS}
--		${CC} $(CFLAGS) $(DEFS) -o funpack funpack.o fpackutil.o libcfitsio.a -lm ${LIBS}
-+funpack:	funpack.o fpackutil.o libcfitsio.la ${OBJECTS}
-+		${LD} $(CFLAGS) $(DEFS) -o funpack funpack.o fpackutil.o libcfitsio.a -lm ${LIBS}
- 
--fitscopy:	fitscopy.o libcfitsio.a ${OBJECTS}
--		${CC} $(CFLAGS) $(DEFS) -o fitscopy fitscopy.o -L. -lcfitsio -lm ${LIBS}
-+fitscopy:	fitscopy.o libcfitsio.la ${OBJECTS}
-+		${LD} $(CFLAGS) $(DEFS) -o fitscopy fitscopy.o -L. -lcfitsio -lm ${LIBS}
- 
--speed:		speed.o libcfitsio.a ${OBJECTS}
--		${CC} $(CFLAGS) $(DEFS) -o speed speed.o -L. -lcfitsio -lm ${LIBS}
-+speed:		speed.o libcfitsio.la ${OBJECTS}
-+		${LD} $(CFLAGS) $(DEFS) -o speed speed.o -L. -lcfitsio -lm ${LIBS}
- 
--imcopy:		imcopy.o libcfitsio.a ${OBJECTS}
--		${CC} $(CFLAGS) $(DEFS) -o imcopy imcopy.o -L. -lcfitsio -lm ${LIBS}
-+imcopy:		imcopy.o libcfitsio.la ${OBJECTS}
-+		${LD} $(CFLAGS) $(DEFS) -o imcopy imcopy.o -L. -lcfitsio -lm ${LIBS}
- 
--listhead:	listhead.o libcfitsio.a ${OBJECTS}
--		${CC} $(CFLAGS) $(DEFS) -o listhead listhead.o -L. -lcfitsio -lm ${LIBS}
-+listhead:	listhead.o libcfitsio.la ${OBJECTS}
-+		${LD} $(CFLAGS) $(DEFS) -o listhead listhead.o -L. -lcfitsio -lm ${LIBS}
- 
--cookbook:	cookbook.o libcfitsio.a ${OBJECTS}
--		${CC} $(CFLAGS) $(DEFS) -o cookbook cookbook.o -L. -lcfitsio -lm ${LIBS}
-+cookbook:	cookbook.o libcfitsio.la ${OBJECTS}
-+		${LD} $(CFLAGS) $(DEFS) -o cookbook cookbook.o -L. -lcfitsio -lm ${LIBS}
+-testprog:	testprog.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
++testprog:	testprog.o lib${PACKAGE}.la ${OBJECTS}
++		${LD} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
+ 
+-fpack:		fpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
++fpack:		fpack.o fpackutil.o lib${PACKAGE}.la ${OBJECTS}
++		${LD} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
+ 
+-funpack:	funpack.o fpackutil.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
++funpack:	funpack.o fpackutil.o lib${PACKAGE}.la ${OBJECTS}
++		${LD} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o fpackutil.o -L. -l${PACKAGE} -lm ${LIBS}
+ 
+-fitscopy:	fitscopy.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
++fitscopy:	fitscopy.o lib${PACKAGE}.la ${OBJECTS}
++		${LD} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
+ 
+-speed:		speed.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
++speed:		speed.o lib${PACKAGE}.la ${OBJECTS}
++		${LD} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
+ 
+-imcopy:		imcopy.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
++imcopy:		imcopy.o lib${PACKAGE}.la ${OBJECTS}
++		${LD} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
+ 
+-cookbook:	cookbook.o lib${PACKAGE}.a ${OBJECTS}
+-		${CC} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
++cookbook:	cookbook.o lib${PACKAGE}.la ${OBJECTS}
++		${LD} ${LDFLAGS_BIN} ${DEFS} -o $@ ${@}.o -L. -l${PACKAGE} -lm ${LIBS}
  
  eval:		# Rebuild eval_* files from flex/bison source
- 		$(FLEX) -t eval.l > eval_l.c1
+ 		${FLEX} -t eval.l > eval_l.c1