diff options
Diffstat (limited to 'widgets')
| -rw-r--r-- | widgets/ChangeLog | 7 | ||||
| -rw-r--r-- | widgets/e-timezone-dialog/Makefile.am | 12 |
2 files changed, 18 insertions, 1 deletions
diff --git a/widgets/ChangeLog b/widgets/ChangeLog index 8baa8229be..e323b7a528 100644 --- a/widgets/ChangeLog +++ b/widgets/ChangeLog @@ -1,3 +1,10 @@ +2005-09-28 Tor Lillqvist <tml@novell.com> + + * e-timezone-dialog/Makefile.am: On Win32, use bootstrp import + library for libemiscwidgets, which hasn't been built yet when we + come here. Install in privsolib instead of privlib (no difference + on Unix). Use NO_UNDEFINED. Link with EVOLUTION_CALENDAR_LIBS. + 2005-08-03 Li Yuan <li.yuan@sun.com> * menus/gal-view-new-dialog.glade: diff --git a/widgets/e-timezone-dialog/Makefile.am b/widgets/e-timezone-dialog/Makefile.am index 8862d05060..64b30b3c7c 100644 --- a/widgets/e-timezone-dialog/Makefile.am +++ b/widgets/e-timezone-dialog/Makefile.am @@ -1,3 +1,7 @@ +if OS_WIN32 +WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libemiscwidgets.la +endif + INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ @@ -5,13 +9,19 @@ INCLUDES = \ -DG_LOG_DOMAIN=__FILE__ \ $(TZDIALOG_CFLAGS) -privlib_LTLIBRARIES = \ +privsolib_LTLIBRARIES = \ libetimezonedialog.la libetimezonedialog_la_SOURCES = \ e-timezone-dialog.c \ e-timezone-dialog.h +libetimezonedialog_la_LDFLAGS = $(NO_UNDEFINED) + +libetimezonedialog_la_LIBADD = \ + $(WIN32_BOOTSTRAP_LIBS) \ + $(EVOLUTION_CALENDAR_LIBS) + glade_DATA = e-timezone-dialog.glade EXTRA_DIST = $(glade_DATA) |