Commit Graph

21 Commits

Author SHA1 Message Date
Allen Byrne
fc2370bc09 Whitespace cleanup 2020-05-12 15:58:01 -05:00
Larry Knox
5385f032dd Modified Makefile.ams for h5repack, h5watch and gif2h5 to allow
disabling tests.
Moved h5cc.in from tools/src/misc to src directory to always create h5cc
whether or not tools are enabled.
Added configuration status of tools and tests to libhdf5.settings.
2019-06-12 10:21:41 -05:00
Larry Knox
89fbe00dec Merge pull request #426 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit '54957d37f5aa73912763dbb6e308555e863c43f4':
  Commit copyright header change for src/H5PLpkg.c which was added after running script to make changes.
  Add new files in release_docs to MANIFEST. Cimmit changes to Makefile.in(s) and H5PL.c that resulted from running autogen.sh.
  Merge pull request #407 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10_1 to hdf5_1_10_1
  Change copyright headers to replace url referring to file to be removed and replace it with new url for COPYING file.
2017-04-25 16:05:36 -05:00
Allen Byrne
c6fe8c70b2 [svn-r24932] HDFFV-8290: Remove unnecessary $(srcdir) and use AM_CPPFLAGS instead of INCLUDES. Update automake to 1.14.1
h5committest
2014-03-31 12:07:05 -05:00
Allen Byrne
1f8fb63581 [svn-r22709] HDFFV-8129: reconfigured on jam, Remove overloading of autotools TESTS var, rename configure.in to configure.ac, convert test scripts from hard *.sh to configure managed *sh.in files.
Tested: h5committest
2012-08-23 11:07:43 -05:00
Mike McGreevy
7ec079a515 [svn-r17616] Purpose:
CFLAGS overhaul

Description:

    Modified the way configure handles CFLAGS.

    (note: all changes also apply to FCFLAGS, CXXFLAGS, CPPFLAGS, and LDFLAGS).

    1. The configure process will now always preserve a user's CFLAGS
    environment variable setup. Any additional flags necessary for compilation
    added at configure time will be passed into the Makefiles as AM_CFLAGS,
    which is an automake construct to be used in addition to CFLAGS.

    This will allow a user to have the final say, as CFLAGS will always appear
    later in the compile line than AM_CFLAGS. Additionally, setting CFLAGS
    during make will no longer completely erase all flags set by configure,
    since they're maintained in AM_CFLAGS.

    2. Additionally, where possible, flags previously being assigned directly
    into CFLAGS (and thus propagating into h5cc) have now been redirected into
    H5_CFLAGS, so they're used ONLY for compiling hdf5, and not embedded into
    the h5cc wrapper script as well.

    *Note that H5_CFLAGS ultimately is assigned into AM_CFLAGS for use in the
    Makefiles. Complete description of changes and build process will be
    included in a Configure Document that Elena and I are working on.

    3. Removed unsupported config files. This includes:

       config/dec-osf*
       config/hpux11.00
       config/irix5.x
       config/powerpc-ibm-aix4.x
       config/rs6000-ibm-aix5.x
       config/unicos*

     4. Modified configure summary to display additional values. Specifically,
     appropriate AM_* variables are being shown, as well as H5_FCFLAGS and
     H5_CXXFLAGS, which were for some reason not already present.

Tested:

    - H5committest
    - Tested on all THG / NCSA machines, using several combinations of the more
      prominent configure options (c++, fortran, szip, threadsafe, parallel,
      et cetera). (Thanks to Quincey for rysnc testing setup!)
    - With regards to new automated testing, anything *necessary* for
      compilation will be caught by the daily tests as it stands now. (i.e.,
      if LDFLAGS is not properly set when szip is used, linking will fail).
      Additionally, with regards to which flags get into h5cc, if any
      *necessary* flags have been improperly removed, then daily tests should
      fail during make installcheck. Additional machine-specific desired
      behaviors and/or checks may have to be set up separately within the
      daily tests, so this is something to work on.
2009-10-08 10:17:30 -05:00
Mike McGreevy
6a00b1b6ff [svn-r17228] Purpose:
Fix BZ #1583

Description:

    The --enable-static-exec flag was broken. Configure was adding the 
    -all-static linker flag to an environment variable which was subsequently
    never used. (looks like it was used in 1.6 Makefile.ins, but never
    moved to 1.8's Makefile.ams when we added automake support).

    To fix, I've added this environment varibale to the link lines of all the
    tools. Now, when --enable-static-exec is invoked, it will correctly
    generate statically linked executables in the installed bin directory.

Tested:

    I've tested manually to ensure that the generated execs are static when
    the flag is used and dynamic when not. I've also tested when szip is
    used, as this was a use case mentioned in the bug report.

    Also: ran full tests with make check on jam and smirom for good measure.
2009-07-23 15:04:18 -05:00
Mike McGreevy
e894bb1ec6 [svn-r15020] Purpose: Configure Fix
Description: The test program h52gifgentst was getting installed in the bin
             directory during 'make install', and it shouldn't. Make now
             builds the program for use in testing but doesn't install it
             during 'make install'.

Tested: kagiso
2008-05-16 12:52:19 -05:00
Pedro Vicente Nunes
a4c2816077 [svn-r13622]
make makefile to clean temporary files
2007-04-10 10:13:09 -05:00
Pedro Vicente Nunes
753d9839d2 [svn-r13615]
bug fixes
substituted hize_t array index variables for int
stack corruption in the h52gif reading routine, wrote a new routine
shell script for gif tests, added check of program return value

enabled the gif test script

tested: linux pgcc, solaris, linux 64
2007-04-09 13:25:18 -05:00
Pedro Vicente Nunes
be8b1c0592 [svn-r13553]
New feature 

Add a tests script for h52gif tool. A simple script that just runs the
tool from a pre-saved HDF5 file and produces a gif file. A HDF5 test
generator program  is also added

Note: the .am file needs further development, right now it is not
producing the test
2007-03-27 15:17:03 -05:00
Albert Cheng
a7cac4a194 [svn-r13264] Updated Makefile.am with new THG copyright notice.
Ran reconfigure to generate the Makefile.in files.
2007-02-07 17:28:58 -05:00
James Laird
64b5d95251 [svn-r12431] Purpose:
Configuration feature

Description:
'make install' now tests both static and shared libraries if both are installed.

Solution:
Previously, shared libraries were only tested when static libraries were not installed.
Also cleaned up line in commence.am that was including HL library in all Makefiles.

Platforms tested:
mir (Makefile change only)
2006-06-21 18:15:08 -05:00
Pedro Vicente Nunes
bc66efc788 [svn-r12229] Purpose:
new feature

Description:
1) separated the HL library into "public" and "private" header files, with the same caracteristics as the basic library
2) added the public headers to hdf5.h (with a conditional include macro, defined in configure.in)
3) added the path to HL in all Makefile.am 's , because of the inclusion in hdf5.h

Solution:

Platforms tested:
linux 32, 64
AIX
solaris
with fortran and c++

(one packet table example fails)

Misc. update:
2006-04-12 16:21:38 -05:00
James Laird
ea9f792cd7 [svn-r12001] Purpose:
Moved gif2h5 tool to hl directory

Description:
Added a tools directory under the hl directory and moved the gif2h5 tool
to that directory.

Solution:
The gif2h5 tool was originally built in the tools directory, but this
introduced dependency issues that required special checks in the
Makefiles.am and required the top-level build order to be changed
because it depended on the HL library.
For simplicity in the Makefiles now and in the future, the gif2h5 tool
was moved to be underneath the hl library.

Platforms tested:
mir, copper, modi4, shanti
2006-03-03 16:49:10 -05:00
Pedro Vicente Nunes
ed9449e009 [svn-r11932] Purpose:
bug fix

Description:
the --disable-hl switch was causing linking errors on gif2h5 that uses image api (bugzilla #1)

Solution:
used the condional macro for hl to build gif2h5

Platforms tested:
linux

Misc. update:
2006-02-10 11:29:34 -05:00
Pedro Vicente Nunes
f6dd21fb11 [svn-r11931] Purpose:
bug fix

Description:
the linking order in Makefile.am of the gif2h5 tool was causing linking errors on some configurations (pgcc, --disable-shared)

Solution:
changed the order of the linking (hl before hdf5)

Platforms tested:
linux, several configurations
solaris

Misc. update:
2006-02-09 16:06:14 -05:00
Pedro Vicente Nunes
35c1f3682e [svn-r11918] Purpose:
bug fix , bugzilla bug #1

Description:
the gif2h5 was not writing HDF5 images correctly

Solution:
use the Image API to write the image, rewrote the writing functionY

Platforms tested:
linux
solaris

Misc. update:
2006-02-06 11:11:48 -05:00
James Laird
51fdb1ebcf [svn-r11799]
Purpose:
Bug fix

Description:
Libraries were listed in the wrong order in tools/gifconv Makefile.am, confusing
the linker.

Solution:
Put HDF5 library after tools library in Makefile.am and ran reconfigure.

Platforms tested:
mir, sleipnir
2005-12-16 10:58:37 -05:00
James Laird
b96f342722 [svn-r9993] Purpose:
Bug fix

Description:
Arabica exhibited strange errors when linker found wrong versions of
header files.  This happened because include directories were
given to linker in the wrong order.

Solution:
Move include directories from AM_CFLAGS variable to INCLUDES
variable to put them before CPPFLAGS variable.  Trust me, it works.
This bug may also have contributed to strange errors on other platforms
(kelgia?).

Platforms tested:
copper, sleipnir, arabica.
	(h5dump broke while building on arabica, but this happened in
	a clean checkout, too).
2005-02-11 16:32:22 -05:00
James Laird
26303241fe [svn-r9902] Purpose:
Configuration feature

Description:
HDF5 now uses automake to generate Makefiles

Solution:
Makefile.in files are now generated from Makefile.am files.
To reconfigure (after chaning a Makefile.am or configure.in):
/bin/sh bin/reconfigure.sh

Platforms tested:
Many
2005-01-31 22:17:02 -05:00