Fixes to cmake build environment to filter out test drivers from sources,

CMakeLists.txt simplifications in ngmx and tools (loops, not lists), and
modifications to avoid rebuilding unnecessary dependencies.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae73463a6e5f325d07bc625b2c93ae89edd52d8c..b603370efcb7dcbfad80e89fb4031a5815674a13 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -139,7 +139,7 @@ include_directories(${CMAKE_SOURCE_DIR}/src)
 include_directories(${CMAKE_SOURCE_DIR}/include)
 
 include(gmxCheckBuildUserTime)
-gmx_check_build_user_time()
+gmx_check_build_user_time(BUILD_TIME BUILD_USER BUILD_MACHINE)
 
 include(gmxTestFloatFormat)
 gmx_test_float_format(GMX_FLOAT_FORMAT_IEEE754 

diff --git a/cmake/gmxCheckBuildUserTime.cmake b/cmake/gmxCheckBuildUserTime.cmake
index 13f1abf0b21a2d288462b371652cc097b1507fa1..04950d7ab609a363c7dcaf5843a85fc02f405278 100644 (file)
--- a/cmake/gmxCheckBuildUserTime.cmake
+++ b/cmake/gmxCheckBuildUserTime.cmake
@@ -1,29 +1,32 @@
 # - Check the username performing the build, as well as date and time
 #
-# GMX_CHECK_BUILD_USER_TIME()
+# GMX_CHECK_BUILD_USER_TIME(BUILD_TIME BUILD_USER BUILD_MACHINE)
 #
-# No input arguments used for this macro.
-#
-# The output variables (strings) created are:
-# (These could be 'unknown'/'anonymous' if detection fails)
+# The macro variables will be set to the user/machine used for configuration,
+# or anonymous/unknown if it cannot be detected (windows)
 #
 # BUILD_TIME
 # BUILD_USER 
 # BUILD_MACHINE
 #
-macro(gmx_check_build_user_time)
+macro(gmx_check_build_user_time BUILD_TIME BUILD_USER BUILD_MACHINE)
+    IF(NOT DEFINED ${BUILD_MACHINE})
+
     message(STATUS "Setting build user & time")
     if(CMAKE_HOST_UNIX)
-        execute_process( COMMAND date     OUTPUT_VARIABLE BUILD_TIME OUTPUT_STRIP_TRAILING_WHITESPACE)
+        execute_process( COMMAND date     OUTPUT_VARIABLE ${BUILD_TIME}  OUTPUT_STRIP_TRAILING_WHITESPACE)
         execute_process( COMMAND whoami   OUTPUT_VARIABLE TMP_USER       OUTPUT_STRIP_TRAILING_WHITESPACE)
        execute_process( COMMAND hostname OUTPUT_VARIABLE TMP_HOSTNAME   OUTPUT_STRIP_TRAILING_WHITESPACE)
-        set(BUILD_USER    "@TMP_USER@\@@TMP_HOSTNAME@ [CMAKE]")
-        execute_process( COMMAND uname -srm OUTPUT_VARIABLE BUILD_MACHINE OUTPUT_STRIP_TRAILING_WHITESPACE)
+        set(${BUILD_USER}    "@TMP_USER@\@@TMP_HOSTNAME@ [CMAKE]")
+        execute_process( COMMAND uname -srm OUTPUT_VARIABLE ${BUILD_MACHINE} OUTPUT_STRIP_TRAILING_WHITESPACE)
         message(STATUS "Setting build user & time - OK")
     else(CMAKE_HOST_UNIX)
-        set(BUILD_TIME    "Unknown date")
-        set(BUILD_USER    "Anonymous@unknown [CMAKE]")
-        set(BUILD_MACHINE "@CMAKE_HOST_SYSTEM@ @CMAKE_HOST_SYSTEM_PROCESSOR@") 
+        set(${BUILD_TIME}    "Unknown date")
+        set(${BUILD_USER}    "Anonymous@unknown [CMAKE]")
+        set(${BUILD_MACHINE} "@CMAKE_HOST_SYSTEM@ @CMAKE_HOST_SYSTEM_PROCESSOR@") 
         message(STATUS "Setting build user & time - not on Unix, using anonymous")
     endif(CMAKE_HOST_UNIX)
-endmacro(gmx_check_build_user_time)
+
+    ENDIF(NOT DEFINED ${BUILD_MACHINE})
+endmacro(gmx_check_build_user_time BUILD_TIME BUILD_USER BUILD_MACHINE)
+

diff --git a/cmake/gmxTestCatamount.cmake b/cmake/gmxTestCatamount.cmake
index 03523bae1520a38b8d3142681c802397a611078c..57272b6aabd0c75c6bfab3b850f562f51525d428 100644 (file)
--- a/cmake/gmxTestCatamount.cmake
+++ b/cmake/gmxTestCatamount.cmake
@@ -6,7 +6,7 @@
 #
 
 MACRO(GMX_TEST_CATAMOUNT VARIABLE)
-    IF("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")
+    IF(NOT DEFINED ${VARIABLE})
 
         MESSAGE(STATUS "Checking for CRAY XT Catamount compile")
 
@@ -23,7 +23,7 @@ MACRO(GMX_TEST_CATAMOUNT VARIABLE)
         set(${VARIABLE} ${CATAMOUNT_COMPILE_OK} CACHE INTERNAL 
             "Result of test for CRAY XT Catamount target" FORCE)
         
-    ENDIF("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")
+    ENDIF(NOT DEFINED ${VARIABLE})
 ENDMACRO(GMX_TEST_CATAMOUNT VARIABLE)
 
 

diff --git a/cmake/gmxTestFloatFormat.cmake b/cmake/gmxTestFloatFormat.cmake
index 6b4205b14ff7f15603d3741031e587cb3d3f6d9b..665ce76301d8221c544a011df1aab9ae02a4bf96 100644 (file)
--- a/cmake/gmxTestFloatFormat.cmake
+++ b/cmake/gmxTestFloatFormat.cmake
@@ -12,7 +12,7 @@
 #  so we figured it is a good idea to test both before relying on the format.
 
 MACRO(GMX_TEST_FLOAT_FORMAT FP_IEEE754 FP_BIG_ENDIAN_BYTE FP_BIG_ENDIAN_WORD)
-    IF("HAVE_${FP_IEEE754}" MATCHES "^HAVE_${FP_IEEE754}$")
+    IF(NOT DEFINED HAVE_${FP_IEEE754})
         MESSAGE(STATUS "Checking floating point format")
 
         TRY_COMPILE(HAVE_${FP_IEEE754} "${CMAKE_BINARY_DIR}"    
@@ -71,7 +71,7 @@ MACRO(GMX_TEST_FLOAT_FORMAT FP_IEEE754 FP_BIG_ENDIAN_BYTE FP_BIG_ENDIAN_WORD)
         else(GMX_IEEE754_LB_LW)
             MESSAGE(STATUS "Checking floating point format - unknown")
         endif(GMX_IEEE754_BB_BW)
-    ENDIF("HAVE_${FP_IEEE754}" MATCHES "^HAVE_${FP_IEEE754}$")
+    ENDIF(NOT DEFINED HAVE_${FP_IEEE754})
 ENDMACRO(GMX_TEST_FLOAT_FORMAT FP_IEEE754 FP_BIG_ENDIAN_BYTE FP_BIG_ENDIAN_WORD)
 
 

diff --git a/cmake/gmxTestInline.cmake b/cmake/gmxTestInline.cmake
index 00a8430e5753df4ceb0dea142863b67140781618..fb98aa7e6276647742f40fa1d7a953439f7cead8 100644 (file)
--- a/cmake/gmxTestInline.cmake
+++ b/cmake/gmxTestInline.cmake
@@ -7,7 +7,7 @@
 #  Remember to have a cmakedefine for it too...
 
 MACRO(GMX_TEST_INLINE VARIABLE)
-    IF("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")
+    IF(NOT DEFINED ${VARIABLE})
         
         MESSAGE(STATUS "Checking for inline keyword")
 
@@ -28,8 +28,7 @@ MACRO(GMX_TEST_INLINE VARIABLE)
             MESSAGE(STATUS "Checking for inline keyword - not found")
         ENDIF(NOT DEFINED C_INLINE)
         
-    ENDIF("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")
-
+    ENDIF(NOT DEFINED ${VARIABLE})
 ENDMACRO(GMX_TEST_INLINE VARIABLE)
 
 

diff --git a/cmake/gmxTestInlineASM.cmake b/cmake/gmxTestInlineASM.cmake
index cd5fc706cfdab67017e31155f1a3b864cb0388bc..5a343c134d1bb81cf5cba7f018a0a5e9d2a9735f 100644 (file)
--- a/cmake/gmxTestInlineASM.cmake
+++ b/cmake/gmxTestInlineASM.cmake
@@ -7,8 +7,7 @@
 #  Remember to have a cmakedefine for it too...
 
 MACRO(GMX_TEST_INLINE_ASM_GCC_X86 VARIABLE)
-    IF("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")
-
+    IF(NOT DEFINED ${VARIABLE})
         
         MESSAGE(STATUS "Checking for GCC x86 inline asm")
 
@@ -20,9 +19,10 @@ MACRO(GMX_TEST_INLINE_ASM_GCC_X86 VARIABLE)
             set(${VARIABLE} 1 CACHE INTERNAL "Result of test for GCC x86 inline asm" FORCE)
         else(${VARIABLE})
             MESSAGE(STATUS "Checking for GCC x86 inline asm - not supported")
+            set(${VARIABLE} 0 CACHE INTERNAL "Result of test for GCC x86 inline asm" FORCE)
        endif(${VARIABLE})
-        
-    ENDIF("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")
+
+    ENDIF(NOT DEFINED ${VARIABLE})
 ENDMACRO(GMX_TEST_INLINE_ASM_GCC_X86 VARIABLE)
 
 
@@ -36,7 +36,7 @@ ENDMACRO(GMX_TEST_INLINE_ASM_GCC_X86 VARIABLE)
 #  Remember to have a cmakedefine for it too...
 
 MACRO(GMX_TEST_INLINE_ASM_MSVC_X86 VARIABLE)
-    IF("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")
+    IF(NOT DEFINED ${VARIABLE})
 
         MESSAGE(STATUS "Checking for MSVC x86 inline asm")
 
@@ -48,9 +48,10 @@ MACRO(GMX_TEST_INLINE_ASM_MSVC_X86 VARIABLE)
             set(${VARIABLE} 1 CACHE INTERNAL "Result of test for MSVC x86 inline asm" FORCE)
        else(${VARIABLE})
             MESSAGE(STATUS "Checking for MSVC x86 inline asm - not supported")
+            set(${VARIABLE} 0 CACHE INTERNAL "Result of test for MSVC x86 inline asm" FORCE)
         endif(${VARIABLE})
 
-    ENDIF("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")
+    ENDIF(NOT DEFINED ${VARIABLE})
 ENDMACRO(GMX_TEST_INLINE_ASM_MSVC_X86 VARIABLE)
 
 

diff --git a/cmake/gmxTestLargeFiles.cmake b/cmake/gmxTestLargeFiles.cmake
index ee08aa7f5855b9cdb6a0378120b92cca4ef9c134..a8efb9f4df9372ac1f925c4887e38efccd5cc724 100644 (file)
--- a/cmake/gmxTestLargeFiles.cmake
+++ b/cmake/gmxTestLargeFiles.cmake
@@ -93,6 +93,7 @@ MACRO(GMX_TEST_LARGE_FILES VARIABLE)
                 set(HAVE_FSEEKO 1)
             else(HAVE_${VARIABLE})
                 MESSAGE(STATUS "Checking for fseeko/ftello - not found")
+                SET(${VARIABLE} 0 CACHE INTERNAL "Result of test for large file support" FORCE)
             endif(HAVE_${VARIABLE})
 
         endif(NOT FILE64_OK)

diff --git a/cmake/gmxTestRetSigType.cmake b/cmake/gmxTestRetSigType.cmake
index 00e8d6ec22b8e2fe0f81c321c1315b499fdde073..ae1841837bded46226bbdca87150eee199e43e38 100644 (file)
--- a/cmake/gmxTestRetSigType.cmake
+++ b/cmake/gmxTestRetSigType.cmake
@@ -7,7 +7,7 @@
 #  Remember to have a cmakedefine for it too...
 
 MACRO(GMX_TEST_RETSIGTYPE VARIABLE)
-    IF("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")
+    IF(NOT DEFINED ${VARIABLE})
 
         MESSAGE(STATUS "Checking for return type of signals")
 
@@ -23,7 +23,7 @@ MACRO(GMX_TEST_RETSIGTYPE VARIABLE)
            set(${VARIABLE} "void" CACHE INTERNAL "Result of test for signal return type" FORCE)
        endif(RETSIGTYPE_INT_OK)
         
-    ENDIF("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")
+    ENDIF(NOT DEFINED ${VARIABLE})
 ENDMACRO(GMX_TEST_RETSIGTYPE VARIABLE)
 
 

diff --git a/cmake/gmxTestXDR.cmake b/cmake/gmxTestXDR.cmake
index f3223606ca3b55dcaadf829626984ca441feac60..28844e66a780189da0c1bb6976b0d3951a111482 100644 (file)
--- a/cmake/gmxTestXDR.cmake
+++ b/cmake/gmxTestXDR.cmake
@@ -7,7 +7,7 @@
 #  Remember to have a cmakedefine for it too...
 
 MACRO(GMX_TEST_XDR VARIABLE)
-    IF("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")
+    IF(NOT DEFINED ${VARIABLE})
 
         MESSAGE(STATUS "Checking for system XDR support")
 
@@ -23,7 +23,7 @@ MACRO(GMX_TEST_XDR VARIABLE)
 
         set(${VARIABLE} ${XDR_COMPILE_OK} CACHE INTERNAL "Result of test for system XDR support" FORCE)
         
-    ENDIF("HAVE_${VARIABLE}" MATCHES "^HAVE_${VARIABLE}$")
+    ENDIF(NOT DEFINED ${VARIABLE})
 ENDMACRO(GMX_TEST_XDR VARIABLE)
 
 

diff --git a/src/gmxlib/CMakeLists.txt b/src/gmxlib/CMakeLists.txt
index 1a148dc5f5cb4b3084b8f462c83c7eb721b76ac3..527407d41d1021afa1c21cb413d4978a24fa8533 100644 (file)
--- a/src/gmxlib/CMakeLists.txt
+++ b/src/gmxlib/CMakeLists.txt
@@ -1,5 +1,14 @@
 
-file(GLOB GMXLIB_SOURCES *.c gmx_blas/*.c gmx_lapack/*.c gmx_statistics/*.c nonbonded/*.c nonbonded/nb_kernel_c/*.c)
+# The nonbonded directory contains subdirectories that are only
+# conditionally built, so we cannot use a GLOB_RECURSE here.
+
+file(GLOB GMXLIB_SOURCES *.c gmx_blas/*.c gmx_lapack/*.c 
+     gmx_statistics/*.c nonbonded/*.c nonbonded/nb_kernel_c/*.c)
+
+# Files called xxx.test.c are test drivers with a main() function for module xxx.c,
+# so they should not be included in the library
+file(GLOB_RECURSE TEST_DRIVERS *.test.c)
+list(REMOVE_ITEM GMXLIB_SOURCES ${TEST_DRIVERS})  
 
 add_library(gmx ${GMXLIB_SOURCES})
 

diff --git a/src/kernel/CMakeLists.txt b/src/kernel/CMakeLists.txt
index e6dab20151a0868b45dc18376124d0df367af32e..e00c57a07bdddf08b7e7ea928816d238e051546d 100644 (file)
--- a/src/kernel/CMakeLists.txt
+++ b/src/kernel/CMakeLists.txt
@@ -39,34 +39,33 @@ set(MDRUN_SOURCES
 add_library(gmxpreprocess ${GMXPREPROCESS_SOURCES})
 target_link_libraries(gmxpreprocess md)
 
-set(GMX_EXTRA_LIBRARIES ${GMX_EXTRA_LIBRARIES} gmxpreprocess)
-
 add_executable(grompp grompp.c)
-target_link_libraries(grompp md ${GMX_EXTRA_LIBRARIES})
+target_link_libraries(grompp gmxpreprocess md ${GMX_EXTRA_LIBRARIES})
 
 add_executable(tpbconv tpbconv.c)
-target_link_libraries(tpbconv md ${GMX_EXTRA_LIBRARIES})
+target_link_libraries(tpbconv gmxpreprocess md ${GMX_EXTRA_LIBRARIES})
 
 add_executable(pdb2gmx pdb2gmx.c)
-target_link_libraries(pdb2gmx md ${GMX_EXTRA_LIBRARIES})
+target_link_libraries(pdb2gmx gmxpreprocess md ${GMX_EXTRA_LIBRARIES})
 
 add_executable(protonate protonate.c)
-target_link_libraries(protonate md ${GMX_EXTRA_LIBRARIES})
+target_link_libraries(protonate gmxpreprocess md ${GMX_EXTRA_LIBRARIES})
 
 add_executable(luck luck.c)
-target_link_libraries(luck md ${GMX_EXTRA_LIBRARIES})
+target_link_libraries(luck gmxpreprocess md ${GMX_EXTRA_LIBRARIES})
 
 add_executable(gmxdump gmxdump.c)
-target_link_libraries(gmxdump md ${GMX_EXTRA_LIBRARIES})
+target_link_libraries(gmxdump gmxpreprocess md ${GMX_EXTRA_LIBRARIES})
 
 add_executable(x2top x2top.c)
-target_link_libraries(x2top md ${GMX_EXTRA_LIBRARIES})
+target_link_libraries(x2top gmxpreprocess md ${GMX_EXTRA_LIBRARIES})
 
 add_executable(gmxcheck gmxcheck.c)
-target_link_libraries(gmxcheck md gmx ${GMX_EXTRA_LIBRARIES})
+target_link_libraries(gmxcheck gmxpreprocess md ${GMX_EXTRA_LIBRARIES})
+
 
 add_executable(mdrun ${MDRUN_SOURCES})
-target_link_libraries(mdrun md ${GMX_EXTRA_LIBRARIES})
+target_link_libraries(mdrun gmxpreprocess md ${GMX_EXTRA_LIBRARIES})
 
 
 install(TARGETS 

diff --git a/src/mdlib/CMakeLists.txt b/src/mdlib/CMakeLists.txt
index b283845dd182c67751b237382c774ba815098232..9d01fa3b05bb437ecf8155916cc3be4cd8014c7f 100644 (file)
--- a/src/mdlib/CMakeLists.txt
+++ b/src/mdlib/CMakeLists.txt
@@ -1,8 +1,15 @@
 
 file(GLOB MDLIB_SOURCES *.c)
 
-add_library(md ${MDLIB_SOURCES})
+# Files        called xxx.test.c are test drivers with a main() function for 
+# module xxx.c, so they should not be included in the library
+file(GLOB_RECURSE TEST_DRIVERS *.test.c)
+if(${TEST_DRIVERS})
+    list(REMOVE_ITEM MDLIB_SOURCES ${TEST_DRIVERS})
+endif(${TEST_DRIVERS})
+
 
+add_library(md ${MDLIB_SOURCES})
 target_link_libraries(md gmx)
 
 install(TARGETS md DESTINATION ${LIB_INSTALL_DIR})

diff --git a/src/ngmx/CMakeLists.txt b/src/ngmx/CMakeLists.txt
index 23a4a28ba8e66f3d1ae7092e24c1e35912081f8a..8b937e62ecdf229f507adfa40a0c50146b81e9a9 100644 (file)
--- a/src/ngmx/CMakeLists.txt
+++ b/src/ngmx/CMakeLists.txt
@@ -13,29 +13,21 @@ include_directories(${X11_INCLUDE_DIR})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 
-add_executable(ngmx ngmx.c ${NGMX_COMMON_SOURCE})
-target_link_libraries(ngmx md ${X11_LIBRARIES} ${GROMACS_EXTRA_LIBRARIES})
+# List of programs with single corresponding *.c source file,
+# used to create build rules automatically.
+#
+set(NGMX_PROGRAMS 
+    ngmx xrama highway gmxlogo dlg scrollw showcol)
 
-add_executable(xrama xrama.c ${NGMX_COMMON_SOURCE})
-target_link_libraries(xrama md ${X11_LIBRARIES} ${GROMACS_EXTRA_LIBRARIES})
 
-add_executable(highway highway.c ${NGMX_COMMON_SOURCE})
-target_link_libraries(highway md ${X11_LIBRARIES} ${GROMACS_EXTRA_LIBRARIES})
+foreach(PROG ${NGMX_PROGRAMS})
+        add_executable(${PROG} ${PROG}.c ${NGMX_COMMON_SOURCE})
+        target_link_libraries(${PROG} gmx ${X11_LIBRARIES})
+endforeach(PROG) 
 
-add_executable(gmxlogo gmxlogo.c ${NGMX_COMMON_SOURCE})
-target_link_libraries(gmxlogo md ${X11_LIBRARIES} ${GROMACS_EXTRA_LIBRARIES})
 
-add_executable(dlg dlg.c ${NGMX_COMMON_SOURCE})
-target_link_libraries(dlg md ${X11_LIBRARIES} ${GROMACS_EXTRA_LIBRARIES})
+install(TARGETS ${NGMX_PROGRAMS}
+        RUNTIME DESTINATION ${BIN_INSTALL_DIR})
 
-add_executable(scrollw scrollw.c ${NGMX_COMMON_SOURCE})
-target_link_libraries(scrollw md ${X11_LIBRARIES} ${GROMACS_EXTRA_LIBRARIES})
-
-add_executable(showcol showcol.c ${NGMX_COMMON_SOURCE})
-target_link_libraries(showcol md ${X11_LIBRARIES} ${GROMACS_EXTRA_LIBRARIES})
-
-install(TARGETS
-       ngmx xrama highway gmxlogo dlg scrollw showcol
-       RUNTIME DESTINATION ${BIN_INSTALL_DIR})
 
 endif(X11_FOUND)

diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
index 68974c6f21c7c4af2e533d247b9e29368024ad25..f78003cf2454c753d8319fd6dff314fdfc8ce711 100644 (file)
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@ -10,7 +10,7 @@ add_library(gmxana
             gmx_covar.c     gmx_current.c   
             gmx_density.c   gmx_densmap.c   gmx_dih.c       
             gmx_dielectric.c        
-            gmx_kinetics.c  gmx_spatial.c
+            gmx_kinetics.c  gmx_spatial.c   gmx_tune_pme.c
             gmx_dipoles.c   gmx_disre.c     gmx_dist.c      gmx_dyndom.c    
             gmx_enemat.c    gmx_energy.c    gmx_lie.c       gmx_filter.c    
             gmx_gyrate.c    gmx_h2order.c   gmx_hbond.c     gmx_helix.c     
@@ -30,261 +30,32 @@ add_library(gmxana
 
 target_link_libraries(gmxana md ${GMX_EXTRA_LIBRARIES})
 
-add_executable(do_dssp do_dssp.c)
-target_link_libraries(do_dssp gmxana)
 
-add_executable(editconf editconf.c)
-target_link_libraries(editconf gmxana)
+# List of programs with single corresponding .c source file,
+# used to create build rules automatically.
+#
+set(GMX_TOOLS_PROGRAMS
+    do_dssp editconf eneconv genbox genconf genrestr g_nmtraj 
+    make_ndx mk_angndx trjcat trjconv trjorder wheel 
+    xpm2ps genion anadock make_edi g_analyze g_anaeig
+    g_angle g_bond g_bundle g_chi g_cluster g_confrms g_covar
+    g_current g_density g_densmap g_dih g_dielectric
+    g_helixorient g_principal g_dipoles g_disre g_dist
+    g_dyndom g_enemat g_energy g_lie g_filter g_gyrate
+    g_h2order g_hbond g_helix g_mindist g_msd g_morph g_nmeig
+    g_nmens g_order g_polystat g_potential g_rama g_rdf g_rms
+    g_rmsf g_rotacf g_saltbr g_sas g_sgangle g_sham g_sorient
+    g_spol g_sdf g_spatial g_tcaf g_traj g_tune_pme g_vanhove
+    g_velacc g_clustsize g_mdmat g_wham g_kinetics sigeps)
 
-add_executable(eneconv eneconv.c)
-target_link_libraries(eneconv gmxana)
 
-add_executable(genbox genbox.c)
-target_link_libraries(genbox gmxana)
 
-add_executable(genconf genconf.c)
-target_link_libraries(genconf gmxana)
+foreach(TOOL ${GMX_TOOLS_PROGRAMS})
+    add_executable(${TOOL} ${TOOL}.c)
+    target_link_libraries(${TOOL} gmxana)
+endforeach(TOOL ${GMX_TOOLS_PROGRAMS}) 
 
-add_executable(genrestr genrestr.c)
-target_link_libraries(genrestr gmxana)
 
-add_executable(g_nmtraj g_nmtraj.c)
-target_link_libraries(g_nmtraj gmxana)
+install(TARGETS ${GMX_TOOLS_PROGRAMS}
+       RUNTIME DESTINATION ${BIN_INSTALL_DIR})
 
-add_executable(make_ndx make_ndx.c)
-target_link_libraries(make_ndx gmxana)
-
-add_executable(mk_angndx mk_angndx.c)
-target_link_libraries(mk_angndx gmxana)
-
-add_executable(trjcat trjcat.c)
-target_link_libraries(trjcat gmxana)
-
-add_executable(trjconv trjconv.c)
-target_link_libraries(trjconv gmxana)
-
-add_executable(trjorder trjorder.c)
-target_link_libraries(trjorder gmxana)
-
-add_executable(wheel wheel.c)
-target_link_libraries(wheel gmxana)
-
-add_executable(xpm2ps xpm2ps.c)
-target_link_libraries(xpm2ps gmxana)
-
-add_executable(genion genion.c)
-target_link_libraries(genion gmxana)
-
-add_executable(anadock anadock.c)
-target_link_libraries(anadock gmxana)
-
-add_executable(make_edi make_edi.c)
-target_link_libraries(make_edi gmxana)
-
-add_executable(g_analyze g_analyze.c)
-target_link_libraries(g_analyze gmxana)
-
-add_executable(g_anaeig g_anaeig.c)
-target_link_libraries(g_anaeig gmxana)
-
-add_executable(g_angle g_angle.c)
-target_link_libraries(g_angle gmxana)
-
-add_executable(g_bond g_bond.c)
-target_link_libraries(g_bond gmxana)
-
-add_executable(g_bundle g_bundle.c)
-target_link_libraries(g_bundle gmxana)
-
-add_executable(g_chi g_chi.c)
-target_link_libraries(g_chi gmxana)
-
-add_executable(g_cluster g_cluster.c)
-target_link_libraries(g_cluster gmxana)
-
-add_executable(g_confrms g_confrms.c)
-target_link_libraries(g_confrms gmxana)
-
-add_executable(g_covar g_covar.c)
-target_link_libraries(g_covar gmxana)
-
-add_executable(g_current g_current.c)
-target_link_libraries(g_current gmxana)
-
-add_executable(g_density g_density.c)
-target_link_libraries(g_density gmxana)
-
-add_executable(g_densmap g_densmap.c)
-target_link_libraries(g_densmap gmxana)
-
-add_executable(g_dih g_dih.c)
-target_link_libraries(g_dih gmxana)
-
-add_executable(g_dielectric g_dielectric.c)
-target_link_libraries(g_dielectric gmxana)
-
-add_executable(g_helixorient g_helixorient.c)
-target_link_libraries(g_helixorient gmxana)
-
-add_executable(g_principal g_principal.c)
-target_link_libraries(g_principal gmxana)
-
-add_executable(g_dipoles g_dipoles.c)
-target_link_libraries(g_dipoles gmxana)
-
-add_executable(g_disre g_disre.c)
-target_link_libraries(g_disre gmxana)
-
-add_executable(g_dist g_dist.c)
-target_link_libraries(g_dist gmxana)
-
-add_executable(g_dyndom g_dyndom.c)
-target_link_libraries(g_dyndom gmxana)
-
-add_executable(g_enemat g_enemat.c)
-target_link_libraries(g_enemat gmxana)
-
-add_executable(g_energy g_energy.c)
-target_link_libraries(g_energy gmxana)
-
-add_executable(g_lie g_lie.c)
-target_link_libraries(g_lie gmxana)
-
-add_executable(g_filter g_filter.c)
-target_link_libraries(g_filter gmxana)
-
-add_executable(g_gyrate g_gyrate.c)
-target_link_libraries(g_gyrate gmxana)
-
-add_executable(g_h2order g_h2order.c)
-target_link_libraries(g_h2order gmxana)
-
-add_executable(g_hbond g_hbond.c)
-target_link_libraries(g_hbond gmxana)
-
-add_executable(g_helix g_helix.c)
-target_link_libraries(g_helix gmxana)
-
-add_executable(g_mindist g_mindist.c)
-target_link_libraries(g_mindist gmxana)
-
-add_executable(g_msd g_msd.c)
-target_link_libraries(g_msd gmxana)
-
-add_executable(g_morph g_morph.c)
-target_link_libraries(g_morph gmxana)
-
-add_executable(g_nmeig g_nmeig.c)
-target_link_libraries(g_nmeig gmxana)
-
-add_executable(g_nmens g_nmens.c)
-target_link_libraries(g_nmens gmxana)
-
-add_executable(g_order g_order.c)
-target_link_libraries(g_order gmxana)
-
-add_executable(g_polystat g_polystat.c)
-target_link_libraries(g_polystat gmxana)
-
-add_executable(g_potential g_potential.c)
-target_link_libraries(g_potential gmxana)
-
-add_executable(g_rama g_rama.c)
-target_link_libraries(g_rama gmxana)
-
-add_executable(g_rdf g_rdf.c)
-target_link_libraries(g_rdf gmxana)
-
-add_executable(g_rms g_rms.c)
-target_link_libraries(g_rms gmxana)
-
-add_executable(g_rmsdist g_rmsdist.c)
-target_link_libraries(g_rmsdist gmxana)
-
-add_executable(g_rmsf g_rmsf.c)
-target_link_libraries(g_rmsf gmxana)
-
-add_executable(g_rotacf g_rotacf.c)
-target_link_libraries(g_rotacf gmxana)
-
-add_executable(g_saltbr g_saltbr.c)
-target_link_libraries(g_saltbr gmxana)
-
-add_executable(g_sas g_sas.c)
-target_link_libraries(g_sas gmxana)
-
-add_executable(g_sgangle g_sgangle.c)
-target_link_libraries(g_sgangle gmxana)
-
-add_executable(g_sham g_sham.c)
-target_link_libraries(g_sham gmxana)
-
-add_executable(g_sorient g_sorient.c)
-target_link_libraries(g_sorient gmxana)
-
-add_executable(g_spol g_spol.c)
-target_link_libraries(g_spol gmxana)
-
-add_executable(g_sdf g_sdf.c)
-target_link_libraries(g_sdf gmxana)
-
-add_executable(g_spatial g_spatial.c)
-target_link_libraries(g_spatial gmxana)
-
-add_executable(g_tcaf g_tcaf.c)
-target_link_libraries(g_tcaf gmxana)
-
-add_executable(g_traj g_traj.c)
-target_link_libraries(g_traj gmxana)
-
-add_executable(g_tune_pme g_tune_pme.c gmx_tune_pme.c)
-target_link_libraries(g_tune_pme gmxana)
-
-add_executable(g_vanhove g_vanhove.c)
-target_link_libraries(g_vanhove gmxana)
-
-add_executable(g_velacc g_velacc.c)
-target_link_libraries(g_velacc gmxana)
-
-add_executable(g_clustsize g_clustsize.c)
-target_link_libraries(g_clustsize gmxana)
-
-add_executable(g_mdmat g_mdmat.c)
-target_link_libraries(g_mdmat gmxana)
-
-add_executable(g_wham g_wham.c)
-target_link_libraries(g_wham gmxana)
-
-add_executable(g_kinetics g_kinetics.c)
-target_link_libraries(g_kinetics gmxana)
-
-add_executable(sigeps sigeps.c)
-target_link_libraries(sigeps gmxana)
-
-
-install(TARGETS
-        do_dssp         editconf        eneconv         
-        genbox          genconf         genrestr        g_nmtraj        
-        make_ndx        mk_angndx       trjcat          trjconv         
-        trjorder        wheel           xpm2ps          genion          
-        anadock         make_edi        
-        g_analyze       g_anaeig        g_angle         g_bond          
-        g_bundle        g_chi           g_cluster       g_confrms       
-        g_covar         g_current       
-        g_density       g_densmap       g_dih           
-        g_dielectric    g_helixorient   g_principal 
-        g_dipoles       g_disre         g_dist          g_dyndom        
-        g_enemat        g_energy        g_lie           g_filter        
-        g_gyrate        g_h2order       g_hbond         g_helix         
-        g_mindist       g_msd           g_morph         g_nmeig         
-        g_nmens         g_order         
-        g_polystat      g_potential     g_rama          
-        g_rdf           g_rms           g_rmsdist       g_rmsf          
-        g_rotacf        g_saltbr        g_sas           g_sgangle       
-        g_sham          g_sorient       g_spol          
-        g_sdf           g_spatial       
-        g_tcaf          g_traj          g_tune_pme   
-        g_vanhove       g_velacc        
-        g_clustsize     g_mdmat         g_wham          g_kinetics      
-        sigeps
-       RUNTIME        DESTINATION ${BIN_INSTALL_DIR})