[Rivet-svn] r2592 - in trunk: bin data

[blackhole at projects.hepforge.org]

Author: buckley
Date: Wed Jul 14 18:55:20 2010
New Revision: 2592

Log:
Prefer --libs to --ldadd: the former is still supported but not advertised

Modified:
   trunk/bin/rivet-config.in
   trunk/data/rivet-completion

Modified: trunk/bin/rivet-config.in
==============================================================================
--- trunk/bin/rivet-config.in	Wed Jul 14 18:52:08 2010	(r2591)
+++ trunk/bin/rivet-config.in	Wed Jul 14 18:55:20 2010	(r2592)
@@ -28,7 +28,7 @@
     echo "  --pythonpath  : show the path(s) to the directory containing Rivet Python modules"
     echo "  --cppflags    : returns a Rivet '-I' string for insertion into CPPFLAGS"
     echo "  --ldflags     : returns a Rivet '-L' string for insertion into LDFLAGS"
-    echo "  --ldadd       : returns a Rivet '-l' string for insertion into LIBS or LIBADD"
+    echo "  --libs        : returns a Rivet '-l' string for insertion into LIBS or LIBADD"
     echo
     echo "  --version     : returns Rivet release version number"
 fi
@@ -78,7 +78,7 @@
     test -n "$lgsl" && OUT="$OUT -L${lgsl}"
 fi
 
-tmp=$( echo "$*" | egrep -- '--\<ldadd\>')
+tmp=$( echo "$*" | egrep -- '--\<libs\>|--\<ldadd\>')
 test -n "$tmp" && OUT="$OUT -lRivet -lHepMC"
 
 

Modified: trunk/data/rivet-completion
==============================================================================
--- trunk/data/rivet-completion	Wed Jul 14 18:52:08 2010	(r2591)
+++ trunk/data/rivet-completion	Wed Jul 14 18:55:20 2010	(r2592)
@@ -61,7 +61,7 @@
 
     opts="--help --version"
     opts="$opts --prefix --includedir --libdir --datadir"
-    opts="$opts --pythonpath --cppflags --ldflags --ldadd"
+    opts="$opts --pythonpath --cppflags --ldflags --libs"
     opts="$opts -h"
     if [[ ${cur} == -* ]] ; then
         COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )