Remove E_BOOK_DISABLE_DEPRECATED and E_CAL_DISABLE_DEPRECATED.

We already use EDS_DISABLE_DEPRECATED, these other definitions only
confuse matters.

diff --git a/addressbook/libebook/e-book-types.h b/addressbook/libebook/e-book-types.h
index f90c9dd..5a5b2d0 100644 (file)
--- a/addressbook/libebook/e-book-types.h
+++ b/addressbook/libebook/e-book-types.h
@@ -87,7 +87,7 @@ typedef enum {
        E_DATA_BOOK_STATUS_NOT_OPENED
 } EDataBookStatus;
 
-#ifndef E_BOOK_DISABLE_DEPRECATED
+#ifndef EDS_DISABLE_DEPRECATED
 #define E_BOOK_ERROR_CORBA_EXCEPTION E_BOOK_ERROR_DBUS_EXCEPTION
 #endif
 

diff --git a/addressbook/libebook/e-book-view-private.h b/addressbook/libebook/e-book-view-private.h
index 2d5e84f..131d738 100644 (file)
--- a/addressbook/libebook/e-book-view-private.h
+++ b/addressbook/libebook/e-book-view-private.h
@@ -19,7 +19,7 @@
  * Author: Ross Burton <ross@linux.intel.com>
  */
 
-#ifndef E_BOOK_DISABLE_DEPRECATED
+#ifndef EDS_DISABLE_DEPRECATED
 
 #ifndef E_BOOK_VIEW_PRIVATE_H
 #define E_BOOK_VIEW_PRIVATE_H
@@ -38,5 +38,5 @@ G_END_DECLS
 
 #endif /* E_BOOK_VIEW_PRIVATE_H */
 
-#endif /* E_BOOK_DISABLE_DEPRECATED */
+#endif /* EDS_DISABLE_DEPRECATED */
 

diff --git a/addressbook/libebook/e-book-view.h b/addressbook/libebook/e-book-view.h
index d866d06..1aa5268 100644 (file)
--- a/addressbook/libebook/e-book-view.h
+++ b/addressbook/libebook/e-book-view.h
@@ -12,7 +12,7 @@
 #error "Only <libebook/libebook.h> should be included directly."
 #endif
 
-#ifndef E_BOOK_DISABLE_DEPRECATED
+#ifndef EDS_DISABLE_DEPRECATED
 
 #ifndef E_BOOK_VIEW_H
 #define E_BOOK_VIEW_H
@@ -87,4 +87,4 @@ G_END_DECLS
 
 #endif /* E_BOOK_VIEW_H */
 
-#endif /* E_BOOK_DISABLE_DEPRECATED */
+#endif /* EDS_DISABLE_DEPRECATED */

diff --git a/addressbook/libebook/e-book.h b/addressbook/libebook/e-book.h
index 7782d25..8c168d0 100644 (file)
--- a/addressbook/libebook/e-book.h
+++ b/addressbook/libebook/e-book.h
@@ -12,12 +12,11 @@
 #error "Only <libebook/libebook.h> should be included directly."
 #endif
 
+#ifndef EDS_DISABLE_DEPRECATED
+
 #ifndef __E_BOOK_H__
 #define __E_BOOK_H__
 
-/* e-book deprecated since 3.2, use e-book-client instead */
-#ifndef E_BOOK_DISABLE_DEPRECATED
-
 #include <libedataserver/libedataserver.h>
 
 #include <libebook/e-contact.h>
@@ -38,9 +37,7 @@ typedef struct _EBook        EBook;
 typedef struct _EBookClass   EBookClass;
 typedef struct _EBookPrivate EBookPrivate;
 
-#ifndef E_BOOK_DISABLE_DEPRECATED
 typedef void (*EBookCallback) (EBook *book, EBookStatus status, gpointer closure);
-#endif
 
 /**
  * EBookAsyncCallback:
@@ -58,13 +55,11 @@ typedef void (*EBookOpenProgressCallback)     (EBook          *book,
                                               const gchar     *status_message,
                                               gshort           percent,
                                               gpointer        closure);
-#ifndef E_BOOK_DISABLE_DEPRECATED
 typedef void (*EBookIdCallback)       (EBook *book, EBookStatus status, const gchar *id, gpointer closure);
 typedef void (*EBookContactCallback)  (EBook *book, EBookStatus status, EContact *contact, gpointer closure);
 typedef void (*EBookListCallback)     (EBook *book, EBookStatus status, GList *list, gpointer closure);
 typedef void (*EBookBookViewCallback) (EBook *book, EBookStatus status, EBookView *book_view, gpointer closure);
 typedef void (*EBookEListCallback)   (EBook *book, EBookStatus status, EList *list, gpointer closure);
-#endif
 
 /**
  * EBookIdAsyncCallback:
@@ -133,12 +128,10 @@ gboolean e_book_open                       (EBook       *book,
                                            gboolean     only_if_exists,
                                            GError     **error);
 
-#ifndef E_BOOK_DISABLE_DEPRECATED
 gboolean    e_book_async_open                 (EBook         *book,
                                            gboolean       only_if_exists,
                                            EBookCallback  open_response,
                                            gpointer       closure);
-#endif
 
 gboolean e_book_open_async                 (EBook              *book,
                                            gboolean            only_if_exists,
@@ -147,11 +140,9 @@ gboolean e_book_open_async                 (EBook              *book,
 
 gboolean e_book_remove                     (EBook       *book,
                                            GError     **error);
-#ifndef E_BOOK_DISABLE_DEPRECATED
 gboolean    e_book_async_remove               (EBook   *book,
                                            EBookCallback cb,
                                            gpointer closure);
-#endif
 
 gboolean e_book_remove_async               (EBook             *book,
                                            EBookAsyncCallback cb,
@@ -161,11 +152,9 @@ gboolean e_book_get_required_fields       (EBook       *book,
                                            GList      **fields,
                                            GError     **error);
 
-#ifndef E_BOOK_DISABLE_DEPRECATED
 gboolean e_book_async_get_required_fields (EBook              *book,
                                            EBookEListCallback  cb,
                                            gpointer            closure);
-#endif
 
 gboolean e_book_get_required_fields_async (EBook                  *book,
                                           EBookEListAsyncCallback cb,
@@ -175,11 +164,9 @@ gboolean e_book_get_supported_fields       (EBook       *book,
                                            GList      **fields,
                                            GError     **error);
 
-#ifndef E_BOOK_DISABLE_DEPRECATED
 gboolean    e_book_async_get_supported_fields (EBook              *book,
                                            EBookEListCallback  cb,
                                            gpointer            closure);
-#endif
 
 gboolean e_book_get_supported_fields_async (EBook                  *book,
                                            EBookEListAsyncCallback cb,
@@ -189,11 +176,9 @@ gboolean e_book_get_supported_auth_methods       (EBook       *book,
                                                  GList      **auth_methods,
                                                  GError     **error);
 
-#ifndef E_BOOK_DISABLE_DEPRECATED
 gboolean    e_book_async_get_supported_auth_methods (EBook              *book,
                                                  EBookEListCallback  cb,
                                                  gpointer            closure);
-#endif
 
 gboolean e_book_get_supported_auth_methods_async (EBook                  *book,
                                                  EBookEListAsyncCallback cb,
@@ -205,12 +190,10 @@ gboolean e_book_get_contact                (EBook       *book,
                                            EContact   **contact,
                                            GError     **error);
 
-#ifndef E_BOOK_DISABLE_DEPRECATED
 gboolean     e_book_async_get_contact         (EBook                 *book,
                                            const gchar            *id,
                                            EBookContactCallback   cb,
                                            gpointer               closure);
-#endif
 
 gboolean  e_book_get_contact_async      (EBook                    *book,
                                         const gchar              *id,
@@ -222,7 +205,6 @@ gboolean e_book_remove_contact             (EBook       *book,
                                            const gchar  *id,
                                            GError     **error);
 
-#ifndef E_BOOK_DISABLE_DEPRECATED
 gboolean    e_book_async_remove_contact       (EBook                 *book,
                                            EContact              *contact,
                                            EBookCallback          cb,
@@ -231,7 +213,6 @@ gboolean    e_book_async_remove_contact_by_id (EBook                 *book,
                                            const gchar           *id,
                                            EBookCallback          cb,
                                            gpointer               closure);
-#endif
 
 gboolean e_book_remove_contact_async        (EBook                *book,
                                            EContact              *contact,
@@ -246,12 +227,10 @@ gboolean e_book_remove_contacts            (EBook       *book,
                                            GList       *ids,
                                            GError     **error);
 
-#ifndef E_BOOK_DISABLE_DEPRECATED
 gboolean    e_book_async_remove_contacts      (EBook                 *book,
                                            GList                 *ids,
                                            EBookCallback          cb,
                                            gpointer               closure);
-#endif
 
 gboolean e_book_remove_contacts_async   (EBook                 *book,
                                         GList                 *ids,
@@ -263,12 +242,10 @@ gboolean e_book_add_contact                (EBook           *book,
                                            EContact        *contact,
                                            GError         **error);
 
-#ifndef E_BOOK_DISABLE_DEPRECATED
 gboolean e_book_async_add_contact          (EBook           *book,
                                            EContact        *contact,
                                            EBookIdCallback  cb,
                                            gpointer         closure);
-#endif
 
 gboolean e_book_add_contact_async       (EBook                 *book,
                                         EContact              *contact,
@@ -280,12 +257,10 @@ gboolean e_book_commit_contact             (EBook       *book,
                                            EContact    *contact,
                                            GError     **error);
 
-#ifndef E_BOOK_DISABLE_DEPRECATED
 gboolean e_book_async_commit_contact          (EBook                 *book,
                                            EContact              *contact,
                                            EBookCallback          cb,
                                            gpointer               closure);
-#endif
 
 gboolean e_book_commit_contact_async    (EBook                 *book,
                                         EContact              *contact,
@@ -300,14 +275,12 @@ gboolean e_book_get_book_view              (EBook       *book,
                                            EBookView  **book_view,
                                            GError     **error);
 
-#ifndef E_BOOK_DISABLE_DEPRECATED
 gboolean e_book_async_get_book_view           (EBook                 *book,
                                            EBookQuery            *query,
                                            GList                 *requested_fields,
                                            gint                    max_results,
                                            EBookBookViewCallback  cb,
                                            gpointer               closure);
-#endif
 
 gboolean e_book_get_book_view_async     (EBook                     *book,
                                         EBookQuery                *query,
@@ -322,12 +295,10 @@ gboolean e_book_get_contacts               (EBook       *book,
                                            GList      **contacts,
                                            GError     **error);
 
-#ifndef E_BOOK_DISABLE_DEPRECATED
 gboolean     e_book_async_get_contacts        (EBook             *book,
                                            EBookQuery        *query,
                                            EBookListCallback  cb,
                                            gpointer           closure);
-#endif
 
 gboolean  e_book_get_contacts_async     (EBook                 *book,
                                         EBookQuery            *query,
@@ -340,12 +311,10 @@ gboolean e_book_get_changes                (EBook       *book,
                                            GList      **changes,
                                            GError     **error);
 
-#ifndef E_BOOK_DISABLE_DEPRECATED
 gboolean    e_book_async_get_changes          (EBook             *book,
                                            const gchar       *changeid,
                                            EBookListCallback  cb,
                                            gpointer           closure);
-#endif
 
 gboolean e_book_get_changes_async       (EBook                 *book,
                                         const gchar           *changeid,
@@ -381,6 +350,6 @@ GType        e_book_get_type                  (void);
 
 G_END_DECLS
 
-#endif /* E_BOOK_DISABLE_DEPRECATED */
-
 #endif /* __E_BOOK_H__ */
+
+#endif /* EDS_DISABLE_DEPRECATED */

diff --git a/addressbook/libebook/e-destination.h b/addressbook/libebook/e-destination.h
index 197733f..db35ade 100644 (file)
--- a/addressbook/libebook/e-destination.h
+++ b/addressbook/libebook/e-destination.h
@@ -32,14 +32,11 @@
 #ifndef __E_DESTINATION_H__
 #define __E_DESTINATION_H__
 
+#include <libebook/e-book.h>
 #include <libebook/e-contact.h>
 #include <libebook/e-book-client.h>
 #include <libxml/tree.h>
 
-#ifndef E_BOOK_DISABLE_DEPRECATED
-#include <libebook/e-book.h>
-#endif /* E_BOOK_DISABLE_DEPRECATED */
-
 /* Standard GObject macros */
 #define E_TYPE_DESTINATION \
        (e_destination_get_type ())
@@ -146,9 +143,9 @@ void          e_destination_export_to_vcard_attribute   (EDestination *dest, EVC
 
 void           e_destination_freev              (EDestination **destv);
 
-#ifndef E_BOOK_DISABLE_DEPRECATED
+#ifndef EDS_DISABLE_DEPRECATED
 void           e_destination_set_book           (EDestination *dest, EBook *book);
-#endif
+#endif /* EDS_DISABLE_DEPRECATED */
 
 G_END_DECLS
 

diff --git a/calendar/libecal/e-cal-check-timezones.h b/calendar/libecal/e-cal-check-timezones.h
index aa5ab78..86b1dde 100644 (file)
--- a/calendar/libecal/e-cal-check-timezones.h
+++ b/calendar/libecal/e-cal-check-timezones.h
@@ -50,7 +50,7 @@ icaltimezone *        e_cal_client_tzlookup_icomp
 
 const gchar *  e_cal_match_tzid                (const gchar *tzid);
 
-#ifndef E_CAL_DISABLE_DEPRECATED
+#ifndef EDS_DISABLE_DEPRECATED
 
 gboolean       e_cal_check_timezones           (icalcomponent *comp,
                                                 GList *comps,
@@ -66,7 +66,7 @@ icaltimezone *        e_cal_tzlookup_icomp            (const gchar *tzid,
                                                 gconstpointer custom,
                                                 GError **error);
 
-#endif /* E_CAL_DISABLE_DEPRECATED */
+#endif /* EDS_DISABLE_DEPRECATED */
 
 G_END_DECLS
 

diff --git a/calendar/libecal/e-cal-types.h b/calendar/libecal/e-cal-types.h
index cf6bac9..c0dd6d3 100644 (file)
--- a/calendar/libecal/e-cal-types.h
+++ b/calendar/libecal/e-cal-types.h
@@ -30,9 +30,7 @@
 
 G_BEGIN_DECLS
 
-\f
-
-#ifndef E_CAL_DISABLE_DEPRECATED
+#ifndef EDS_DISABLE_DEPRECATED
 
 #define E_CALENDAR_ERROR e_calendar_error_quark()
 
@@ -81,7 +79,8 @@ typedef enum {
 } ECalendarStatus;
 
 #define E_CALENDAR_STATUS_CORBA_EXCEPTION E_CALENDAR_STATUS_DBUS_EXCEPTION
-#endif
+
+#endif /* EDS_DISABLE_DEPRECATED */
 
 /**
  * ECalClientSourceType:

diff --git a/calendar/libecal/e-cal-view-private.h b/calendar/libecal/e-cal-view-private.h
index 7e0d87e..fc28878 100644 (file)
--- a/calendar/libecal/e-cal-view-private.h
+++ b/calendar/libecal/e-cal-view-private.h
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#ifndef E_CAL_DISABLE_DEPRECATED
+#ifndef EDS_DISABLE_DEPRECATED
 
 #ifndef E_CAL_VIEW_PRIVATE_H
 #define E_CAL_VIEW_PRIVATE_H
@@ -35,4 +35,4 @@ G_END_DECLS
 
 #endif /* E_CAL_VIEW_PRIVATE_H */
 
-#endif /* E_CAL_DISABLE_DEPRECATED */
+#endif /* EDS_DISABLE_DEPRECATED */

diff --git a/calendar/libecal/e-cal-view.h b/calendar/libecal/e-cal-view.h
index e54545c..0ee5a47 100644 (file)
--- a/calendar/libecal/e-cal-view.h
+++ b/calendar/libecal/e-cal-view.h
@@ -22,7 +22,7 @@
 #error "Only <libecal/libecal.h> should be included directly."
 #endif
 
-#ifndef E_CAL_DISABLE_DEPRECATED
+#ifndef EDS_DISABLE_DEPRECATED
 
 #ifndef E_CAL_VIEW_H
 #define E_CAL_VIEW_H
@@ -91,4 +91,4 @@ G_END_DECLS
 
 #endif /* E_CAL_VIEW_H */
 
-#endif /* E_CAL_DISABLE_DEPRECATED */
+#endif /* EDS_DISABLE_DEPRECATED */

diff --git a/calendar/libecal/e-cal.h b/calendar/libecal/e-cal.h
index 8a11747..217e4ba 100644 (file)
--- a/calendar/libecal/e-cal.h
+++ b/calendar/libecal/e-cal.h
@@ -23,11 +23,11 @@
 #error "Only <libecal/libecal.h> should be included directly."
 #endif
 
+#ifndef EDS_DISABLE_DEPRECATED
+
 #ifndef E_CAL_H
 #define E_CAL_H
 
-#ifndef E_CAL_DISABLE_DEPRECATED
-
 #include <libedataserver/libedataserver.h>
 
 #include <libecal/e-cal-recur.h>
@@ -99,7 +99,7 @@ struct _ECalClass {
 
        /* Notification signals */
 
-       #ifndef E_CAL_DISABLE_DEPRECATED
+       #ifndef EDS_DISABLE_DEPRECATED
        void (* cal_opened) (ECal *ecal, ECalendarStatus status);
        #endif
        void (* cal_opened_ex) (ECal *ecal, const GError *error);
@@ -218,6 +218,7 @@ gboolean e_cal_get_attachments_for_comp (ECal *ecal, const gchar *uid, const gch
 
 G_END_DECLS
 
-#endif /* E_CAL_DISABLE_DEPRECATED */
+#endif /* E_CAL_H */
+
+#endif /* EDS_DISABLE_DEPRECATED */
 
-#endif

diff --git a/calendar/libedata-cal/e-data-cal-view.h b/calendar/libedata-cal/e-data-cal-view.h
index c992615..5ff9d98 100644 (file)
--- a/calendar/libedata-cal/e-data-cal-view.h
+++ b/calendar/libedata-cal/e-data-cal-view.h
@@ -107,7 +107,7 @@ void                e_data_cal_view_notify_components_modified_1
                                                (EDataCalView *view,
                                                 ECalComponent *component);
 
-#ifndef E_CAL_DISABLE_DEPRECATED
+#ifndef EDS_DISABLE_DEPRECATED
 void           e_data_cal_view_notify_objects_added
                                                (EDataCalView *view,
                                                 const GSList *objects);
@@ -120,7 +120,7 @@ void                e_data_cal_view_notify_objects_modified
 void           e_data_cal_view_notify_objects_modified_1
                                                (EDataCalView *view,
                                                 const gchar *object);
-#endif
+#endif /* EDS_DISABLE_DEPRECATED */
 
 void           e_data_cal_view_notify_objects_removed
                                                (EDataCalView *view,

diff --git a/configure.ac b/configure.ac
index 88083d7..8a0623c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -169,10 +169,6 @@ AS_COMPILER_FLAGS(WARNING_FLAGS,
        -Wredundant-decls -Wundef -Wwrite-strings")
 AC_SUBST(WARNING_FLAGS)
 
-dnl    More depracation from EBook/ECal:
-dnl    -DE_BOOK_DISABLE_DEPRECATED
-dnl    -DE_CAL_DISABLE_DEPRECATED
-dnl
 dnl Other useful compiler warnings for test builds only.
 dnl These may produce warnings we have no control over,
 dnl or false positives we don't always want to see.
@@ -185,26 +181,6 @@ dnl        -Wstrict-aliasing=2
 AM_CPPFLAGS="$WARNING_FLAGS -fno-strict-aliasing"
 AC_SUBST(AM_CPPFLAGS)
 
-
-dnl define disable deprecated for EBook and ECal .am files
-case "$WARNING_FLAGS" in
-*E_BOOK_DISABLE_DEPRECATED*)
-       AM_CONDITIONAL(HAVE_E_BOOK_DISABLE_DEPRECATED, [ test 1 == 1 ])
-       ;;
-*)
-       AM_CONDITIONAL(HAVE_E_BOOK_DISABLE_DEPRECATED, [ test 0 == 1 ])
-       ;;
-esac
-
-case "$WARNING_FLAGS" in
-*E_CAL_DISABLE_DEPRECATED*)
-       AM_CONDITIONAL(HAVE_E_CAL_DISABLE_DEPRECATED, [ test 1 == 1 ])
-       ;;
-*)
-       AM_CONDITIONAL(HAVE_E_CAL_DISABLE_DEPRECATED, [ test 0 == 1 ])
-       ;;
-esac
-
 dnl ******************************
 dnl Initialize maintainer mode
 dnl ******************************

diff --git a/docs/reference/addressbook/libebook/Makefile.am b/docs/reference/addressbook/libebook/Makefile.am
index 804e101..c8d24aa 100644 (file)
--- a/docs/reference/addressbook/libebook/Makefile.am
+++ b/docs/reference/addressbook/libebook/Makefile.am
@@ -5,7 +5,7 @@ DOC_MODULE = libebook
 DOC_MAIN_SGML_FILE = libebook-docs.sgml
 
 # Extra options to supply to gtkdoc-scan
-SCAN_OPTIONS = --deprecated-guards="EDS_DISABLE_DEPRECATED|E_BOOK_DISABLE_DEPRECATED"
+SCAN_OPTIONS = --deprecated-guards="EDS_DISABLE_DEPRECATED"
 
 # The directory containing the source code. Relative to $(srcdir).
 DOC_SOURCE_DIR = $(top_srcdir)/addressbook/libebook

diff --git a/docs/reference/addressbook/libedata-book/Makefile.am b/docs/reference/addressbook/libedata-book/Makefile.am
index 4be2acc..9003173 100644 (file)
--- a/docs/reference/addressbook/libedata-book/Makefile.am
+++ b/docs/reference/addressbook/libedata-book/Makefile.am
@@ -5,7 +5,7 @@ DOC_MODULE = libedata-book
 DOC_MAIN_SGML_FILE = libedata-book-docs.sgml
 
 # Extra options to supply to gtkdoc-scan
-SCAN_OPTIONS = --deprecated-guards="EDS_DISABLE_DEPRECATED|E_BOOK_DISABLE_DEPRECATED"
+SCAN_OPTIONS = --deprecated-guards="EDS_DISABLE_DEPRECATED"
 
 # The directory containing the source code. Relative to $(srcdir).
 DOC_SOURCE_DIR = $(top_srcdir)/addressbook/libedata-book

diff --git a/docs/reference/calendar/libecal/Makefile.am b/docs/reference/calendar/libecal/Makefile.am
index 7592d39..f23864a 100644 (file)
--- a/docs/reference/calendar/libecal/Makefile.am
+++ b/docs/reference/calendar/libecal/Makefile.am
@@ -5,7 +5,7 @@ DOC_MODULE = libecal
 DOC_MAIN_SGML_FILE = libecal-docs.sgml
 
 # Extra options to supply to gtkdoc-scan
-SCAN_OPTIONS = --deprecated-guards="EDS_DISABLE_DEPRECATED|E_CAL_DISABLE_DEPRECATED"
+SCAN_OPTIONS = --deprecated-guards="EDS_DISABLE_DEPRECATED"
 
 # The directory containing the source code. Relative to $(srcdir).
 DOC_SOURCE_DIR = $(top_srcdir)/calendar/libecal

diff --git a/docs/reference/calendar/libedata-cal/Makefile.am b/docs/reference/calendar/libedata-cal/Makefile.am
index 97acb95..b85eb65 100644 (file)
--- a/docs/reference/calendar/libedata-cal/Makefile.am
+++ b/docs/reference/calendar/libedata-cal/Makefile.am
@@ -9,7 +9,7 @@ HTML_IMAGES=
 DOC_MAIN_SGML_FILE = libedata-cal-docs.sgml
 
 # Extra options to supply to gtkdoc-scan
-SCAN_OPTIONS = --deprecated-guards="EDS_DISABLE_DEPRECATED|E_CAL_DISABLE_DEPRECATED"
+SCAN_OPTIONS = --deprecated-guards="EDS_DISABLE_DEPRECATED"
 
 # The directory containing the source code. Relative to $(srcdir).
 DOC_SOURCE_DIR = $(top_srcdir)/calendar/libedata-cal

diff --git a/libedataserverui/e-book-auth-util.h b/libedataserverui/e-book-auth-util.h
index 0313c6b..0aea243 100644 (file)
--- a/libedataserverui/e-book-auth-util.h
+++ b/libedataserverui/e-book-auth-util.h
@@ -24,11 +24,11 @@
 #error "Only <libedataserverui/libedataserverui.h> should be included directly."
 #endif
 
+#ifndef EDS_DISABLE_DEPRECATED
+
 #ifndef E_BOOK_AUTH_UTIL_H
 #define E_BOOK_AUTH_UTIL_H
 
-#ifndef E_BOOK_DISABLE_DEPRECATED
-
 #include <gtk/gtk.h>
 #include <libebook/libebook.h>
 
@@ -44,6 +44,6 @@ EBook *               e_load_book_source_finish       (ESource *source,
                                                 GError **error);
 G_END_DECLS
 
-#endif /* E_BOOK_DISABLE_DEPRECATED */
-
 #endif /* E_BOOK_AUTH_UTIL_H */
+
+#endif /* EDS_DISABLE_DEPRECATED */

diff --git a/tests/libebook/Makefile.am b/tests/libebook/Makefile.am
index e1325f1..d40c2de 100644 (file)
--- a/tests/libebook/Makefile.am
+++ b/tests/libebook/Makefile.am
@@ -2,32 +2,11 @@ SUBDIRS = vcard client
 
 @GNOME_CODE_COVERAGE_RULES@
 
-if HAVE_E_BOOK_DISABLE_DEPRECATED
-
-TEST_CPPFLAGS =                                        \
-       $(AM_CPPFLAGS)                          \
-       -I$(top_srcdir)                         \
-       -I$(top_builddir)                       \
-       -I$(top_srcdir)/addressbook             \
-       -I$(top_builddir)/addressbook           \
-       -DSRCDIR=\""$(srcdir)"\"                \
-       $(EVOLUTION_ADDRESSBOOK_CFLAGS)         \
-       $(CAMEL_CFLAGS)                         \
-       $(NULL)
-
-TEST_LIBS =                                    \
-       $(top_builddir)/addressbook/libebook/libebook-1.2.la    \
-       $(EVOLUTION_ADDRESSBOOK_LIBS)                           \
-       $(NULL)
-
-DEPRECATED_TESTS = $(NULL)
-
-else
+### EBook Tests (deprecated) ###
 
 noinst_LTLIBRARIES = libebook-test-utils.la
 libebook_test_utils_la_SOURCES = ebook-test-utils.c ebook-test-utils.h
 
-# FIXME: reduct redundancy
 libebook_test_utils_la_CPPFLAGS = \
        $(AM_CPPFLAGS)                  \
        -I$(top_srcdir)                 \
@@ -63,7 +42,7 @@ DEPRECATED_TESTS =                            \
        test-self                               \
        test-stress-bookviews
 
-endif
+### EBookClient Tests ###
 
 # Should be kept ordered approximately from least to most difficult/complex
 TESTS = \
@@ -123,8 +102,6 @@ test_vcard_parsing_CPPFLAGS=$(TEST_CPPFLAGS)
 test_bulk_methods_LDADD=$(TEST_LIBS)
 test_bulk_methods_CPPFLAGS=$(TEST_CPPFLAGS)
 
-if !HAVE_E_BOOK_DISABLE_DEPRECATED
-
 test_search_LDADD=$(TEST_LIBS)
 test_search_CPPFLAGS=$(TEST_CPPFLAGS)
 test_ebook_LDADD=$(TEST_LIBS)
@@ -170,6 +147,4 @@ test_self_CPPFLAGS=$(TEST_CPPFLAGS)
 test_stress_bookviews_LDADD=$(TEST_LIBS)
 test_stress_bookviews_CPPFLAGS=$(TEST_CPPFLAGS)
 
-endif
-
 -include $(top_srcdir)/git.mk

diff --git a/tests/libecal/Makefile.am b/tests/libecal/Makefile.am
index 88ecc02..ae460ee 100644 (file)
--- a/tests/libecal/Makefile.am
+++ b/tests/libecal/Makefile.am
@@ -2,8 +2,6 @@ SUBDIRS = client
 
 @GNOME_CODE_COVERAGE_RULES@
 
-if !HAVE_E_CAL_DISABLE_DEPRECATED
-
 noinst_LTLIBRARIES = libecal-test-utils.la
 libecal_test_utils_la_SOURCES = ecal-test-utils.c ecal-test-utils.h
 
@@ -145,8 +143,6 @@ test_search_LDADD =                                                 \
        $(top_builddir)/libedataserver/libedataserver-1.2.la            \
        $(EVOLUTION_CALENDAR_LIBS)
 
-endif
-
 EXTRA_DIST =                   \
        $(test_scripts)         \
        testdata.ics