GNOME.org
 

[dia] mingw: plug-ins as shared libraries

commit 3c19f0fb6909944aad17c50db3559e554a761f1c
Author: Fridrich Å trba <fridrich strba bluewin ch>
Date:   Sun Aug 29 18:07:48 2010 +0200

    mingw: plug-ins as shared libraries
    
    [PATCH 4/6] Make plug-ins build as shared objects on
    windows with mingw and autotools
    
    Signed-off-by: Hans Breuer <hans breuer org>

 plug-ins/cairo/Makefile.am      |    2 +-
 plug-ins/cgm/Makefile.am        |    4 +++-
 plug-ins/drs/Makefile.am        |    2 +-
 plug-ins/dxf/Makefile.am        |    4 +++-
 plug-ins/hpgl/Makefile.am       |    4 +++-
 plug-ins/libart/Makefile.am     |    4 ++--
 plug-ins/metapost/Makefile.am   |    4 +++-
 plug-ins/pgf/Makefile.am        |    4 +++-
 plug-ins/pixbuf/Makefile.am     |    4 +++-
 plug-ins/postscript/Makefile.am |   16 +++++++++++++---
 plug-ins/pstricks/Makefile.am   |    4 +++-
 plug-ins/python/Makefile.am     |    4 ++--
 plug-ins/shape/Makefile.am      |    4 +++-
 plug-ins/svg/Makefile.am        |    4 +++-
 plug-ins/vdx/Makefile.am        |    4 +++-
 plug-ins/wmf/Makefile.am        |   11 +++++++----
 plug-ins/wpg/Makefile.am        |    4 +++-
 plug-ins/xfig/Makefile.am       |    4 +++-
 plug-ins/xslt/Makefile.am       |    4 ++--
 19 files changed, 64 insertions(+), 27 deletions(-)
---
diff --git a/plug-ins/cairo/Makefile.am b/plug-ins/cairo/Makefile.am
index c0c3ef7..2a26287 100644
--- a/plug-ins/cairo/Makefile.am
+++ b/plug-ins/cairo/Makefile.am
@@ -13,7 +13,7 @@ EXTRA_DIST =
 
 libcairo_filter_la_SOURCES = $(plugin_sources)
 
-libcairo_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
+libcairo_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
 libcairo_filter_la_LIBADD = $(CAIRO_LIBS) $(top_builddir)/lib/libdia.la
 
 INCLUDES = -I$(srcdir)/../../lib $(GTK_CFLAGS) $(DEBUG_FLAGS) $(CAIRO_CFLAGS)
diff --git a/plug-ins/cgm/Makefile.am b/plug-ins/cgm/Makefile.am
index c82c07a..f2165e9 100644
--- a/plug-ins/cgm/Makefile.am
+++ b/plug-ins/cgm/Makefile.am
@@ -4,6 +4,8 @@ pkglib_LTLIBRARIES = libcgm_filter.la
 
 libcgm_filter_la_SOURCES = cgm.c
 
-libcgm_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
+libcgm_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
+
+libcgm_filter_la_LIBADD = $(top_builddir)/lib/libdia.la
 
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(DEBUG_CFLAGS) $(GTK_CFLAGS)
diff --git a/plug-ins/drs/Makefile.am b/plug-ins/drs/Makefile.am
index dbfa0b1..cc26994 100644
--- a/plug-ins/drs/Makefile.am
+++ b/plug-ins/drs/Makefile.am
@@ -14,7 +14,7 @@ EXTRA_DIST = \
 
 libdrs_filter_la_SOURCES = $(plugin_sources)
 
-libdrs_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
+libdrs_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
 libdrs_filter_la_LIBADD = $(CAIRO_LIBS) $(top_builddir)/lib/libdia.la
 
 INCLUDES = -I$(srcdir)/../../lib $(GTK_CFLAGS) $(DEBUG_FLAGS)
diff --git a/plug-ins/dxf/Makefile.am b/plug-ins/dxf/Makefile.am
index b9affcf..7b9a89a 100644
--- a/plug-ins/dxf/Makefile.am
+++ b/plug-ins/dxf/Makefile.am
@@ -9,6 +9,8 @@ libdxf_filter_la_SOURCES = \
 	autocad_pal.c \
 	autocad_pal.h
 
-libdxf_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
+libdxf_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
+
+libdxf_filter_la_LIBADD = $(top_builddir)/lib/libdia.la
 
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib  $(DEBUG_FLAGS) $(GTK_CFLAGS)
diff --git a/plug-ins/hpgl/Makefile.am b/plug-ins/hpgl/Makefile.am
index 285f5e8..a8eb7b4 100644
--- a/plug-ins/hpgl/Makefile.am
+++ b/plug-ins/hpgl/Makefile.am
@@ -1,6 +1,8 @@
 pkglib_LTLIBRARIES = libhpgl_filter.la
 
 libhpgl_filter_la_SOURCES = hpgl.c
-libhpgl_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
+libhpgl_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
+
+libhpgl_filter_la_LIBADD = $(top_builddir)/lib/libdia.la
 
 INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir)/lib $(DEBUG_FLAGS) $(GTK_CFLAGS)
diff --git a/plug-ins/libart/Makefile.am b/plug-ins/libart/Makefile.am
index e334818..36267ff 100644
--- a/plug-ins/libart/Makefile.am
+++ b/plug-ins/libart/Makefile.am
@@ -13,8 +13,8 @@ EXTRA_DIST =
 
 libart_filter_la_SOURCES = $(plugin_sources)
 
-libart_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
+libart_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
 
-libart_filter_la_LIBADD = $(LIBART_LIBS) $(LIBPNG_LIBS)
+libart_filter_la_LIBADD = $(LIBART_LIBS) $(LIBPNG_LIBS) $(top_builddir)/lib/libdia.la
 
 INCLUDES = -I$(srcdir)/../../lib $(GTK_CFLAGS) $(DEBUG_FLAGS) $(LIBART_CFLAGS) $(LIBPNG_CFLAGS)
diff --git a/plug-ins/metapost/Makefile.am b/plug-ins/metapost/Makefile.am
index 10b565c..011ee7e 100644
--- a/plug-ins/metapost/Makefile.am
+++ b/plug-ins/metapost/Makefile.am
@@ -7,6 +7,8 @@ libmetapost_filter_la_SOURCES = \
 	render_metapost.c \
 	render_metapost.h
 
-libmetapost_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
+libmetapost_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
+
+libmetapost_filter_la_LIBADD = $(top_builddir)/lib/libdia.la
 
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib  $(DEBUG_FLAGS) $(GTK_CFLAGS)
diff --git a/plug-ins/pgf/Makefile.am b/plug-ins/pgf/Makefile.am
index fb70184..78852ef 100644
--- a/plug-ins/pgf/Makefile.am
+++ b/plug-ins/pgf/Makefile.am
@@ -7,6 +7,8 @@ libpgf_filter_la_SOURCES = \
 	render_pgf.c \
 	render_pgf.h
 
-libpgf_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
+libpgf_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
+
+libpgf_filter_la_LIBADD = $(top_builddir)/lib/libdia.la
 
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(DEBUG_FLAGS) $(GTK_CFLAGS)
diff --git a/plug-ins/pixbuf/Makefile.am b/plug-ins/pixbuf/Makefile.am
index b4d64fa..336e36c 100644
--- a/plug-ins/pixbuf/Makefile.am
+++ b/plug-ins/pixbuf/Makefile.am
@@ -5,6 +5,8 @@ pkglib_LTLIBRARIES = libpixbuf_filter.la
 libpixbuf_filter_la_SOURCES = \
 	pixbuf.c
 
-libpixbuf_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
+libpixbuf_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
+
+libpixbuf_filter_la_LIBADD = $(top_builddir)/lib/libdia.la
 
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(DEBUG_FLAGS)
diff --git a/plug-ins/postscript/Makefile.am b/plug-ins/postscript/Makefile.am
index e54dfae..9f8c80d 100644
--- a/plug-ins/postscript/Makefile.am
+++ b/plug-ins/postscript/Makefile.am
@@ -1,7 +1,13 @@
 if WITH_FREETYPE
 freetype_files = diapsft2renderer.h diapsft2renderer.c
 else
-freetype_files = 
+freetype_files =
+endif
+
+if OS_WIN32
+win32_files = win32print.c win32print.h
+else
+win32_files =
 endif
 
 plugin_sources = \
@@ -11,6 +17,7 @@ plugin_sources = \
 	diapsrenderer.h \
 	diapsrenderer.c \
 	$(freetype_files) \
+	$(win32_files) \
 	paginate_psprint.c \
 	paginate_psprint.h \
 	render_eps.c \
@@ -26,11 +33,14 @@ EXTRA_DIST = \
 
 libpostscript_filter_la_SOURCES = $(plugin_sources)
 
-libpostscript_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
+libpostscript_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
 
-libpostscript_filter_la_LIBADD =
+libpostscript_filter_la_LIBADD = $(top_builddir)/lib/libdia.la
 if WITH_FREETYPE
 libpostscript_filter_la_LIBADD += $(FREETYPE_LIBS)
 endif
+if OS_WIN32
+libpostscript_filter_la_LIBADD += -lwinspool
+endif
 
 INCLUDES = -I$(srcdir)/../../lib $(GTK_CFLAGS) $(DEBUG_FLAGS) $(CAIRO_CFLAGS)
diff --git a/plug-ins/pstricks/Makefile.am b/plug-ins/pstricks/Makefile.am
index e530561..9af9b82 100644
--- a/plug-ins/pstricks/Makefile.am
+++ b/plug-ins/pstricks/Makefile.am
@@ -7,6 +7,8 @@ libpstricks_filter_la_SOURCES = \
 	render_pstricks.c \
 	render_pstricks.h
 
-libpstricks_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
+libpstricks_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
+
+libpstricks_filter_la_LIBADD = $(top_builddir)/lib/libdia.la
 
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(DEBUG_FLAGS) $(GTK_CFLAGS)
diff --git a/plug-ins/python/Makefile.am b/plug-ins/python/Makefile.am
index 83bccd9..96e54c1 100644
--- a/plug-ins/python/Makefile.am
+++ b/plug-ins/python/Makefile.am
@@ -14,8 +14,8 @@ endif
 
 pkglib_LTLIBRARIES = $(libpython_plugin)
 
-libpython_plugin_la_LDFLAGS = -export-dynamic -module -avoid-version
-libpython_plugin_la_LIBADD = $(PYTHON_LIBS)
+libpython_plugin_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
+libpython_plugin_la_LIBADD = $(PYTHON_LIBS) $(top_builddir)/lib/libdia.la
 libpython_plugin_la_SOURCES = \
 	pydia-color.c \
 	pydia-color.h \
diff --git a/plug-ins/shape/Makefile.am b/plug-ins/shape/Makefile.am
index aad215e..7332016 100644
--- a/plug-ins/shape/Makefile.am
+++ b/plug-ins/shape/Makefile.am
@@ -6,7 +6,9 @@ libshape_filter_la_SOURCES = \
 	shape.c \
 	shape-export.c
 
-libshape_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
+libshape_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
+
+libshape_filter_la_LIBADD = $(top_builddir)/lib/libdia.la
 
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
 	$(DEBUG_FLAGS) $(GTK_CFLAGS) $(XML_CFLAGS)
diff --git a/plug-ins/svg/Makefile.am b/plug-ins/svg/Makefile.am
index c77d71c..23e6f45 100644
--- a/plug-ins/svg/Makefile.am
+++ b/plug-ins/svg/Makefile.am
@@ -4,7 +4,9 @@ pkglib_LTLIBRARIES = libsvg_filter.la
 
 libsvg_filter_la_SOURCES = svg.c render_svg.c svg-import.c
 
-libsvg_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
+libsvg_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
+
+libsvg_filter_la_LIBADD = $(top_builddir)/lib/libdia.la
 
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
 	$(DEBUG_FLAGS) $(GTK_CFLAGS) $(XML_CFLAGS)
diff --git a/plug-ins/vdx/Makefile.am b/plug-ins/vdx/Makefile.am
index 2c10d08..8d968a2 100644
--- a/plug-ins/vdx/Makefile.am
+++ b/plug-ins/vdx/Makefile.am
@@ -11,6 +11,8 @@ libvdx_filter_la_SOURCES = \
 	vdx-xml.c \
 	vdx.h
 
-libvdx_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
+libvdx_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
+
+libvdx_filter_la_LIBADD = $(top_builddir)/lib/libdia.la
 
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(XML_CFLAGS) $(UNICODE_CFLAGS) $(DEBUG_FLAGS)
diff --git a/plug-ins/wmf/Makefile.am b/plug-ins/wmf/Makefile.am
index cb4f682..71b48da 100644
--- a/plug-ins/wmf/Makefile.am
+++ b/plug-ins/wmf/Makefile.am
@@ -1,7 +1,7 @@
-plugin_sources = wmf.cpp 
+plugin_sources = wmf.cpp
 
 if !WITH_LIBEMF
-plugin_sources += wmf_gdi.cpp wmf_gdi.h
+plugin_sources += wmf_gdi.cpp wmf_gdi.h paginate_gdiprint.cpp paginate_gdiprint.h
 endif
 
 # Can't do without C++
@@ -10,8 +10,11 @@ pkglib_LTLIBRARIES = libwmf_filter.la
 endif
 
 libwmf_filter_la_SOURCES = $(plugin_sources)
-libwmf_filter_la_LDFLAGS = -export-dynamic -module -avoid-version 
-libwmf_filter_la_LIBADD = $(LIBEMF_LIBS)
+libwmf_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
+libwmf_filter_la_LIBADD = $(LIBEMF_LIBS)  $(top_builddir)/lib/libdia.la
+if OS_WIN32
+libwmf_filter_la_LIBADD += -lcomdlg32
+endif
 
 INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir)/lib \
   $(DEBUG_FLAGS) $(GTK_CFLAGS) $(LIBEMF_CFLAGS)
diff --git a/plug-ins/wpg/Makefile.am b/plug-ins/wpg/Makefile.am
index 1f919c3..65c17c7 100644
--- a/plug-ins/wpg/Makefile.am
+++ b/plug-ins/wpg/Makefile.am
@@ -1,7 +1,9 @@
 pkglib_LTLIBRARIES = libwpg_filter.la
 
 libwpg_filter_la_SOURCES = wpg.c wpg_defs.h
-libwpg_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
+libwpg_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
+
+libwpg_filter_la_LIBADD = $(top_builddir)/lib/libdia.la
 
 INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir)/lib \
   $(DEBUG_FLAGS) $(GTK_CFLAGS)
diff --git a/plug-ins/xfig/Makefile.am b/plug-ins/xfig/Makefile.am
index 8583975..fa2a3ca 100644
--- a/plug-ins/xfig/Makefile.am
+++ b/plug-ins/xfig/Makefile.am
@@ -9,6 +9,8 @@ libxfig_filter_la_SOURCES = \
 	xfig-common.c \
 	xfig.h
 
-libxfig_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
+libxfig_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
+
+libxfig_filter_la_LIBADD = $(top_builddir)/lib/libdia.la
 
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(XML_CFLAGS) $(UNICODE_CFLAGS) $(DEBUG_FLAGS)
diff --git a/plug-ins/xslt/Makefile.am b/plug-ins/xslt/Makefile.am
index 2630789..a17a357 100644
--- a/plug-ins/xslt/Makefile.am
+++ b/plug-ins/xslt/Makefile.am
@@ -21,9 +21,9 @@ pkglib_LTLIBRARIES = libxslt_filter.la
 
 libxslt_filter_la_SOURCES = $(plugin_sources)
 
-libxslt_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
+libxslt_filter_la_LDFLAGS = -export-dynamic -module -avoid-version $(NO_UNDEFINED)
 
-libxslt_filter_la_LIBADD = $(XSLT_LIBS)
+libxslt_filter_la_LIBADD = $(XSLT_LIBS) $(top_builddir)/lib/libdia.la
 
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(XML_CFLAGS) $(UNICODE_CFLAGS) $(DEBUG_FLAGS) $(XSLT_CFLAGS)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]