diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 13 | ||||
| -rw-r--r-- | widgets/misc/ChangeLog | 6 | ||||
| -rw-r--r-- | widgets/misc/Makefile.am | 7 | ||||
| -rw-r--r-- | widgets/misc/e-source-selector.h | 4 |
5 files changed, 24 insertions, 10 deletions
@@ -1,5 +1,9 @@ 2003-11-14 JP Rosevear <jpr@ximian.com> + * configure.in: make source selector flags/libs + +2003-11-14 JP Rosevear <jpr@ximian.com> + * MAINTAINERS: Update 2003-11-11 Chris Toshok <toshok@ximian.com> diff --git a/configure.in b/configure.in index 7b64db1d98..f4e7101ea7 100644 --- a/configure.in +++ b/configure.in @@ -1115,10 +1115,6 @@ CPPFLAGS="$CPPFLAGS_save" dnl --- Flags for the various libraries we build -EVO_SET_COMPILE_FLAGS(TZDIALOG, libecal-1.0, $GNOME_FULL_CFLAGS, $GNOME_FULL_LIBS) -AC_SUBST(TZDIALOG_CFLAGS) -AC_SUBST(TZDIALOG_LIBS) - EVO_SET_COMPILE_FLAGS(CAMEL, glib-2.0 gthread-2.0 gal-2.2 >= $GAL_REQUIRED $mozilla_nss, $THREADS_CFLAGS $KRB4_CFLAGS $KRB5_CFLAGS $MANUAL_NSS_CFLAGS $OPENSSL_CFLAGS, $THREADS_LIBS $KRB4_LDFLAGS $KRB5_LDFLAGS $MANUAL_NSS_LIBS $OPENSSL_LDFLAGS) @@ -1148,6 +1144,15 @@ EVO_SET_COMPILE_FLAGS(E_UTIL, gthread-2.0 gconf-2.0 libxml-2.0 libbonoboui-2.0 l AC_SUBST(E_UTIL_CFLAGS) AC_SUBST(E_UTIL_LIBS) +EVO_SET_COMPILE_FLAGS(TZDIALOG, libecal-1.0, $GNOME_FULL_CFLAGS, $GNOME_FULL_LIBS) +AC_SUBST(TZDIALOG_CFLAGS) +AC_SUBST(TZDIALOG_LIBS) + +EVO_SET_COMPILE_FLAGS(SOURCE_SEL, libedataserver-1.0, $GNOME_FULL_CFLAGS, $GNOME_FULL_LIBS) +AC_SUBST(SOURCE_SEL_CFLAGS) +AC_SUBST(SOURCE_SEL_LIBS) + + dnl dnl EVO_SET_COMPILE_FLAGS(E_WIDGETS, bonobo_conf bonobox_print gdk_pixbuf gnomecanvaspixbuf gnomeui libglade oaf vfs) dnl AC_SUBST(E_WIDGETS_CFLAGS) diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog index 6bf5eb11a1..c9721e031e 100644 --- a/widgets/misc/ChangeLog +++ b/widgets/misc/ChangeLog @@ -1,3 +1,9 @@ +2003-11-14 JP Rosevear <jpr@ximian.com> + + * e-source-selector.h: include e-source stuff from e-d-s + + * Makefile.am: use new cflags/libs to build + 2003-11-13 Bolian Yin <bolian.yin@sun.com> * e-calendar-item.c: remove a declaration of a deleted func. diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am index f600183ae9..587962f220 100644 --- a/widgets/misc/Makefile.am +++ b/widgets/misc/Makefile.am @@ -8,7 +8,7 @@ INCLUDES = \ -DMAP_DIR=\""$(imagesdir)"\" \ -DG_LOG_DOMAIN=__FILE__ \ -DG_DISABLE_DEPRECATED \ - $(GNOME_FULL_CFLAGS) + $(SOURCE_SEL_CFLAGS) privlib_LTLIBRARIES = \ libemiscwidgets.la @@ -61,7 +61,8 @@ MARSHAL_GENERATED = e-util-marshal.c e-util-marshal.h @EVO_MARSHAL_RULE@ libemiscwidgets_la_LIBADD = $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/a11y/widgets/libevolution-widgets-a11y.la + $(top_builddir)/a11y/widgets/libevolution-widgets-a11y.la \ + $(SOURCE_SEL_LIBS) noinst_LTLIBRARIES = libefilterbar.la @@ -133,7 +134,7 @@ test_source_selector_SOURCES = \ test_source_selector_LDADD = \ ../../e-util/libeutil.la \ ./libemiscwidgets.la \ - $(GNOME_FULL_LIBS) + $(SOURCE_SEL_LIBS) BUILT_SOURCES = $(MARSHAL_GENERATED) diff --git a/widgets/misc/e-source-selector.h b/widgets/misc/e-source-selector.h index 3880d86ac5..8d3540866d 100644 --- a/widgets/misc/e-source-selector.h +++ b/widgets/misc/e-source-selector.h @@ -24,11 +24,9 @@ #ifndef _E_SOURCE_SELECTOR_H_ #define _E_SOURCE_SELECTOR_H_ -#include "e-util/e-source-list.h" - #include <gtk/gtkmenu.h> #include <gtk/gtktreeview.h> - +#include <libedataserver/e-source-list.h> #define E_TYPE_SOURCE_SELECTOR (e_source_selector_get_type ()) #define E_SOURCE_SELECTOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_SOURCE_SELECTOR, ESourceSelector)) |