link libdotneato.so to libgvc.so, extend dotneato.h

diff --git a/cmd/dot/Makefile.am b/cmd/dot/Makefile.am
index 5f054f511a244eab302eed0e51e02c5fe5add96f..a61fcdc434f27dd92060ffdd1d18f48911bce63d 100644 (file)
--- a/cmd/dot/Makefile.am
+++ b/cmd/dot/Makefile.am
@@ -19,26 +19,33 @@ AM_CPPFLAGS = \
 
 pkginclude_HEADERS = dotneato.h
 pkglib_LTLIBRARIES = libdotneato.la
-# pkgconfig_DATA = libdotneato.pc
+pkgconfig_DATA = libdotneato.pc
 bin_SCRIPTS = dotneato-config
 bin_PROGRAMS = dot
 man_MANS = dot.1 dotneato-config.1
 pdf_DATA = dot.pdf dotneato-config.pdf
 
 libdotneato_la_SOURCES = dotneato.c
-libdotneato_la_LIBADD = \
-       $(top_builddir)/lib/common/libcommon.la \
-       $(top_builddir)/lib/gvc/libgvc.la
-
 dot_SOURCES = dot.c args.c
 
 if DISABLE_LTDL
+libdotneato_la_LIBADD = \
+        $(top_builddir)/lib/graph/libgraph.la \
+       $(top_builddir)/lib/common/libcommon.la \
+       $(top_builddir)/lib/gvc/libgvc.la \
+       $(top_builddir)/plugin/libplugins.la
+
 dot_LDADD = \
         $(top_builddir)/lib/graph/libgraph.la \
         $(top_builddir)/lib/common/libcommon.la \
         $(top_builddir)/lib/gvc/libgvc.la \
        $(top_builddir)/plugin/libplugins.la
 else
+libdotneato_la_LIBADD = \
+        $(top_builddir)/lib/graph/libgraph.la \
+       $(top_builddir)/lib/common/libcommon.la \
+       $(top_builddir)/lib/gvc/libgvc.la @LIBGEN_LIBS@
+
 dot_LDADD = \
         $(top_builddir)/lib/graph/libgraph.la \
         $(top_builddir)/lib/common/libcommon.la \

diff --git a/cmd/dot/dotneato.h b/cmd/dot/dotneato.h
index 7a387f9b16e38dccea6aeb06fef30a5f23e903f8..df5b1abe43575f0147c178c5d8c6ee0df2705795 100644 (file)
--- a/cmd/dot/dotneato.h
+++ b/cmd/dot/dotneato.h
@@ -18,6 +18,7 @@
 #define DOTNEATO_H
 
 #include "render.h"
+#include "gvc.h"
 
 #ifdef __cplusplus
 extern "C" {