From: John Ellson <ellson@research.att.com>
Date: Thu, 16 Aug 2012 18:05:42 +0000 (-0400)
Subject: adjust LIBADDs so as to only add to final component and not to subcomponents
X-Git-Tag: LAST_LIBGRAPH~32^2~339
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8bc218f0eed27e8b144af98fb8023aecaa26617f;p=graphviz

adjust LIBADDs so as to only add to final component and not to subcomponents
---

diff --git a/lib/expr/Makefile.am b/lib/expr/Makefile.am
index 2f1646662..1b6f7d5c6 100644
--- a/lib/expr/Makefile.am
+++ b/lib/expr/Makefile.am
@@ -31,10 +31,6 @@ pdf_DATA = expr.3.pdf
 libexpr_C_la_SOURCES = excc.c excontext.c exdata.c exerror.c \
 	exeval.c exexpr.c exlexname.c exopen.c exrewind.c extoken.c \
 	extype.c exzero.c exparse.y exnospace.c exstash.c 
-libexpr_C_la_LIBADD = \
-	$(top_builddir)/lib/ast/libast_C.la \
-	$(top_builddir)/lib/vmalloc/libvmalloc_C.la \
-	$(top_builddir)/lib/sfio/libsfio_C.la
 libexpr_C_la_DEPENDENCIES = \
 	$(top_builddir)/lib/ast/libast_C.la \
 	$(top_builddir)/lib/vmalloc/libvmalloc_C.la \
@@ -45,7 +41,7 @@ libexpr_C_la_DEPENDENCIES = \
 #libexpr_la_SOURCES = $(libexpr_C_la_SOURCES)
 #libexpr_la_LIBADD = $(libexpr_C_la_LIBADD)
 
-$(libexpr_C_la_OBJECTS) $(libexpr_la_OBJECTS): \
+$(libexpr_C_la_OBJECTS): \
 	exparse.h exparse.c exgram.h exop.h
 
 exop.h: exparse.h
diff --git a/lib/gvpr/Makefile.am b/lib/gvpr/Makefile.am
index 693410a67..83cfe0380 100644
--- a/lib/gvpr/Makefile.am
+++ b/lib/gvpr/Makefile.am
@@ -37,13 +37,23 @@ libgvpr_C_la_DEPENDENCIES = \
 
 libgvpr_la_LDFLAGS = -version-info $(GVPR_VERSION) -no-undefined
 libgvpr_la_SOURCES = $(libgvpr_C_la_SOURCES)
-libgvpr_la_LIBADD = $(libgvpr_C_la_LIBADD) \
+libgvpr_la_LIBADD = \
 	$(top_builddir)/lib/ingraphs/libingraphs_C.la \
 	$(top_builddir)/lib/expr/libexpr_C.la \
+        $(top_builddir)/lib/vmalloc/libvmalloc_C.la \
+        $(top_builddir)/lib/sfio/libsfio_C.la \
+        $(top_builddir)/lib/ast/libast_C.la \
+        $(top_builddir)/lib/gvc/libgvc.la \
 	$(top_builddir)/lib/cdt/libcdt.la \
 	$(top_builddir)/lib/cgraph/libcgraph.la \
 	$(MATH_LIBS)
-libgvpr_la_DEPENDENCIES = $(libgvpr_C_la_DEPENDENCIES)
+libgvpr_la_DEPENDENCIES = $(libgvpr_C_la_DEPENDENCIES) \
+	$(top_builddir)/lib/vmalloc/libvmalloc_C.la \
+	$(top_builddir)/lib/sfio/libsfio_C.la \
+	$(top_builddir)/lib/ast/libast_C.la \
+	$(top_builddir)/lib/gvc/libgvc_C.la \
+        $(top_builddir)/lib/cdt/libcdt_C.la \
+        $(top_builddir)/lib/cgraph/libcgraph_C.la
 
 mkdefs_SOURCES = mkdefs.c