From: glenlow <devnull@localhost>
Date: Thu, 28 Feb 2008 03:29:53 +0000 (+0000)
Subject: conditioned -no-undefined and extra libs on WIN32, where they are necessary for makin... 
X-Git-Tag: LAST_LIBGRAPH~32^2~4659
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0a7313695974a8db4e31ec0151d6816f85443a3d;p=graphviz

conditioned -no-undefined and extra libs on WIN32, where they are necessary for making DLL's; fixed quartz not linking due to -no-undefined
---

diff --git a/plugin/core/Makefile.am b/plugin/core/Makefile.am
index 0217d1a7c..6a15977e4 100644
--- a/plugin/core/Makefile.am
+++ b/plugin/core/Makefile.am
@@ -27,9 +27,14 @@ libgvplugin_core_C_la_SOURCES = \
 	gvrender_core_map.c \
 	gvloadimage_core.c
 
-libgvplugin_core_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ -no-undefined
+libgvplugin_core_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
 libgvplugin_core_la_SOURCES = $(libgvplugin_core_C_la_SOURCES)
-libgvplugin_core_la_LIBADD = $(top_builddir)/lib/gvc/libgvc.la $(top_builddir)/lib/graph/libgraph.la
+libgvplugin_core_la_LIBADD = $(top_builddir)/lib/gvc/libgvc.la
+
+if WITH_WIN32
+libgvplugin_core_la_LDFLAGS += -no-undefined
+libgvplugin_core_la_LIBADD += $(top_builddir)/lib/graph/libgraph.la
+endif
 
 EXTRA_DIST = Makefile.old
 
diff --git a/plugin/devil/Makefile.am b/plugin/devil/Makefile.am
index ecb735780..ed816a9cf 100644
--- a/plugin/devil/Makefile.am
+++ b/plugin/devil/Makefile.am
@@ -23,9 +23,13 @@ libgvplugin_devil_C_la_SOURCES = \
 	gvplugin_devil.c \
 	gvdevice_devil.c
 
-libgvplugin_devil_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ -no-undefined
+libgvplugin_devil_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
 libgvplugin_devil_la_SOURCES = $(libgvplugin_devil_C_la_SOURCES)
 libgvplugin_devil_la_LIBADD = @DEVIL_LIBS@
 
+if WITH_WIN32
+libgvplugin_devil_la_LDFLAGS += -no-undefined
+endif
+
 EXTRA_DIST = Makefile.old
 
diff --git a/plugin/dot_layout/Makefile.am b/plugin/dot_layout/Makefile.am
index ab4710a5d..1fba36da8 100644
--- a/plugin/dot_layout/Makefile.am
+++ b/plugin/dot_layout/Makefile.am
@@ -24,12 +24,16 @@ libgvplugin_dot_layout_C_la_SOURCES = \
 libgvplugin_dot_layout_C_la_LIBADD = \
 	$(top_builddir)/lib/dotgen/libdotgen_C.la
 
-libgvplugin_dot_layout_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ -no-undefined
+libgvplugin_dot_layout_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
 libgvplugin_dot_layout_la_SOURCES = $(libgvplugin_dot_layout_C_la_SOURCES)
 libgvplugin_dot_layout_la_LIBADD = $(libgvplugin_dot_layout_C_la_LIBADD) \
 	$(top_builddir)/lib/gvc/libgvc.la \
-	$(top_builddir)/lib/pathplan/libpathplan.la \
-	$(top_builddir)/lib/graph/libgraph.la
+	$(top_builddir)/lib/pathplan/libpathplan.la
+	
+if WITH_WIN32
+libgvplugin_dot_layout_la_LDFLAGS += -no-undefined
+libgvplugin_dot_layout_la_LIBADD += $(top_builddir)/lib/graph/libgraph.la
+endif
 
 EXTRA_DIST = Makefile.old
 
diff --git a/plugin/gd/Makefile.am b/plugin/gd/Makefile.am
index 6871fede5..8360f9bfa 100644
--- a/plugin/gd/Makefile.am
+++ b/plugin/gd/Makefile.am
@@ -26,18 +26,22 @@ libgvplugin_gd_C_la_SOURCES = \
 	gvloadimage_gd.c \
 	gvdevice_gd.c
 
-libgvplugin_gd_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ -no-undefined
+libgvplugin_gd_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
 libgvplugin_gd_la_SOURCES = $(libgvplugin_gd_C_la_SOURCES)
 if WITH_MYLIBGD
 libgvplugin_gd_la_LIBADD = \
 	$(top_builddir)/lib/gd/libgvgd_C.la \
 	$(top_builddir)/lib/gvc/libgvc.la \
-	$(top_builddir)/lib/graph/libgraph.la \
 	@ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @MATH_LIBS@
 AM_CPPFLAGS += -DNONDLL
 else
 libgvplugin_gd_la_LIBADD = \
-	$(top_builddir)/lib/gvc/libgvc.la $(top_builddir)/lib/graph/libgraph.la @GD_LIBS@ @MATH_LIBS@
+	$(top_builddir)/lib/gvc/libgvc.la @GD_LIBS@ @MATH_LIBS@
+endif
+
+if WITH_WIN32
+libgvplugin_gd_la_LDFLAGS += -no-undefined
+libgvplugin_gd_la_LIBADD += $(top_builddir)/lib/graph/libgraph.la
 endif
 
 EXTRA_DIST = Makefile.old
diff --git a/plugin/gdk_pixbuf/Makefile.am b/plugin/gdk_pixbuf/Makefile.am
index 80c694641..33ea765ab 100644
--- a/plugin/gdk_pixbuf/Makefile.am
+++ b/plugin/gdk_pixbuf/Makefile.am
@@ -25,10 +25,14 @@ libgvplugin_gdk_pixbuf_C_la_SOURCES = \
 	gvplugin_gdk_pixbuf.c \
 	gvdevice_gdk_pixbuf.c
 
-libgvplugin_gdk_pixbuf_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ -no-undefined
+libgvplugin_gdk_pixbuf_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
 libgvplugin_gdk_pixbuf_la_SOURCES = $(libgvplugin_gdk_pixbuf_C_la_SOURCES)
 libgvplugin_gdk_pixbuf_la_LIBADD = \
 	$(top_builddir)/lib/gvc/libgvc.la @GDK_PIXBUF_LIBS@
+	
+if WITH_WIN32
+libgvplugin_gdk_pixbuf_la_LDFLAGS += -no-undefined
+endif
 
 EXTRA_DIST = Makefile.old
 
diff --git a/plugin/gtk/Makefile.am b/plugin/gtk/Makefile.am
index 0f008b435..404550e0a 100644
--- a/plugin/gtk/Makefile.am
+++ b/plugin/gtk/Makefile.am
@@ -29,8 +29,12 @@ libgvplugin_gtk_C_la_SOURCES = \
         interface.c \
         callbacks.c 
 
-libgvplugin_gtk_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ -no-undefined
+libgvplugin_gtk_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
 libgvplugin_gtk_la_SOURCES = $(libgvplugin_gtk_C_la_SOURCES)
 libgvplugin_gtk_la_LIBADD = $(GTK_LIBS) $(GNOMEUI_LIBS)
 
+if WITH_WIN32
+libgvplugin_gtk_la_LDFLAGS = -no-undefined
+endif
+
 EXTRA_DIST = gtk.glade gtk.gladep 
diff --git a/plugin/ming/Makefile.am b/plugin/ming/Makefile.am
index 1a98ef170..fcaca869e 100644
--- a/plugin/ming/Makefile.am
+++ b/plugin/ming/Makefile.am
@@ -24,8 +24,12 @@ libgvplugin_ming_C_la_SOURCES = \
 	gvplugin_ming.c \
 	gvrender_ming.c
 
-libgvplugin_ming_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ -no-undefined
+libgvplugin_ming_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
 libgvplugin_ming_la_SOURCES = $(libgvplugin_ming_C_la_SOURCES)
 libgvplugin_ming_la_LIBADD = @MING_LIBS@ @MATH_LIBS@
 
+if WITH_WIN32
+libgvplugin_ming_la_LDFLAGS = -no-undefined
+endif
+
 EXTRA_DIST = Makefile.old Bitstream_Vera_Sans.fdb Bitstream_Vera_Serif.fdb
diff --git a/plugin/neato_layout/Makefile.am b/plugin/neato_layout/Makefile.am
index 3e364ba3a..61700fcd5 100644
--- a/plugin/neato_layout/Makefile.am
+++ b/plugin/neato_layout/Makefile.am
@@ -31,8 +31,11 @@ libgvplugin_neato_layout_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
 libgvplugin_neato_layout_la_SOURCES = $(libgvplugin_neato_layout_C_la_SOURCES)
 libgvplugin_neato_layout_la_LIBADD = $(libgvplugin_neato_layout_C_la_LIBADD) \
 	$(top_builddir)/lib/gvc/libgvc.la \
-	$(top_builddir)/lib/pathplan/libpathplan.la \
-	$(top_builddir)/lib/graph/libgraph.la \
-	$(top_builddir)/lib/cdt/libcdt.la @IPSEPCOLA_LIBS@
+	$(top_builddir)/lib/pathplan/libpathplan.la @IPSEPCOLA_LIBS@
+	
+if WITH_WIN32
+libgvplugin_neato_layout_la_LDFLAGS += -no-undefined
+libgvplugin_neato_layout_la_LIBADD += $(top_builddir)/lib/graph/libgraph.la $(top_builddir)/lib/cdt/libcdt.la
+endif
 
 EXTRA_DIST = Makefile.old
diff --git a/plugin/pango/Makefile.am b/plugin/pango/Makefile.am
index 74764ffbe..0c3826d3d 100644
--- a/plugin/pango/Makefile.am
+++ b/plugin/pango/Makefile.am
@@ -25,11 +25,14 @@ libgvplugin_pango_C_la_SOURCES = \
 	gvtextlayout_pango.c \
 	gvloadimage_pango.c
 
-libgvplugin_pango_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ -no-undefined
+libgvplugin_pango_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
 libgvplugin_pango_la_SOURCES = $(libgvplugin_pango_C_la_SOURCES)
 libgvplugin_pango_la_LIBADD = \
 	$(top_builddir)/lib/gvc/libgvc.la @PANGOCAIRO_LIBS@ @FONTCONFIG_LIBS@ @MATH_LIBS@
 
+if WITH_WIN32
+libgvplugin_pango_la_LDFLAGS += -no-undefined
+endif
 
 EXTRA_DIST = Makefile.old
 
diff --git a/plugin/quartz/Makefile.am b/plugin/quartz/Makefile.am
index 98b66d64b..8b8653dbe 100644
--- a/plugin/quartz/Makefile.am
+++ b/plugin/quartz/Makefile.am
@@ -23,6 +23,10 @@ libgvplugin_quartz_C_la_SOURCES = \
 	gvplugin_quartz.c \
 	gvrender_quartz.c
 
-libgvplugin_quartz_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ -no-undefined
+libgvplugin_quartz_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO
 libgvplugin_quartz_la_SOURCES = $(libgvplugin_quartz_C_la_SOURCES)
 libgvplugin_quartz_la_LIBADD = @QUARTZ_LIBS@
+
+if WITH_WIN32
+libgvplugin_quartz_la_LDFLAGS += -no-undefined
+endif
diff --git a/plugin/rsvg/Makefile.am b/plugin/rsvg/Makefile.am
index a49e4ff49..3f0f95649 100644
--- a/plugin/rsvg/Makefile.am
+++ b/plugin/rsvg/Makefile.am
@@ -23,10 +23,14 @@ libgvplugin_rsvg_C_la_SOURCES = \
 	gvplugin_rsvg.c \
 	gvloadimage_rsvg.c
 
-libgvplugin_rsvg_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ -no-undefined
+libgvplugin_rsvg_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
 libgvplugin_rsvg_la_SOURCES = $(libgvplugin_rsvg_C_la_SOURCES)
 libgvplugin_rsvg_la_LIBADD = \
 	$(top_builddir)/lib/gvc/libgvc.la @RSVG_LIBS@ @PANGOCAIRO_LIBS@
 
+if WITH_WIN32
+libgvplugin_rsvg_la_LDFLAGS += -no-undefined
+endif
+
 EXTRA_DIST = Makefile.old
 
diff --git a/plugin/xlib/Makefile.am b/plugin/xlib/Makefile.am
index b3ffa2344..cf1a4c7b1 100644
--- a/plugin/xlib/Makefile.am
+++ b/plugin/xlib/Makefile.am
@@ -25,6 +25,10 @@ libgvplugin_xlib_C_la_SOURCES = \
 	gvplugin_xlib.c \
 	gvdevice_xlib.c
 
-libgvplugin_xlib_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ -no-undefined
+libgvplugin_xlib_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
 libgvplugin_xlib_la_SOURCES = $(libgvplugin_xlib_C_la_SOURCES)
 libgvplugin_xlib_la_LIBADD = @PANGOCAIRO_LIBS@ @X_LIBS@ -lX11 @SOCKET_LIBS@ @MATH_LIBS@
+
+if WITH_WIN32
+libgvplugin_xlib_la_LDFLAGS += -no-undefined
+endif