final fixes to addsourcedir source-directory-Makefile-generation script

diff --git a/contrib/addsourcedir b/contrib/addsourcedir
index 9a50b002559d70006994b63b97436310c36bbb09..ee507f0c637b99bea49ee69f64b959fd08c39f9b 100644 (file)
--- a/contrib/addsourcedir
+++ b/contrib/addsourcedir
@@ -28,7 +28,7 @@ while [ $# -gt 0 ]; do
   # remove redundant slashes, if any
   srcdir=`echo "$srcdir" | sed 's,//*,/,g'`
 
-  if expr "$srcdir" : src/ &>/dev/null; then :; else
+  if expr "$srcdir" : src/ >/dev/null; then :; else
     echo "$progname: error: Directories must be under src/" >&2
     echo "$progname: error: and \`$srcdir' isn't!" >&2
     echo "$progname: error: Make sure you provide source paths" >&2
@@ -41,11 +41,16 @@ while [ $# -gt 0 ]; do
     mkdir -p "$srcdir"
   fi
 
+  # enough dotdots to get us back to the top-level directory
+  # (e.g. "src/foo" yields "../.." here), used for $(topdir) in Makefile
+  topdir=`echo "$srcdir" | sed 's,[^/]\+,..,g'`
+  # one less, used for the include path in Makefile.am
+  topsrcdir=`echo "$topdir" | sed 's,\.\./,,'`
+
   if [ -e "$srcdir/Makefile" ]; then
     echo "$progname: warning: not replacing extant \`$srcdir/Makefile'." >&2
   else
     echo "generating \`$srcdir/Makefile'..."
-    topdir=`echo "$srcdir" | sed 's,[^/]\+,..,g'`
     cat >"$srcdir/Makefile" <<EOF
 topdir = $topdir
 srcdir = $srcdir
@@ -59,20 +64,24 @@ EOF
   else
     echo "generating \`$srcdir/Makefile.am'..."
     clibbase=`expr "$srcdir" : '.*/\([^/]\+\)$'`
-    if expr "$srcdir" : src/parser &>/dev/null; then
-      definitions="    -D__BUILDING_CVC4PARSERLIB \\"
-    elif expr "$srcdir" : src/main &>/dev/null; then
+    if expr "$srcdir" : src/parser >/dev/null; then
+      definitions="    -D__BUILDING_CVC4PARSERLIB \\
+"
+      visibility=" -fvisibility=hidden"
+    elif expr "$srcdir" : src/main >/dev/null; then
       definitions=
+      visibility=
     else
-      definitions="    -D__BUILDING_CVC4LIB \\"
+      definitions="    -D__BUILDING_CVC4LIB \\
+"
+      visibility=" -fvisibility=hidden"
     fi
     clibname="lib${clibbase}.la"
     clibtarget="lib${clibbase}_la"
     cat >"$srcdir/Makefile.am" <<EOF
 AM_CPPFLAGS = \\
-$definitions
-       -I@srcdir@/../include -I@srcdir@/..
-AM_CXXFLAGS = -Wall -fvisibility=hidden
+$definitions   -I@srcdir@/$topsrcdir/include -I@srcdir@/$topsrcdir
+AM_CXXFLAGS = -Wall$visibility
 
 noinst_LTLIBRARIES = $clibname