diff options
Diffstat (limited to 'widgets')
| -rw-r--r-- | widgets/ChangeLog | 11 | ||||
| -rw-r--r-- | widgets/e-timezone-dialog/Makefile.am | 1 | ||||
| -rw-r--r-- | widgets/misc/Makefile.am | 53 |
3 files changed, 44 insertions, 21 deletions
diff --git a/widgets/ChangeLog b/widgets/ChangeLog index bf51ead15c..80ffca1cf9 100644 --- a/widgets/ChangeLog +++ b/widgets/ChangeLog @@ -1,3 +1,14 @@ +2002-07-09 Peter Williams <peterw@ximian.com> + + * e-timezone-dialog/Makefile.am: Add -I$(top_builddir)/libical/src/libical; + some headers that we rely on get installed, so they point to the ical.h that + gets generated and installed; consequently we need to be able to find the + generated ical.h + + * misc/Makefile.am: Install libemiscwidgets.a and its headers. However, + break EFilterBar into a separate libefilterbar.a because we don't want + the installed library to depend on libfilter. + 2002-07-05 Ettore Perazzoli <ettore@ximian.com> * e-timezone-dialog/e-timezone-dialog.c (e_timezone_dialog_init): diff --git a/widgets/e-timezone-dialog/Makefile.am b/widgets/e-timezone-dialog/Makefile.am index 3c8c46fd07..b308e424e3 100644 --- a/widgets/e-timezone-dialog/Makefile.am +++ b/widgets/e-timezone-dialog/Makefile.am @@ -1,6 +1,7 @@ INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/libical/src/libical \ + -I$(top_builddir)/libical/src/libical \ -DMAP_DIR=\""$(datadir)/images/evolution"\" \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DG_LOG_DOMAIN=__FILE__ \ diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am index 0b274552ff..3e71f36498 100644 --- a/widgets/misc/Makefile.am +++ b/widgets/misc/Makefile.am @@ -9,47 +9,58 @@ INCLUDES = \ -DG_LOG_DOMAIN=__FILE__ \ $(GNOME_FULL_CFLAGS) -noinst_LIBRARIES = \ +privlib_LIBRARIES = \ libemiscwidgets.a -libemiscwidgets_a_SOURCES = \ - e-bonobo-widget.c \ +widgetsincludedir = $(includedir)/evolution/widgets + +widgetsinclude_HEADERS = \ e-bonobo-widget.h \ - e-calendar.c \ e-calendar.h \ - e-calendar-item.c \ e-calendar-item.h \ - e-cell-date-edit.c \ e-cell-date-edit.h \ - e-cell-percent.c \ e-cell-percent.h \ - e-charset-picker.c \ e-charset-picker.h \ - e-clipped-label.c \ e-clipped-label.h \ - e-config-page.c \ e-config-page.h \ - e-combo-button.c \ e-combo-button.h \ - e-dateedit.c \ e-dateedit.h \ - e-dropdown-button.c \ e-dropdown-button.h \ - e-filter-bar.c \ - e-filter-bar.h \ - e-map.c \ e-map.h \ - e-messagebox.c \ e-messagebox.h \ - e-multi-config-dialog.c \ e-multi-config-dialog.h \ - e-search-bar.c \ e-search-bar.h \ - e-title-bar.c \ e-title-bar.h \ - e-url-entry.c \ e-url-entry.h +libemiscwidgets_a_SOURCES = \ + $(widgetsinclude_HEADERS) \ + e-bonobo-widget.c \ + e-calendar.c \ + e-calendar-item.c \ + e-cell-date-edit.c \ + e-cell-percent.c \ + e-charset-picker.c \ + e-clipped-label.c \ + e-config-page.c \ + e-combo-button.c \ + e-dateedit.c \ + e-dropdown-button.c \ + e-map.c \ + e-messagebox.c \ + e-multi-config-dialog.c \ + e-search-bar.c \ + e-title-bar.c \ + e-url-entry.c + +libemiscwidgets_a_LIBADD = $(top_builddir)/e-util/libeutil.la + +noinst_LIBRARIES = libefilterbar.a + +libefilterbar_a_SOURCES = \ + e-filter-bar.c \ + e-filter-bar.h + noinst_PROGRAMS = \ test-calendar \ test-dateedit \ |