From: glenlow Date: Sat, 23 Feb 2008 00:48:36 +0000 (+0000) Subject: build changes for MinGW: avoid explicit dllimport/dllexport in compiling libltdl... X-Git-Tag: LAST_LIBGRAPH~32^2~4708 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f1eb5cbba0a67db1d05e8cf7e62569affa901e0e;p=graphviz build changes for MinGW: avoid explicit dllimport/dllexport in compiling libltdl, lib/gd, plugin/gd; plugin linking with -no-undefined + dependent libs to force DLL creation; plugins installed into lib instead of lib/graphviz in Windows; install symlinks with .exe extension in Windows --- diff --git a/lib/gvc/Makefile.am b/lib/gvc/Makefile.am index 483d85c7f..2ad08b7dc 100644 --- a/lib/gvc/Makefile.am +++ b/lib/gvc/Makefile.am @@ -34,7 +34,7 @@ libgvc_C_la_LIBADD = $(top_builddir)/lib/common/libcommon_C.la \ #For use with plugins. # so it is linked with an empty table of builtins. -libgvc_la_LDFLAGS = -version-info @VERSION_INFO@ +libgvc_la_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined libgvc_la_SOURCES = $(libgvc_C_la_SOURCES) no_builtins.c demand_loading.c libgvc_la_LIBADD = $(libgvc_C_la_LIBADD) \ $(top_builddir)/lib/cdt/libcdt.la \ diff --git a/plugin/core/Makefile.am b/plugin/core/Makefile.am index fc256f305..0217d1a7c 100644 --- a/plugin/core/Makefile.am +++ b/plugin/core/Makefile.am @@ -11,7 +11,11 @@ AM_CPPFLAGS = \ $(LIBGVC_CFLAGS) noinst_LTLIBRARIES = libgvplugin_core_C.la +if WITH_WIN32 +lib_LTLIBRARIES = libgvplugin_core.la +else pkglib_LTLIBRARIES = libgvplugin_core.la +endif libgvplugin_core_C_la_SOURCES = \ gvplugin_core.c \ @@ -23,9 +27,9 @@ libgvplugin_core_C_la_SOURCES = \ gvrender_core_map.c \ gvloadimage_core.c -libgvplugin_core_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ +libgvplugin_core_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ -no-undefined libgvplugin_core_la_SOURCES = $(libgvplugin_core_C_la_SOURCES) -libgvplugin_core_la_LIBADD = $(top_builddir)/lib/gvc/libgvc.la +libgvplugin_core_la_LIBADD = $(top_builddir)/lib/gvc/libgvc.la $(top_builddir)/lib/graph/libgraph.la EXTRA_DIST = Makefile.old diff --git a/plugin/devil/Makefile.am b/plugin/devil/Makefile.am index 67d7305ca..ecb735780 100644 --- a/plugin/devil/Makefile.am +++ b/plugin/devil/Makefile.am @@ -12,14 +12,18 @@ AM_CPPFLAGS = \ if WITH_DEVIL noinst_LTLIBRARIES = libgvplugin_devil_C.la +if WITH_WIN32 +lib_LTLIBRARIES = libgvplugin_devil.la +else pkglib_LTLIBRARIES = libgvplugin_devil.la endif +endif libgvplugin_devil_C_la_SOURCES = \ gvplugin_devil.c \ gvdevice_devil.c -libgvplugin_devil_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ +libgvplugin_devil_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ -no-undefined libgvplugin_devil_la_SOURCES = $(libgvplugin_devil_C_la_SOURCES) libgvplugin_devil_la_LIBADD = @DEVIL_LIBS@ diff --git a/plugin/dot_layout/Makefile.am b/plugin/dot_layout/Makefile.am index 7ffbdc868..ab4710a5d 100644 --- a/plugin/dot_layout/Makefile.am +++ b/plugin/dot_layout/Makefile.am @@ -12,7 +12,11 @@ AM_CPPFLAGS = \ noinst_LTLIBRARIES = libgvplugin_dot_layout_C.la +if WITH_WIN32 +lib_LTLIBRARIES = libgvplugin_dot_layout.la +else pkglib_LTLIBRARIES = libgvplugin_dot_layout.la +endif libgvplugin_dot_layout_C_la_SOURCES = \ gvplugin_dot_layout.c \ @@ -20,11 +24,12 @@ 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@ +libgvplugin_dot_layout_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ -no-undefined 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/pathplan/libpathplan.la \ + $(top_builddir)/lib/graph/libgraph.la EXTRA_DIST = Makefile.old diff --git a/plugin/gd/Makefile.am b/plugin/gd/Makefile.am index f06019f8c..6871fede5 100644 --- a/plugin/gd/Makefile.am +++ b/plugin/gd/Makefile.am @@ -12,7 +12,11 @@ AM_CPPFLAGS = \ noinst_LTLIBRARIES = libgvplugin_gd_C.la +if WITH_WIN32 +lib_LTLIBRARIES = libgvplugin_gd.la +else pkglib_LTLIBRARIES = libgvplugin_gd.la +endif libgvplugin_gd_C_la_SOURCES = \ gvplugin_gd.c \ @@ -22,16 +26,18 @@ libgvplugin_gd_C_la_SOURCES = \ gvloadimage_gd.c \ gvdevice_gd.c -libgvplugin_gd_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ +libgvplugin_gd_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ -no-undefined 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 @GD_LIBS@ @MATH_LIBS@ + $(top_builddir)/lib/gvc/libgvc.la $(top_builddir)/lib/graph/libgraph.la @GD_LIBS@ @MATH_LIBS@ endif EXTRA_DIST = Makefile.old diff --git a/plugin/gdk_pixbuf/Makefile.am b/plugin/gdk_pixbuf/Makefile.am index 180722ddb..80c694641 100644 --- a/plugin/gdk_pixbuf/Makefile.am +++ b/plugin/gdk_pixbuf/Makefile.am @@ -13,15 +13,19 @@ AM_CPPFLAGS = \ if WITH_PANGOCAIRO if WITH_GDK_PIXBUF noinst_LTLIBRARIES = libgvplugin_gdk_pixbuf_C.la +if WITH_WIN32 +lib_LTLIBRARIES = libgvplugin_gdk_pixbuf.la +else pkglib_LTLIBRARIES = libgvplugin_gdk_pixbuf.la endif endif +endif libgvplugin_gdk_pixbuf_C_la_SOURCES = \ gvplugin_gdk_pixbuf.c \ gvdevice_gdk_pixbuf.c -libgvplugin_gdk_pixbuf_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ +libgvplugin_gdk_pixbuf_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ -no-undefined 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@ diff --git a/plugin/gtk/Makefile.am b/plugin/gtk/Makefile.am index 695490c98..0f008b435 100644 --- a/plugin/gtk/Makefile.am +++ b/plugin/gtk/Makefile.am @@ -14,9 +14,13 @@ if WITH_PANGOCAIRO if WITH_GTK noinst_HEADERS = support.h interface.h callbacks.h noinst_LTLIBRARIES = libgvplugin_gtk_C.la +if WITH_WIN32 +lib_LTLIBRARIES = libgvplugin_gtk.la +else pkglib_LTLIBRARIES = libgvplugin_gtk.la endif endif +endif libgvplugin_gtk_C_la_SOURCES = \ gvplugin_gtk.c \ @@ -25,7 +29,7 @@ libgvplugin_gtk_C_la_SOURCES = \ interface.c \ callbacks.c -libgvplugin_gtk_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ +libgvplugin_gtk_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ -no-undefined libgvplugin_gtk_la_SOURCES = $(libgvplugin_gtk_C_la_SOURCES) libgvplugin_gtk_la_LIBADD = $(GTK_LIBS) $(GNOMEUI_LIBS) diff --git a/plugin/ming/Makefile.am b/plugin/ming/Makefile.am index 21636b85a..1a98ef170 100644 --- a/plugin/ming/Makefile.am +++ b/plugin/ming/Makefile.am @@ -12,7 +12,11 @@ AM_CPPFLAGS = \ if WITH_MING noinst_LTLIBRARIES = libgvplugin_ming_C.la +if WITH_WIN32 +lib_LTLIBRARIES = libgvplugin_ming.la +else pkglib_LTLIBRARIES = libgvplugin_ming.la +endif pkglib_DATA = Bitstream_Vera_Sans.fdb Bitstream_Vera_Serif.fdb endif @@ -20,7 +24,7 @@ libgvplugin_ming_C_la_SOURCES = \ gvplugin_ming.c \ gvrender_ming.c -libgvplugin_ming_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ +libgvplugin_ming_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ -no-undefined libgvplugin_ming_la_SOURCES = $(libgvplugin_ming_C_la_SOURCES) libgvplugin_ming_la_LIBADD = @MING_LIBS@ @MATH_LIBS@ diff --git a/plugin/neato_layout/Makefile.am b/plugin/neato_layout/Makefile.am index 023e2cf37..696c73369 100644 --- a/plugin/neato_layout/Makefile.am +++ b/plugin/neato_layout/Makefile.am @@ -12,7 +12,11 @@ AM_CPPFLAGS = \ noinst_LTLIBRARIES = libgvplugin_neato_layout_C.la +if WITH_WIN32 +lib_LTLIBRARIES = libgvplugin_neato_layout.la +else pkglib_LTLIBRARIES = libgvplugin_neato_layout.la +endif libgvplugin_neato_layout_C_la_SOURCES = \ gvplugin_neato_layout.c \ @@ -23,10 +27,12 @@ libgvplugin_neato_layout_C_la_LIBADD = \ $(top_builddir)/lib/fdpgen/libfdpgen_C.la \ $(top_builddir)/lib/circogen/libcircogen_C.la -libgvplugin_neato_layout_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ +libgvplugin_neato_layout_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ -no-undefined 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 @IPSEPCOLA_LIBS@ + $(top_builddir)/lib/pathplan/libpathplan.la \ + $(top_builddir)/lib/graph/libgraph.la \ + $(top_builddir)/lib/cdt/libcdt.la @IPSEPCOLA_LIBS@ EXTRA_DIST = Makefile.old diff --git a/plugin/pango/Makefile.am b/plugin/pango/Makefile.am index 4705a9700..74764ffbe 100644 --- a/plugin/pango/Makefile.am +++ b/plugin/pango/Makefile.am @@ -12,8 +12,12 @@ AM_CPPFLAGS = \ if WITH_PANGOCAIRO noinst_LTLIBRARIES = libgvplugin_pango_C.la +if WITH_WIN32 +lib_LTLIBRARIES = libgvplugin_pango.la +else pkglib_LTLIBRARIES = libgvplugin_pango.la endif +endif libgvplugin_pango_C_la_SOURCES = \ gvplugin_pango.c \ @@ -21,7 +25,7 @@ libgvplugin_pango_C_la_SOURCES = \ gvtextlayout_pango.c \ gvloadimage_pango.c -libgvplugin_pango_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ +libgvplugin_pango_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ -no-undefined 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@ diff --git a/plugin/quartz/Makefile.am b/plugin/quartz/Makefile.am index afa66c7e9..98b66d64b 100644 --- a/plugin/quartz/Makefile.am +++ b/plugin/quartz/Makefile.am @@ -12,13 +12,17 @@ AM_CPPFLAGS = \ if WITH_QUARTZ noinst_LTLIBRARIES = libgvplugin_quartz_C.la +if WITH_WIN32 +lib_LTLIBRARIES = libgvplugin_quartz.la +else pkglib_LTLIBRARIES = libgvplugin_quartz.la endif +endif libgvplugin_quartz_C_la_SOURCES = \ gvplugin_quartz.c \ gvrender_quartz.c -libgvplugin_quartz_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ +libgvplugin_quartz_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ -no-undefined libgvplugin_quartz_la_SOURCES = $(libgvplugin_quartz_C_la_SOURCES) libgvplugin_quartz_la_LIBADD = @QUARTZ_LIBS@ diff --git a/plugin/rsvg/Makefile.am b/plugin/rsvg/Makefile.am index ad6bae0d4..a49e4ff49 100644 --- a/plugin/rsvg/Makefile.am +++ b/plugin/rsvg/Makefile.am @@ -12,14 +12,18 @@ AM_CPPFLAGS = \ if WITH_RSVG noinst_LTLIBRARIES = libgvplugin_rsvg_C.la +if WITH_WIN32 +lib_LTLIBRARIES = libgvplugin_rsvg.la +else pkglib_LTLIBRARIES = libgvplugin_rsvg.la endif +endif libgvplugin_rsvg_C_la_SOURCES = \ gvplugin_rsvg.c \ gvloadimage_rsvg.c -libgvplugin_rsvg_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ +libgvplugin_rsvg_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ -no-undefined libgvplugin_rsvg_la_SOURCES = $(libgvplugin_rsvg_C_la_SOURCES) libgvplugin_rsvg_la_LIBADD = \ $(top_builddir)/lib/gvc/libgvc.la @RSVG_LIBS@ @PANGOCAIRO_LIBS@ diff --git a/plugin/xlib/Makefile.am b/plugin/xlib/Makefile.am index d0baf671e..b3ffa2344 100644 --- a/plugin/xlib/Makefile.am +++ b/plugin/xlib/Makefile.am @@ -13,14 +13,18 @@ AM_CPPFLAGS = \ if WITH_PANGOCAIRO if WITH_X noinst_LTLIBRARIES = libgvplugin_xlib_C.la +if WITH_WIN32 +lib_LTLIBRARIES = libgvplugin_xlib.la +else pkglib_LTLIBRARIES = libgvplugin_xlib.la endif endif +endif libgvplugin_xlib_C_la_SOURCES = \ gvplugin_xlib.c \ gvdevice_xlib.c -libgvplugin_xlib_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ +libgvplugin_xlib_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@ -no-undefined libgvplugin_xlib_la_SOURCES = $(libgvplugin_xlib_C_la_SOURCES) libgvplugin_xlib_la_LIBADD = @PANGOCAIRO_LIBS@ @X_LIBS@ -lX11 @SOCKET_LIBS@ @MATH_LIBS@