conditioned -no-undefined and extra libs on WIN32, where they are necessary for makin...

diff --git a/plugin/core/Makefile.am b/plugin/core/Makefile.am
index 0217d1a7cec9ea7ae69e43afbc81cd1739e22ea0..6a15977e455551a7591150e5cda28d9ef3a50ea2 100644 (file)
--- 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 ecb735780fd3fffb75928fa1a1efeb4f26f74e90..ed816a9cf050603c25efbd680faae42e79c4c47b 100644 (file)
--- 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 ab4710a5da9c3ab72d320464674f985ea402e3a8..1fba36da8aa6ec8d61c0f1e17748c8de5ea6080b 100644 (file)
--- 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 6871fede51ce8003ee04f7701534fef7e2d2ce1d..8360f9bfa0ae64f11eb8a1752b2d48b97f24869f 100644 (file)
--- 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 80c69464102904ee765011ef67655d459fb8993c..33ea765ab69b12d60ff8828633de1d07483270c4 100644 (file)
--- 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 0f008b435e730c55c4dc6e407ab9a029a331c664..404550e0ad411c1905514466643eeb714afe6fd9 100644 (file)
--- 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 1a98ef17094612f417029d8ebbd6c1501495282c..fcaca869e60b7b388b48f3aeed50de0861f41a29 100644 (file)
--- 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 3e364ba3a0140cbfc08bea82be1ef65bea424de0..61700fcd5e14906f2add9ce279f3d80118cd89c6 100644 (file)
--- 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 74764ffbe1c777210a418c4029de447ed310e806..0c3826d3ded90065e22e1e0b8be8a44f276a129a 100644 (file)
--- 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 98b66d64b11310ff7752e30488c11ad832805b04..8b8653dbe2eab357ec848a2e957bd92a66aa7687 100644 (file)
--- 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 a49e4ff49bff36591ac4b6f4c912e9aadef76fb5..3f0f95649e12194503cea9fe8a755985aab2d4ab 100644 (file)
--- 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 b3ffa234444659cfcdd7f0351bc75b90f760bcae..cf1a4c7b15e44369ad81cd445c028b348b519492 100644 (file)
--- 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