diff options
Diffstat (limited to 'widgets')
| -rw-r--r-- | widgets/ChangeLog | 12 | ||||
| -rw-r--r-- | widgets/menus/Makefile.am | 16 |
2 files changed, 19 insertions, 9 deletions
diff --git a/widgets/ChangeLog b/widgets/ChangeLog index e323b7a528..1571f45c55 100644 --- a/widgets/ChangeLog +++ b/widgets/ChangeLog @@ -1,9 +1,15 @@ 2005-09-28 Tor Lillqvist <tml@novell.com> - * e-timezone-dialog/Makefile.am: On Win32, use bootstrp import + * e-timezone-dialog/Makefile.am + * menus/Makefile.am: Install in privsolib instead of privlib (no + difference on Unix). Use NO_UNDEFINED. + + * e-timezone-dialog/Makefile.am: On Win32, use bootstrap 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. + come here. Link with EVOLUTION_CALENDAR_LIBS. + + * menus/Makefile.am: Drop several overlapping CFLAGS, use + E_UTIL_CFLAGS instead. Link with necessary libraries. 2005-08-03 Li Yuan <li.yuan@sun.com> diff --git a/widgets/menus/Makefile.am b/widgets/menus/Makefile.am index 459eb25afe..b311296db7 100644 --- a/widgets/menus/Makefile.am +++ b/widgets/menus/Makefile.am @@ -1,15 +1,11 @@ -privlib_LTLIBRARIES = libmenus.la +privsolib_LTLIBRARIES = libmenus.la INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ - -I$(top_srcdir)/widgets/menus \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DG_LOG_DOMAIN=\"menus\" \ - $(EXTRA_GNOME_CFLAGS) \ - $(GNOME_INCLUDEDIR) \ - $(ICONV_CFLAGS) \ - $(GNOME_FULL_CFLAGS) + $(E_UTIL_CFLAGS) libmenus_la_SOURCES = \ gal-view-menus.c \ @@ -44,6 +40,14 @@ libmenusinclude_HEADERS = \ gal-view-new-dialog.h \ gal-view.h +libmenus_la_LDFLAGS = $(NO_UNDEFINED) + +libmenus_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/widgets/table/libetable.la \ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(E_UTIL_LIBS) + icons = EXTRA_DIST = \ $(icons) \ |