link libexpr from convenience library and don't install libexpr or its docs

- it depends on libast and libvmalloc which we don't install, currently

diff --git a/cmd/gvpr/Makefile.am b/cmd/gvpr/Makefile.am
index 85a9be9441d9e75dbd22f0eb6a0eea547abae36a..25507d22d2f8389a1b82b97041404b30c28f4cbe 100644 (file)
--- a/cmd/gvpr/Makefile.am
+++ b/cmd/gvpr/Makefile.am
@@ -26,7 +26,7 @@ gvpr_LDADD = \
        $(top_builddir)/lib/vmalloc/libvmalloc_C.la \
        $(top_builddir)/lib/sfio/libsfio_C.la \
         $(top_builddir)/lib/ingraphs/libingraphs_C.la \
-       $(top_builddir)/lib/expr/libexpr.la \
+       $(top_builddir)/lib/expr/libexpr_C.la \
        $(top_builddir)/lib/agraph/libagraph.la @MATH_LIBS@
 
 gvpr_DEPENDENCIES = \

diff --git a/lib/expr/Makefile.am b/lib/expr/Makefile.am
index 2e667faf54307b6654289093177426ae665583b9..aa8113cbd9bb3c10a08195fda480d326eb2ce663 100644 (file)
--- a/lib/expr/Makefile.am
+++ b/lib/expr/Makefile.am
@@ -14,10 +14,12 @@ AM_CPPFLAGS = \
 
 noinst_HEADERS = exgram.h exlib.h expr.h
 noinst_LTLIBRARIES = libexpr_C.la
-lib_LTLIBRARIES = libexpr.la
-man_MANS = expr.3
-pdf_DATA = expr.pdf
-pkgconfig_DATA = libexpr.pc
+
+### expr.h includes ast.h and vmalloc.h which we don't install
+#lib_LTLIBRARIES = libexpr.la
+#man_MANS = expr.3
+#pdf_DATA = expr.pdf
+#pkgconfig_DATA = libexpr.pc
 
 #### -no-undefined breaks Mac OS/X builds.
 #### libast has "extern char **environ" which remains