diff options
Diffstat (limited to 'widgets')
| -rw-r--r-- | widgets/ChangeLog | 8 | ||||
| -rw-r--r-- | widgets/Makefile.am | 2 | ||||
| -rw-r--r-- | widgets/e-timezone-dialog/Makefile.am | 10 |
3 files changed, 12 insertions, 8 deletions
diff --git a/widgets/ChangeLog b/widgets/ChangeLog index 6d3ef0a618..5d3f295045 100644 --- a/widgets/ChangeLog +++ b/widgets/ChangeLog @@ -1,3 +1,11 @@ +2007-08-24 Matthew Barnes <mbarnes@redhat.com> + + ** Fixes part of bug #411619 + + * Makefile.am: Fix subdirectory order. + + * e-timezone-dialog/Makefile.am: Remove WIN32_BOOTSTRAP_LIBS. + 2007-08-23 Matthew Barnes <mbarnes@redhat.com> ** Fixes bug #309166 diff --git a/widgets/Makefile.am b/widgets/Makefile.am index 8be8fa19bf..3eb5ea06f7 100644 --- a/widgets/Makefile.am +++ b/widgets/Makefile.am @@ -1,9 +1,9 @@ SUBDIRS = \ - e-timezone-dialog \ table \ text \ misc \ + e-timezone-dialog \ menus EXTRA_DIST = \ diff --git a/widgets/e-timezone-dialog/Makefile.am b/widgets/e-timezone-dialog/Makefile.am index cfddbeb914..4dcb2f014c 100644 --- a/widgets/e-timezone-dialog/Makefile.am +++ b/widgets/e-timezone-dialog/Makefile.am @@ -1,7 +1,3 @@ -if OS_WIN32 -WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libemiscwidgets.la -endif - INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ @@ -18,9 +14,9 @@ libetimezonedialog_la_SOURCES = \ libetimezonedialog_la_LDFLAGS = $(NO_UNDEFINED) -libetimezonedialog_la_LIBADD = \ - $(WIN32_BOOTSTRAP_LIBS) \ - $(top_builddir)/e-util/libeutil.la \ +libetimezonedialog_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(EVOLUTION_CALENDAR_LIBS) glade_DATA = e-timezone-dialog.glade |