diff options
| -rw-r--r-- | widgets/table/ChangeLog | 7 | ||||
| -rw-r--r-- | widgets/table/Makefile.am | 22 |
2 files changed, 24 insertions, 5 deletions
diff --git a/widgets/table/ChangeLog b/widgets/table/ChangeLog index b263df9c61..862f334bb5 100644 --- a/widgets/table/ChangeLog +++ b/widgets/table/ChangeLog @@ -1,3 +1,10 @@ +2005-12-17 Tor Lillqvist <tml@novell.com> + + * Makefile.am: Link with bootstrap libs on Win32. Use + E_WIDGETS_CFLAGS instead of GNOME_BONOBO_CFLAGS, GNOME_INCLUDEDIR, + ICONV_CFLAGS and GNOME_FULL_CFLAGS. Link with all required + libraries. Use -no-undefined on Win32. + 2005-12-09 Harish Krishnaswamy <kharish@novell.com> * e-table-example-2.c (create_table): diff --git a/widgets/table/Makefile.am b/widgets/table/Makefile.am index 943633b2e4..2732ee6c6c 100644 --- a/widgets/table/Makefile.am +++ b/widgets/table/Makefile.am @@ -1,3 +1,9 @@ +if OS_WIN32 +WIN32_BOOTSTRAP_LIBS = \ + $(top_builddir)/win32/libemiscwidgets.la \ + $(top_builddir)/win32/libetext.la +endif + glade_DATA = \ e-table-config.glade \ e-table-config-no-group.glade \ @@ -6,15 +12,12 @@ glade_DATA = \ INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ + $(E_WIDGETS_CFLAGS) \ $(EXTRA_GNOME_CFLAGS) \ - $(GNOME_BONOBO_CFLAGS) \ - $(GNOME_INCLUDEDIR) \ - $(ICONV_CFLAGS) \ - $(GNOME_FULL_CFLAGS) \ -DEVOLUTION_GLADEDIR=\"$(gladedir)\" \ -DG_LOG_DOMAIN=\"e-table\" -privlib_LTLIBRARIES = libetable.la +privsolib_LTLIBRARIES = libetable.la libetable_la_SOURCES = \ e-cell.c \ @@ -143,6 +146,15 @@ libetableinclude_HEADERS = \ e-tree-table-adapter.h \ e-tree.h +libetable_la_LDFLAGS = $(NO_UNDEFINED) + +libetable_la_LIBADD = \ + $(WIN32_BOOTSTRAP_LIBS) \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/a11y/libevolution-a11y.la \ + $(E_WIDGETS_LIBS) \ + $(EXTRA_GNOME_LIBS) + icons = \ add-col.xpm \ arrow-down.xpm \ |