callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make source selector flags/libs

Browse Source 
2003-11-14  JP Rosevear <jpr@ximian.com>

	* configure.in: make source selector flags/libs

svn path=/trunk/; revision=23366
This commit is contained in:
JP Rosevear
2003-11-14 22:27:34 +00:00
committed by JP Rosevear
parent c9d5c9e425
commit c02fe8b8c2
5 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2003-11-14 JP Rosevear <jpr@ximian.com>
* configure.in: make source selector flags/libs
2003-11-14 JP Rosevear <jpr@ximian.com> 2003-11-14 JP Rosevear <jpr@ximian.com>
* MAINTAINERS: Update * MAINTAINERS: Update

13
configure.in
View File

@ -1115,10 +1115,6 @@ CPPFLAGS="$CPPFLAGS_save"
dnl --- Flags for the various libraries we build 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, 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_CFLAGS $KRB4_CFLAGS $KRB5_CFLAGS $MANUAL_NSS_CFLAGS $OPENSSL_CFLAGS,
$THREADS_LIBS $KRB4_LDFLAGS $KRB5_LDFLAGS $MANUAL_NSS_LIBS $OPENSSL_LDFLAGS) $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_CFLAGS)
AC_SUBST(E_UTIL_LIBS) 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
dnl EVO_SET_COMPILE_FLAGS(E_WIDGETS, bonobo_conf bonobox_print gdk_pixbuf gnomecanvaspixbuf gnomeui libglade oaf vfs) dnl EVO_SET_COMPILE_FLAGS(E_WIDGETS, bonobo_conf bonobox_print gdk_pixbuf gnomecanvaspixbuf gnomeui libglade oaf vfs)
dnl AC_SUBST(E_WIDGETS_CFLAGS) dnl AC_SUBST(E_WIDGETS_CFLAGS)

6
widgets/misc/ChangeLog
View File

@ -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> 2003-11-13 Bolian Yin <bolian.yin@sun.com>
* e-calendar-item.c: remove a declaration of a deleted func. * e-calendar-item.c: remove a declaration of a deleted func.

7
widgets/misc/Makefile.am
View File

@ -8,7 +8,7 @@ INCLUDES = \
-DMAP_DIR=\""$(imagesdir)"\" \ -DMAP_DIR=\""$(imagesdir)"\" \
-DG_LOG_DOMAIN=__FILE__ \ -DG_LOG_DOMAIN=__FILE__ \
-DG_DISABLE_DEPRECATED \ -DG_DISABLE_DEPRECATED \
$(GNOME_FULL_CFLAGS) $(SOURCE_SEL_CFLAGS)
privlib_LTLIBRARIES = \ privlib_LTLIBRARIES = \
libemiscwidgets.la libemiscwidgets.la
@ -61,7 +61,8 @@ MARSHAL_GENERATED = e-util-marshal.c e-util-marshal.h
@EVO_MARSHAL_RULE@ @EVO_MARSHAL_RULE@
libemiscwidgets_la_LIBADD = $(top_builddir)/e-util/libeutil.la \ 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 noinst_LTLIBRARIES = libefilterbar.la
@ -133,7 +134,7 @@ test_source_selector_SOURCES = \
test_source_selector_LDADD = \ test_source_selector_LDADD = \
../../e-util/libeutil.la \ ../../e-util/libeutil.la \
./libemiscwidgets.la \ ./libemiscwidgets.la \
$(GNOME_FULL_LIBS) $(SOURCE_SEL_LIBS)
BUILT_SOURCES = $(MARSHAL_GENERATED) BUILT_SOURCES = $(MARSHAL_GENERATED)

4
widgets/misc/e-source-selector.h
View File

@ -24,11 +24,9 @@
#ifndef _E_SOURCE_SELECTOR_H_ #ifndef _E_SOURCE_SELECTOR_H_
#define _E_SOURCE_SELECTOR_H_ #define _E_SOURCE_SELECTOR_H_
#include "e-util/e-source-list.h"
#include <gtk/gtkmenu.h> #include <gtk/gtkmenu.h>
#include <gtk/gtktreeview.h> #include <gtk/gtktreeview.h>
#include <libedataserver/e-source-list.h>
#define E_TYPE_SOURCE_SELECTOR (e_source_selector_get_type ()) #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)) #define E_SOURCE_SELECTOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_SOURCE_SELECTOR, ESourceSelector))