Merge release-4-6 into master

[alexxy/gromacs.git] / src / tools / CMakeLists.txt

diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
index d5833701aa3dc559a7bf80b9128d37c8b86dc0f3..a6162a43418cb81234447ee20f994c336d758292 100644 (file)
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@ -1,9 +1,7 @@
-
 add_library(gmxana 
             autocorr.c      expfit.c        polynomials.c   levenmar.c      
             anadih.c        pp2shift.c      dlist.c         
-            eigio.c         cmat.c          
-            eigensolver.c   nsc.c           
+            eigio.c         cmat.c          nsc.c
             hxprops.c       fitahx.c        
             geminate.c      nsfactor.c
             gmx_analyze.c   gmx_anaeig.c    gmx_angle.c     gmx_bond.c      
@@ -20,22 +18,22 @@ add_library(gmxana
             gmx_polystat.c  gmx_potential.c gmx_rama.c      
             gmx_rdf.c       gmx_rms.c       gmx_rmsf.c      
             gmx_rotacf.c    gmx_saltbr.c    gmx_sas.c       gmx_sans.c
-            gmx_select.c    gmx_rmsdist.c   gmx_rotmat.c
+            gmx_rmsdist.c   gmx_rotmat.c
             gmx_sgangle.c   gmx_sorient.c   gmx_spol.c      gmx_tcaf.c      
             gmx_traj.c      gmx_velacc.c    gmx_helixorient.c 
-            gmx_clustsize.c gmx_mdmat.c     gmx_wham.c      
+            gmx_clustsize.c gmx_mdmat.c     gmx_wham.cpp
             correl.c        gmx_sham.c      gmx_nmtraj.c    
             gmx_trjconv.c   gmx_trjcat.c    gmx_trjorder.c  gmx_xpm2ps.c    
             gmx_editconf.c  gmx_genbox.c    gmx_genion.c    gmx_genconf.c   
             gmx_genpr.c     gmx_eneconv.c   gmx_vanhove.c   gmx_wheel.c     
             addconf.c       calcpot.c       edittop.c       gmx_bar.c
-            gmx_membed.c    gmx_pme_error.c gmx_options.c   gmx_dos.c
+            gmx_pme_error.c gmx_options.c   gmx_dos.c
             gmx_hydorder.c  gmx_densorder.c powerspect.c    dens_filter.c
             binsearch.c     gmx_dyecoupl.c
             )
 
 
-target_link_libraries(gmxana md gmx ${GSL_LIBRARIES})
+target_link_libraries(gmxana libgromacs ${GSL_LIBRARIES})
 set_target_properties(gmxana PROPERTIES OUTPUT_NAME "gmxana${GMX_LIBS_SUFFIX}" SOVERSION ${SOVERSION} INSTALL_NAME_DIR "${LIB_INSTALL_DIR}"
     COMPILE_FLAGS "${OpenMP_C_FLAGS}")
 
@@ -52,10 +50,10 @@ set(GMX_TOOLS_PROGRAMS
     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_kinetics g_polystat g_potential g_rama g_rdf g_rms
-    g_rmsf g_rotacf g_saltbr g_sas g_select g_sgangle g_sham g_sorient
+    g_rmsf g_rotacf g_saltbr g_sas g_sgangle g_sham g_sorient
     g_spol g_spatial g_tcaf g_traj g_tune_pme g_vanhove
     g_velacc g_clustsize g_mdmat g_wham g_sigeps g_bar
-    g_membed g_pme_error g_rmsdist g_rotmat g_options
+    g_pme_error g_rmsdist g_rotmat g_options
     g_dos    g_hydorder  g_densorder g_dyecoupl g_sans
     )