--- dia-0.96/lib/Makefile.am.link	2007-03-17 12:20:17 +0300
+++ dia-0.96/lib/Makefile.am	2007-03-17 13:59:03 +0300
@@ -168,6 +168,7 @@ libdia_la_SOURCES =  \
 #		render.c 
 
 libdia_la_LDFLAGS = -avoid-version
+libdia_la_LIBADD = $(GTK_LIBS)
 
 AM_CPPFLAGS = \
 	$(LIBART_CFLAGS) \
--- dia-0.96/plug-ins/cairo/Makefile.am.link	2007-03-17 12:20:43 +0300
+++ dia-0.96/plug-ins/cairo/Makefile.am	2007-03-28 12:14:22 +0400
@@ -9,6 +9,6 @@ libcairo_filter_la_SOURCES = $(plugin_so
 
 libcairo_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
 
-libcairo_filter_la_LIBADD = $(CAIRO_LIBS)
+libcairo_filter_la_LIBADD = $(CAIRO_LIBS) ../../lib/libdia.la
 
 INCLUDES = -I$(srcdir)/../../lib $(GTK_CFLAGS) $(DEBUG_FLAGS) $(CAIRO_CFLAGS)
--- dia-0.96/plug-ins/cgm/Makefile.am.link	2007-03-17 12:20:44 +0300
+++ dia-0.96/plug-ins/cgm/Makefile.am	2007-03-28 12:17:39 +0400
@@ -5,6 +5,7 @@ pkglib_LTLIBRARIES = libcgm_filter.la
 libcgm_filter_la_SOURCES = cgm.c
 
 libcgm_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
+libcgm_filter_la_LIBADD = $(GTK_LIBS) ../../lib/libdia.la
 
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) \
 	$(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
--- dia-0.96/plug-ins/dxf/Makefile.am.link	2007-03-17 12:20:43 +0300
+++ dia-0.96/plug-ins/dxf/Makefile.am	2007-03-28 12:19:01 +0400
@@ -9,6 +9,6 @@ libdxf_filter_la_SOURCES = \
 	autocad_pal.h
 
 libdxf_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
-
+libdxf_filter_la_LIBADD = $(GTK_LIBS) ../../lib/libdia.la
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) \
 	$(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(XML_CFLAGS) $(UNICODE_CFLAGS) 
--- dia-0.96/plug-ins/gprint/Makefile.am.link	2007-03-17 12:20:44 +0300
+++ dia-0.96/plug-ins/gprint/Makefile.am	2007-03-28 12:38:37 +0400
@@ -14,6 +14,6 @@ libgprint_filter_la_SOURCES = $(plugin_s
 
 libgprint_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
 
-libgprint_filter_la_LIBADD = $(GTK_LIBS) $(GNOMEPRINT_LIBS)
+libgprint_filter_la_LIBADD = $(GTK_LIBS) $(GNOMEPRINT_LIBS) ../../lib/libdia.la
 
 INCLUDES = -I$(srcdir)/../../lib $(GTK_CFLAGS) $(DEBUG_FLAGS) $(GNOMEPRINT_CFLAGS)
--- dia-0.96/plug-ins/hpgl/Makefile.am.link	2007-03-17 12:20:43 +0300
+++ dia-0.96/plug-ins/hpgl/Makefile.am	2007-03-28 12:20:45 +0400
@@ -2,6 +2,6 @@ pkglib_LTLIBRARIES = libhpgl_filter.la
 
 libhpgl_filter_la_SOURCES = hpgl.c
 libhpgl_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
-
+libhpgl_filter_la_LIBADD = $(GTK_LIBS) ../../lib/libdia.la
 INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir)/lib \
   $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
--- dia-0.96/plug-ins/metapost/Makefile.am.link	2007-03-17 12:20:43 +0300
+++ dia-0.96/plug-ins/metapost/Makefile.am	2007-03-28 12:21:49 +0400
@@ -8,7 +8,7 @@ libmetapost_filter_la_SOURCES = \
 	render_metapost.h
 
 libmetapost_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
-
+libmetapost_filter_la_LIBADD = $(GTK_LIBS) ../../lib/libdia.la
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib \
  $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(DEBUG_CFLAGS) \
  $(XML_CFLAGS) $(UNICODE_CFLAGS)
--- dia-0.96/plug-ins/pgf/Makefile.am.link	2007-03-17 12:20:44 +0300
+++ dia-0.96/plug-ins/pgf/Makefile.am	2007-03-28 12:23:21 +0400
@@ -8,6 +8,6 @@ libpgf_filter_la_SOURCES = \
 	render_pgf.h
 
 libpgf_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
-
+libpgf_filter_la_LIBADD = $(GTK_LIBS) ../../lib/libdia.la
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) \
 	$(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS) $(DEBUG_CFLAGS)
--- dia-0.96/plug-ins/pixbuf/Makefile.am.link	2007-03-17 12:20:43 +0300
+++ dia-0.96/plug-ins/pixbuf/Makefile.am	2007-03-28 12:24:24 +0400
@@ -6,5 +6,5 @@ libpixbuf_filter_la_SOURCES = \
 	pixbuf.c
 
 libpixbuf_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
-
+libpixbuf_filter_la_LIBADD = $(GTK_LIBS) ../../lib/libdia.la
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(DEBUG_FLAGS)
--- dia-0.96/plug-ins/pstricks/Makefile.am.link	2007-03-28 12:25:05 +0400
+++ dia-0.96/plug-ins/pstricks/Makefile.am	2007-03-28 12:24:44 +0400
@@ -8,6 +8,6 @@ libpstricks_filter_la_SOURCES = \
 	render_pstricks.h
 
 libpstricks_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
-
+libpstricks_filter_la_LIBADD = $(GTK_LIBS) ../../lib/libdia.la
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) \
 	$(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS) $(DEBUG_CFLAGS)
--- dia-0.96/plug-ins/python/Makefile.am.link	2007-03-22 11:13:09 +0300
+++ dia-0.96/plug-ins/python/Makefile.am	2007-03-28 12:27:33 +0400
@@ -15,7 +15,7 @@ endif
 pkglib_LTLIBRARIES = $(libpython_plugin)
 
 libpython_plugin_la_LDFLAGS = -export-dynamic -module -avoid-version
-libpython_plugin_la_LIBADD = $(PYTHON_LIBS)
+libpython_plugin_la_LIBADD = $(PYTHON_LIBS) $(GTK_LIBS) ../../lib/libdia.la
 libpython_plugin_la_SOURCES = \
 	pydia-color.c \
 	pydia-color.h \
--- dia-0.96/plug-ins/shape/Makefile.am.link	2007-03-28 12:28:56 +0400
+++ dia-0.96/plug-ins/shape/Makefile.am	2007-03-28 12:29:13 +0400
@@ -7,7 +7,7 @@ libshape_filter_la_SOURCES = \
 	shape-export.c
 
 libshape_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
-
+libshape_filter_la_LIBADD = $(GTK_LIBS) ../../lib/libdia.la
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) \
 	$(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS) $(XML_CFLAGS) \
 	$(DEBUG_CFLAGS)
--- dia-0.96/plug-ins/svg/Makefile.am.link	2007-03-17 12:20:43 +0300
+++ dia-0.96/plug-ins/svg/Makefile.am	2007-03-28 12:30:46 +0400
@@ -5,5 +5,5 @@ 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_LIBADD = $(GTK_LIBS) ../../lib/libdia.la
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS) $(XML_CFLAGS) $(DEBUG_CFLAGS)
--- dia-0.96/plug-ins/vdx/Makefile.am.link	2007-03-17 12:20:44 +0300
+++ dia-0.96/plug-ins/vdx/Makefile.am	2007-03-28 12:32:20 +0400
@@ -12,5 +12,5 @@ libvdx_filter_la_SOURCES = \
 	vdx.h
 
 libvdx_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
-
+libvdx_filter_la_LIBADD = $(GTK_LIBS) ../../lib/libdia.la
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(XML_CFLAGS) $(UNICODE_CFLAGS) $(DEBUG_FLAGS)
--- dia-0.96/plug-ins/wmf/Makefile.am.link	2007-03-17 12:20:43 +0300
+++ dia-0.96/plug-ins/wmf/Makefile.am	2007-03-28 12:33:02 +0400
@@ -3,7 +3,7 @@ pkglib_LTLIBRARIES = libwmf_filter.la
 
 libwmf_filter_la_SOURCES = $(plugin_sources)
 libwmf_filter_la_LDFLAGS = -export-dynamic -module -avoid-version 
-libwmf_filter_la_LIBADD = -lstdc++
+libwmf_filter_la_LIBADD = -lstdc++ $(GTK_LIBS) ../../lib/libdia.la
 
 INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir)/lib \
   $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS) \
--- dia-0.96/plug-ins/wpg/Makefile.am.link	2007-03-28 12:37:17 +0400
+++ dia-0.96/plug-ins/wpg/Makefile.am	2007-03-28 12:37:29 +0400
@@ -2,7 +2,7 @@ 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_LIBADD = $(GTK_LIBS) ../../lib/libdia.la
 INCLUDES = -I$(top_srcdir)/intl -I$(top_srcdir)/lib \
   $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS) \
   $(DEBUG_CFLAGS)
--- dia-0.96/plug-ins/xfig/Makefile.am.link	2007-03-17 12:20:43 +0300
+++ dia-0.96/plug-ins/xfig/Makefile.am	2007-03-28 12:34:32 +0400
@@ -10,5 +10,5 @@ libxfig_filter_la_SOURCES = \
 	xfig.h
 
 libxfig_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
-
+libxfig_filter_la_LIBADD = $(GTK_LIBS) ../../lib/libdia.la
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(XML_CFLAGS) $(UNICODE_CFLAGS) $(DEBUG_FLAGS)
--- dia-0.96/plug-ins/xslt/Makefile.am.link	2007-03-17 12:20:43 +0300
+++ dia-0.96/plug-ins/xslt/Makefile.am	2007-03-28 12:35:01 +0400
@@ -23,6 +23,6 @@ libxslt_filter_la_SOURCES = $(plugin_sou
 
 libxslt_filter_la_LDFLAGS = -export-dynamic -module -avoid-version
 
-libxslt_filter_la_LIBADD = $(XSLT_LIBS)
+libxslt_filter_la_LIBADD = $(XSLT_LIBS) $(GTK_LIBS) ../../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)
--- dia-0.96/objects/AADL/Makefile.am.link	2007-03-17 12:20:11 +0300
+++ dia-0.96/objects/AADL/Makefile.am	2007-03-28 15:12:15 +0400
@@ -22,7 +22,7 @@ libaadl_objects_la_SOURCES = \
                              edit_port_declaration.c 
 
 libaadl_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
-
+libaadl_objects_la_LIBADD = $(GTK_LIBS) ../../lib/libdia.la
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
 EXTRA_DIST =   pixmaps/aadlbus.xpm                \
--- dia-0.96/objects/ER/Makefile.am.link	2007-03-17 12:20:11 +0300
+++ dia-0.96/objects/ER/Makefile.am	2007-03-28 15:13:02 +0400
@@ -9,7 +9,7 @@ liber_objects_la_SOURCES = \
 			er.c
 
 liber_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
-
+liber_objects_la_LIBADD = $(GTK_LIBS) ../../lib/libdia.la
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
 EXTRA_DIST = \
--- dia-0.96/objects/FS/Makefile.am.link	2007-03-17 12:20:11 +0300
+++ dia-0.96/objects/FS/Makefile.am	2007-03-28 15:13:21 +0400
@@ -8,7 +8,7 @@ libfs_objects_la_SOURCES = \
 			function.c
 
 libfs_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
-
+libfs_objects_la_LIBADD = $(GTK_LIBS) ../../lib/libdia.la
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
 EXTRA_DIST = \
--- dia-0.96/objects/GRAFCET/Makefile.am.link	2007-03-17 12:20:11 +0300
+++ dia-0.96/objects/GRAFCET/Makefile.am	2007-03-28 15:13:54 +0400
@@ -16,7 +16,7 @@ libgrafcet_objects_la_SOURCES = \
 			vector.c
 
 libgrafcet_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
-
+libgrafcet_objects_la_LIBADD = $(GTK_LIBS) ../../lib/libdia.la
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS) $(XML_CFLAGS)
 
 EXTRA_DIST = \
--- dia-0.96/objects/Istar/Makefile.am.link	2007-03-17 12:20:09 +0300
+++ dia-0.96/objects/Istar/Makefile.am	2007-03-28 15:14:15 +0400
@@ -10,7 +10,7 @@ libistar_objects_la_SOURCES = \
 			link.c
 
 libistar_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
-
+libistar_objects_la_LIBADD = $(GTK_LIBS) ../../lib/libdia.la
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(FREETYPE_CFLAGS) $(UNICODE_CFLAGS)
 
 EXTRA_DIST = \
--- dia-0.96/objects/Jackson/Makefile.am.link	2007-03-17 12:20:09 +0300
+++ dia-0.96/objects/Jackson/Makefile.am	2007-03-28 15:14:37 +0400
@@ -9,7 +9,7 @@ libjackson_objects_la_SOURCES = \
 			phenomenon.c
 
 libjackson_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
-
+libjackson_objects_la_LIBADD = $(GTK_LIBS) ../../lib/libdia.la
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(FREETYPE_CFLAGS) $(UNICODE_CFLAGS)
 
 EXTRA_DIST = \
--- dia-0.96/objects/KAOS/Makefile.am.link	2007-03-17 12:20:10 +0300
+++ dia-0.96/objects/KAOS/Makefile.am	2007-03-28 15:14:57 +0400
@@ -10,7 +10,7 @@ libkaos_objects_la_SOURCES = \
 			metaandorrel.c
 
 libkaos_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
-
+libkaos_objects_la_LIBADD = $(GTK_LIBS) ../../lib/libdia.la
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(FREETYPE_CFLAGS) $(UNICODE_CFLAGS)
 
 EXTRA_DIST = \
--- dia-0.96/objects/Misc/Makefile.am.link	2007-03-17 12:20:09 +0300
+++ dia-0.96/objects/Misc/Makefile.am	2007-03-28 15:15:18 +0400
@@ -7,7 +7,7 @@ libmisc_objects_la_SOURCES = \
 
 
 libmisc_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
-
+libmisc_objects_la_LIBADD = $(GTK_LIBS) ../../lib/libdia.la
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
 EXTRA_DIST = \
--- dia-0.96/objects/SADT/Makefile.am.link	2007-03-17 12:20:09 +0300
+++ dia-0.96/objects/SADT/Makefile.am	2007-03-28 15:15:37 +0400
@@ -9,7 +9,7 @@ libsadt_objects_la_SOURCES = \
 			annotation.c 
 
 libsadt_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
-
+libsadt_objects_la_LIBADD = $(GTK_LIBS) ../../lib/libdia.la
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
 EXTRA_DIST = \
--- dia-0.96/objects/UML/Makefile.am.link	2007-03-17 12:20:10 +0300
+++ dia-0.96/objects/UML/Makefile.am	2007-03-28 15:15:57 +0400
@@ -39,7 +39,7 @@ libuml_objects_la_SOURCES = \
 			umlformalparameter.c
 
 libuml_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
-
+libuml_objects_la_LIBADD = $(GTK_LIBS) ../../lib/libdia.la
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
 EXTRA_DIST = \
--- dia-0.96/objects/bondgraph/Makefile.am.link	2007-03-17 12:20:11 +0300
+++ dia-0.96/objects/bondgraph/Makefile.am	2007-03-28 15:16:23 +0400
@@ -5,6 +5,6 @@ libbondgraph_objects_la_SOURCES = \
 			bondgraph.c
 
 libbondgraph_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
-
+libbondgraph_objects_la_LIBADD = $(GTK_LIBS) ../../lib/libdia.la
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) \
 	$(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
--- dia-0.96/objects/chronogram/Makefile.am.link	2007-03-17 12:20:10 +0300
+++ dia-0.96/objects/chronogram/Makefile.am	2007-03-28 15:16:48 +0400
@@ -11,7 +11,7 @@ libchronogram_objects_la_SOURCES = \
 
 
 libchronogram_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
-
+libchronogram_objects_la_LIBADD = $(GTK_LIBS) ../../lib/libdia.la
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
 EXTRA_DIST = \
--- dia-0.96/objects/custom/Makefile.am.link	2007-03-17 12:20:11 +0300
+++ dia-0.96/objects/custom/Makefile.am	2007-03-28 15:17:10 +0400
@@ -11,7 +11,7 @@ libcustom_objects_la_SOURCES = \
 	custom.c
 
 libcustom_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
-
+libcustom_objects_la_LIBADD = $(GTK_LIBS) ../../lib/libdia.la
 shapedir = $(pkgdatadir)/shapes
 
 # add -DDEBUG_CUSTOM here to get extra debugging info.
--- dia-0.96/objects/flowchart/Makefile.am.link	2007-03-17 12:20:09 +0300
+++ dia-0.96/objects/flowchart/Makefile.am	2007-03-28 15:17:31 +0400
@@ -9,7 +9,7 @@ libflowchart_objects_la_SOURCES = \
 			flowchart.c
 
 libflowchart_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
-
+libflowchart_objects_la_LIBADD = $(GTK_LIBS) ../../lib/libdia.la
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) \
 	$(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
--- dia-0.96/objects/network/Makefile.am.link	2007-03-17 12:20:09 +0300
+++ dia-0.96/objects/network/Makefile.am	2007-03-28 15:17:52 +0400
@@ -10,7 +10,7 @@ libnetwork_objects_la_SOURCES = \
 			      wanlink.c 
 
 libnetwork_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
-
+libnetwork_objects_la_LIBADD = $(GTK_LIBS) ../../lib/libdia.la
 INCLUDES = -I$(top_srcdir)/intl -I$(srcdir)/../../lib $(GTK_CFLAGS) $(GNOME_CFLAGS) $(PANGOFT2_CFLAGS) $(UNICODE_CFLAGS)
 
 EXTRA_DIST = \
--- dia-0.96/objects/standard/Makefile.am.link	2007-03-17 12:20:10 +0300
+++ dia-0.96/objects/standard/Makefile.am	2007-03-28 15:18:21 +0400
@@ -15,7 +15,7 @@ libstandard_objects_la_SOURCES = 	arc.c 
 			tool-icons.h
 
 libstandard_objects_la_LDFLAGS = -export-dynamic -module -avoid-version
-
+libstandard_objects_la_LIBADD = $(GTK_LIBS) ../../lib/libdia.la
 ICON_PNG_PAIRS= \
 	arc_icon $(srcdir)/pixmaps/arc.png \
 	beziergon_icon $(srcdir)/pixmaps/beziergon.png \