From: ellson <devnull@localhost>
Date: Thu, 23 Aug 2007 03:19:14 +0000 (+0000)
Subject: link libexpr from convenience library and don't install libexpr or its docs
X-Git-Tag: LAST_LIBGRAPH~32^2~5357
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9976048b839c6ea48b33fd7e0eecd3199fe1c082;p=graphviz

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 85a9be944..25507d22d 100644
--- 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 2e667faf5..aa8113cbd 100644
--- 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