[evolution-ews] Makefile.am cleanups.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-ews] Makefile.am cleanups.
- Date: Sun, 13 May 2012 14:10:00 +0000 (UTC)
commit 0a3cf1f929452c330d42274583c8f8d16d48e683
Author: Matthew Barnes <mbarnes redhat com>
Date: Tue May 8 11:29:53 2012 -0400
Makefile.am cleanups.
Mostly cosmetic and whitespace cleanups.
- Eliminate trailing tabs and whitespace.
- Use NULL definitions to terminate unordered multi-line lists.
Makefile.am | 57 +++++++++++--------
src/account-setup-eplugin/Makefile.am | 82 +++++++++++++++-------------
src/addressbook/Makefile.am | 99 ++++++++++++++++++---------------
src/addressbook/lzx/Makefile.am | 29 ++++++----
src/calendar/Makefile.am | 67 ++++++++++++----------
src/camel/Makefile.am | 90 ++++++++++++++++--------------
src/server/Makefile.am | 88 ++++++++++++++++--------------
src/server/tests/Makefile.am | 46 ++++++++-------
src/utils/Makefile.am | 84 +++++++++++++++-------------
9 files changed, 350 insertions(+), 292 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 5fa8170..a91fb6e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,33 +1,40 @@
+NULL =
+
SUBDIRS = src po
DIST_SUBDIRS= src po
-changelogs = \
- ChangeLog
+changelogs = \
+ ChangeLog \
+ $(NULL)
-EXTRA_DIST = \
- $(changelog) \
- intltool-merge.in \
- intltool-update.in \
- intltool-extract.in
+EXTRA_DIST = \
+ $(changelog) \
+ intltool-merge.in \
+ intltool-update.in \
+ intltool-extract.in \
+ $(NULL)
-CLEANFILES = intltool-merge \
- intltool-update \
- intltool-extract
+CLEANFILES = \
+ intltool-merge \
+ intltool-update \
+ intltool-extract \
+ $(NULL)
-MAINTAINERCLEANFILES = \
- $(srcdir)/INSTALL \
- $(srcdir)/aclocal.m4 \
- $(srcdir)/autoscan.log \
- $(srcdir)/compile \
- $(srcdir)/config.guess \
- $(srcdir)/config.h.in \
- $(srcdir)/config.sub \
- $(srcdir)/configure.scan \
- $(srcdir)/depcomp \
- $(srcdir)/gtk-doc.make \
- $(srcdir)/install-sh \
- $(srcdir)/ltmain.sh \
- $(srcdir)/missing \
- $(srcdir)/mkinstalldirs
+MAINTAINERCLEANFILES = \
+ $(srcdir)/INSTALL \
+ $(srcdir)/aclocal.m4 \
+ $(srcdir)/autoscan.log \
+ $(srcdir)/compile \
+ $(srcdir)/config.guess \
+ $(srcdir)/config.h.in \
+ $(srcdir)/config.sub \
+ $(srcdir)/configure.scan \
+ $(srcdir)/depcomp \
+ $(srcdir)/gtk-doc.make \
+ $(srcdir)/install-sh \
+ $(srcdir)/ltmain.sh \
+ $(srcdir)/missing \
+ $(srcdir)/mkinstalldirs \
+ $(NULL)
-include $(top_srcdir)/git.mk
diff --git a/src/account-setup-eplugin/Makefile.am b/src/account-setup-eplugin/Makefile.am
index 083ada6..0a80477 100644
--- a/src/account-setup-eplugin/Makefile.am
+++ b/src/account-setup-eplugin/Makefile.am
@@ -1,16 +1,20 @@
-AM_CPPFLAGS = -I . \
- -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
- -DCONNECTOR_GLADEDIR=\""$(gladedir)"\" \
- $(EVOLUTION_PLUGIN_CFLAGS) \
- $(CAMEL_CFLAGS) \
- $(LIBECAL_CFLAGS)
+NULL =
+
+AM_CPPFLAGS = \
+ -I . \
+ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
+ -DCONNECTOR_GLADEDIR=\""$(gladedir)"\" \
+ $(EVOLUTION_PLUGIN_CFLAGS) \
+ $(CAMEL_CFLAGS) \
+ $(LIBECAL_CFLAGS) \
+ $(NULL)
### EVO_PLUGIN_RULE ### begin ###
%.eplug: %.eplug.in
- sed -e 's|\ PLUGINDIR\@|$(plugindir)|' \
- -e 's|\ SOEXT\@|$(SOEXT)|' \
- -e 's|\ GETTEXT_PACKAGE\@|$(GETTEXT_PACKAGE)|' \
+ sed -e 's|\ PLUGINDIR\@|$(plugindir)|' \
+ -e 's|\ SOEXT\@|$(SOEXT)|' \
+ -e 's|\ GETTEXT_PACKAGE\@|$(GETTEXT_PACKAGE)|' \
-e 's|\ LOCALEDIR\@|$(localedir)|' $< > $@
%.eplug.in: %.eplug.xml
@@ -21,47 +25,49 @@ AM_CPPFLAGS = -I . \
### EVO_PLUGIN_RULE ### end ###
-plugin_DATA = org-gnome-exchange-ews.eplug
+plugin_DATA = org-gnome-exchange-ews.eplug
plugin_LTLIBRARIES = liborg-gnome-exchange-ews.la
-liborg_gnome_exchange_ews_la_SOURCES = \
- exchange-ews-account-setup.c \
- exchange-ews-account-setup.h \
- exchange-ews-account-listener.c \
- exchange-ews-account-listener.h \
- exchange-ews-account-out-of-office.c \
- exchange-ews-account-out-of-office.h
+liborg_gnome_exchange_ews_la_SOURCES = \
+ exchange-ews-account-setup.c \
+ exchange-ews-account-setup.h \
+ exchange-ews-account-listener.c \
+ exchange-ews-account-listener.h \
+ exchange-ews-account-out-of-office.c \
+ exchange-ews-account-out-of-office.h \
+ $(NULL)
-liborg_gnome_exchange_ews_la_LIBADD = \
- $(top_builddir)/src/server/libeews-1.2.la \
- $(top_builddir)/src/utils/libewsutils.la \
- $(top_builddir)/src/camel/libcamelews.la \
- $(EVOLUTION_PLUGIN_LIBS) \
+liborg_gnome_exchange_ews_la_LIBADD = \
+ $(top_builddir)/src/server/libeews-1.2.la \
+ $(top_builddir)/src/utils/libewsutils.la \
+ $(top_builddir)/src/camel/libcamelews.la \
+ $(EVOLUTION_PLUGIN_LIBS) \
$(EVOLUTION_SHELL_LIBS) \
- $(CAMEL_LIBS) \
- $(LIBECAL_LIBS) \
- $(LIBEMAIL_ENGINE_LIBS)
+ $(CAMEL_LIBS) \
+ $(LIBECAL_LIBS) \
+ $(LIBEMAIL_ENGINE_LIBS) \
+ $(NULL)
liborg_gnome_exchange_ews_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
liborg_gnome_exchange_ews_la_CFLAGS = \
- $(AM_CPPFLAGS) \
- -I$(top_srcdir) \
- -I$(top_builddir) \
- -I$(top_srcdir)/src/camel \
- -I$(top_builddir)/src/camel \
- -I$(top_srcdir)/src/server \
- -I$(top_builddir)/src/server \
- -I$(top_srcdir)/src/utils \
- $(LIBEWS_CFLAGS) \
- $(LIBEMAIL_ENGINE_CFLAGS)
+ $(AM_CPPFLAGS) \
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+ -I$(top_srcdir)/src/camel \
+ -I$(top_builddir)/src/camel \
+ -I$(top_srcdir)/src/server \
+ -I$(top_builddir)/src/server \
+ -I$(top_srcdir)/src/utils \
+ $(LIBEWS_CFLAGS) \
+ $(LIBEMAIL_ENGINE_CFLAGS) \
+ $(NULL)
-EXTRA_DIST = \
+EXTRA_DIST = \
org-gnome-exchange-ews.eplug.xml
-BUILT_SOURCES = org-gnome-exchange-ews.eplug
+BUILT_SOURCES = org-gnome-exchange-ews.eplug
CLEANFILES = $(BUILT_SOURCES)
-
-include $(top_srcdir)/git.mk
diff --git a/src/addressbook/Makefile.am b/src/addressbook/Makefile.am
index 5b850c2..c750171 100644
--- a/src/addressbook/Makefile.am
+++ b/src/addressbook/Makefile.am
@@ -1,55 +1,66 @@
+NULL =
+
SUBDIRS = lzx .
ebook_backend_LTLIBRARIES = libebookbackendews.la
libebookbackendews_la_CPPFLAGS = \
- $(AM_CPPFLAGS) \
- -DG_LOG_DOMAIN=\"libebookbackend\" \
- -I$(top_srcdir)/src/addressbook \
- -I$(top_srcdir)/src/server \
- -I$(top_srcdir)/src/utils \
- $(LIBEBACKEND_CFLAGS) \
- $(LIBEDATASERVER_CFLAGS) \
- $(LIBEBOOK_CFLAGS) \
- $(DB_CFLAGS) \
- $(EVOLUTION_ADDRESSBOOK_CFLAGS) \
- $(SQLITE3_CFLAGS) \
- $(SOUP_CFLAGS)
-
-libebookbackendews_la_SOURCES = \
- e-book-backend-sqlitedb.c \
- e-book-backend-sqlitedb.h \
- ews-oab-props.h \
- ews-oab-decoder.c \
- ews-oab-decoder.h \
- e-book-backend-ews.c \
- e-book-backend-ews.h \
- e-book-backend-ews-factory.c
-
-libebookbackendews_la_LIBADD = \
- $(top_builddir)/src/server/libeews-1.2.la \
- $(top_builddir)/src/utils/libewsutils.la \
- $(top_builddir)/src/addressbook/lzx/liblzx.la \
- $(LIBEBACKEND_LIBS) \
- $(LIBEDATASERVER_LIBS) \
- $(LIBEDATABOOK_LIBS) \
- $(LIBEBOOK_LIBS) \
- $(DB_LIBS) \
- $(EVOLUTION_ADDRESSBOOK_LIBS) \
- $(SQLITE3_LIBS) \
- $(SOUP_LIBS)
-
-libebookbackendews_la_LDFLAGS = \
+ $(AM_CPPFLAGS) \
+ -DG_LOG_DOMAIN=\"libebookbackend\" \
+ -I$(top_srcdir)/src/addressbook \
+ -I$(top_srcdir)/src/server \
+ -I$(top_srcdir)/src/utils \
+ $(LIBEBACKEND_CFLAGS) \
+ $(LIBEDATASERVER_CFLAGS) \
+ $(LIBEBOOK_CFLAGS) \
+ $(DB_CFLAGS) \
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS) \
+ $(SQLITE3_CFLAGS) \
+ $(SOUP_CFLAGS) \
+ $(NULL)
+
+libebookbackendews_la_SOURCES = \
+ e-book-backend-sqlitedb.c \
+ e-book-backend-sqlitedb.h \
+ ews-oab-props.h \
+ ews-oab-decoder.c \
+ ews-oab-decoder.h \
+ e-book-backend-ews.c \
+ e-book-backend-ews.h \
+ e-book-backend-ews-factory.c \
+ $(NULL)
+
+libebookbackendews_la_LIBADD = \
+ $(top_builddir)/src/server/libeews-1.2.la \
+ $(top_builddir)/src/utils/libewsutils.la \
+ $(top_builddir)/src/addressbook/lzx/liblzx.la \
+ $(LIBEBACKEND_LIBS) \
+ $(LIBEDATASERVER_LIBS) \
+ $(LIBEDATABOOK_LIBS) \
+ $(LIBEBOOK_LIBS) \
+ $(DB_LIBS) \
+ $(EVOLUTION_ADDRESSBOOK_LIBS) \
+ $(SQLITE3_LIBS) \
+ $(SOUP_LIBS) \
+ $(NULL)
+
+libebookbackendews_la_LDFLAGS = \
-module -avoid-version $(NO_UNDEFINED)
noinst_PROGRAMS = e-book-backend-sqlitedb-test
-e_book_backend_sqlitedb_test_CPPFLAGS = \
- $(libebookbackendews_la_CPPFLAGS)
-e_book_backend_sqlitedb_test_SOURCES = e-book-backend-sqlitedb-test.c \
- e-book-backend-sqlitedb.c \
- e-book-backend-sqlitedb.h
-e_book_backend_sqlitedb_test_LDADD = \
- $(libebookbackendews_la_LIBADD)
+e_book_backend_sqlitedb_test_CPPFLAGS = \
+ $(libebookbackendews_la_CPPFLAGS) \
+ $(NULL)
+
+e_book_backend_sqlitedb_test_SOURCES = \
+ e-book-backend-sqlitedb-test.c \
+ e-book-backend-sqlitedb.c \
+ e-book-backend-sqlitedb.h \
+ $(NULL)
+
+e_book_backend_sqlitedb_test_LDADD = \
+ $(libebookbackendews_la_LIBADD) \
+ $(NULL)
-include $(top_srcdir)/git.mk
diff --git a/src/addressbook/lzx/Makefile.am b/src/addressbook/lzx/Makefile.am
index 50f084c..b1cafd8 100644
--- a/src/addressbook/lzx/Makefile.am
+++ b/src/addressbook/lzx/Makefile.am
@@ -1,18 +1,23 @@
+NULL =
+
lib_LTLIBRARIES = liblzx.la
-liblzx_la_CPPFLAGS = \
- $(AM_CPPFLAGS) \
- $(GNOME_PLATFORM_CFLAGS)
+liblzx_la_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
+ $(GNOME_PLATFORM_CFLAGS) \
+ $(NULL)
-liblzx_la_SOURCES = \
- lzx.h \
- ews-oal-decompress.h \
- lzxd.c \
- ews-oal-decompress.c \
- readbits.h \
- readhuff.h
+liblzx_la_SOURCES = \
+ lzx.h \
+ ews-oal-decompress.h \
+ lzxd.c \
+ ews-oal-decompress.c \
+ readbits.h \
+ readhuff.h \
+ $(NULL)
liblzx_la_LDFLAGS = $(NO_UNDEFINED)
-liblzx_la_LIBADD = \
- $(GNOME_PLATFORM_LIBS)
+liblzx_la_LIBADD = \
+ $(GNOME_PLATFORM_LIBS) \
+ $(NULL)
diff --git a/src/calendar/Makefile.am b/src/calendar/Makefile.am
index f133597..2c1d864 100644
--- a/src/calendar/Makefile.am
+++ b/src/calendar/Makefile.am
@@ -1,40 +1,45 @@
+NULL =
+
ecal_backend_LTLIBRARIES = libecalbackendews.la
libecalbackendews_la_CPPFLAGS = \
- $(AM_CPPFLAGS) \
- -I$(top_srcdir) \
- -I$(top_builddir) \
- -I$(top_srcdir)/src/calendar \
- -I$(top_builddir)/src/calendar \
- -I$(top_srcdir)/src/server \
- -I$(top_builddir)/src/server \
- -I$(top_srcdir)/src/utils \
- $(EVOLUTION_CALENDAR_CFLAGS) \
- $(LIBEBACKEND_CFLAGS) \
- $(LIBECAL_CFLAGS) \
- $(LIBEDATACAL_CFLAGS) \
- $(SOUP_CFLAGS) \
- $(CAMEL_CFLAGS) \
- $(DEBUG_CFLAGS)
+ $(AM_CPPFLAGS) \
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+ -I$(top_srcdir)/src/calendar \
+ -I$(top_builddir)/src/calendar \
+ -I$(top_srcdir)/src/server \
+ -I$(top_builddir)/src/server \
+ -I$(top_srcdir)/src/utils \
+ $(EVOLUTION_CALENDAR_CFLAGS) \
+ $(LIBEBACKEND_CFLAGS) \
+ $(LIBECAL_CFLAGS) \
+ $(LIBEDATACAL_CFLAGS) \
+ $(SOUP_CFLAGS) \
+ $(CAMEL_CFLAGS) \
+ $(DEBUG_CFLAGS) \
+ $(NULL)
-libecalbackendews_la_SOURCES = \
- e-cal-backend-ews-factory.c \
- e-cal-backend-ews.c \
- e-cal-backend-ews.h \
- e-cal-backend-ews-utils.c \
- e-cal-backend-ews-utils.h
+libecalbackendews_la_SOURCES = \
+ e-cal-backend-ews-factory.c \
+ e-cal-backend-ews.c \
+ e-cal-backend-ews.h \
+ e-cal-backend-ews-utils.c \
+ e-cal-backend-ews-utils.h \
+ $(NULL)
-libecalbackendews_la_LIBADD = \
- $(top_builddir)/src/server/libeews-1.2.la \
- $(top_builddir)/src/utils/libewsutils.la \
- $(EVOLUTION_CALENDAR_LIBS) \
- $(LIBEBACKEND_LIBS) \
- $(LIBECAL_LIBS) \
- $(LIBEDATACAL_LIBS) \
- $(SOUP_LIBS) \
- $(CAMEL_LIBS)
+libecalbackendews_la_LIBADD = \
+ $(top_builddir)/src/server/libeews-1.2.la \
+ $(top_builddir)/src/utils/libewsutils.la \
+ $(EVOLUTION_CALENDAR_LIBS) \
+ $(LIBEBACKEND_LIBS) \
+ $(LIBECAL_LIBS) \
+ $(LIBEDATACAL_LIBS) \
+ $(SOUP_LIBS) \
+ $(CAMEL_LIBS) \
+ $(NULL)
-libecalbackendews_la_LDFLAGS = \
+libecalbackendews_la_LDFLAGS = \
-module -avoid-version $(NO_UNDEFINED)
-include $(top_srcdir)/git.mk
diff --git a/src/camel/Makefile.am b/src/camel/Makefile.am
index bea5a39..87ddd8e 100644
--- a/src/camel/Makefile.am
+++ b/src/camel/Makefile.am
@@ -1,52 +1,58 @@
+NULL =
+
camel_provider_LTLIBRARIES = libcamelews.la
camel_provider_DATA = libcamelews.urls
libcamelews_la_CPPFLAGS = \
- $(AM_CPPFLAGS) \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/camel \
- -I$(top_srcdir)/src/server \
- -I$(top_srcdir)/src/utils \
- $(CAMEL_CFLAGS) \
- $(LIBEDATASERVER_CFLAGS) \
- $(LIBECAL_CFLAGS) \
- $(EVOLUTION_PLUGIN_CFLAGS) \
- $(GNOME_INCLUDEDIR) \
- $(SOUP_CFLAGS) \
- $(LIBEBACKEND_CFLAGS) \
- $(E_DATA_SERVER_CFLAGS) \
- -DG_LOG_DOMAIN=\"camel-ews-provider\"
-
-libcamelews_la_SOURCES = \
- camel-ews-folder.c \
- camel-ews-store-summary.c \
- camel-ews-store.c \
- camel-ews-summary.c \
- camel-ews-provider.c \
- camel-ews-utils.c \
- camel-ews-transport.c
-
-noinst_HEADERS = \
- camel-ews-folder.h \
- camel-ews-private.h \
- camel-ews-store-summary.h \
- camel-ews-store.h \
- camel-ews-summary.h \
- camel-ews-utils.h \
- camel-ews-transport.h
+ $(AM_CPPFLAGS) \
+ -I$(top_srcdir)/src \
+ -I$(top_srcdir)/src/camel \
+ -I$(top_srcdir)/src/server \
+ -I$(top_srcdir)/src/utils \
+ $(CAMEL_CFLAGS) \
+ $(LIBEDATASERVER_CFLAGS) \
+ $(LIBECAL_CFLAGS) \
+ $(EVOLUTION_PLUGIN_CFLAGS) \
+ $(GNOME_INCLUDEDIR) \
+ $(SOUP_CFLAGS) \
+ $(LIBEBACKEND_CFLAGS) \
+ $(E_DATA_SERVER_CFLAGS) \
+ -DG_LOG_DOMAIN=\"camel-ews-provider\" \
+ $(NULL)
+
+libcamelews_la_SOURCES = \
+ camel-ews-folder.c \
+ camel-ews-store-summary.c \
+ camel-ews-store.c \
+ camel-ews-summary.c \
+ camel-ews-provider.c \
+ camel-ews-utils.c \
+ camel-ews-transport.c \
+ $(NULL)
+
+noinst_HEADERS = \
+ camel-ews-folder.h \
+ camel-ews-private.h \
+ camel-ews-store-summary.h \
+ camel-ews-store.h \
+ camel-ews-summary.h \
+ camel-ews-utils.h \
+ camel-ews-transport.h \
+ $(NULL)
libcamelews_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
-libcamelews_la_LIBADD = \
- $(top_builddir)/src/server/libeews-1.2.la \
- $(top_builddir)/src/utils/libewsutils.la \
- $(CAMEL_LIBS) \
- $(EVOLUTION_PLUGIN_LIBS) \
- $(LIBEDATASERVER_LIBS) \
- $(LIBEBACKEND_LIBS) \
- $(LIBECAL_LIBS) \
- $(SOUP_LIBS) \
- $(E_DATA_SERVER_LIBS)
+libcamelews_la_LIBADD = \
+ $(top_builddir)/src/server/libeews-1.2.la \
+ $(top_builddir)/src/utils/libewsutils.la \
+ $(CAMEL_LIBS) \
+ $(EVOLUTION_PLUGIN_LIBS) \
+ $(LIBEDATASERVER_LIBS) \
+ $(LIBEBACKEND_LIBS) \
+ $(LIBECAL_LIBS) \
+ $(SOUP_LIBS) \
+ $(E_DATA_SERVER_LIBS) \
+ $(NULL)
EXTRA_DIST = libcamelews.urls
diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index b8e1975..3e33d7c 100644
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -1,3 +1,5 @@
+NULL =
+
DIST_SUBDIRS = tests
privlib_LTLIBRARIES = libeews-1.2.la
@@ -17,54 +19,58 @@ ews-marshal.c: ews-marshal.h
e-ews-connection.c: $(MARSHAL_GENERATED)
libeews_1_2_la_CPPFLAGS = \
- $(AM_CPPFLAGS) \
- -DG_LOG_DOMAIN=\"libeews\" \
- -I$(top_srcdir) \
- -I$(top_builddir) \
- -I$(top_builddir)/src/server \
- $(SOUP_CFLAGS) \
- $(LIBECAL_CFLAGS) \
- $(LIBICAL_CFLAGS) \
- $(LIBEDATASERVER_CFLAGS) \
- $(DEBUG_CFLAGS)
-
-libeews_1_2_la_SOURCES = \
- ews-errors.h \
- ews-errors.c \
- ews-marshal.h \
- ews-marshal.c \
- e-ews-connection.c \
- e-ews-connection.h \
- e-ews-folder.c \
- e-ews-item.c \
- e-ews-item-change.c \
- e-ews-message.c \
- e-soap-message.c \
- e-soap-message.h \
- e-soap-response.c \
- e-soap-response.h
-
-libeews_1_2_la_LIBADD = \
- $(SOUP_LIBS) \
- $(LIBECAL_LIBS) \
- $(LIBICAL_LIBS) \
- $(LIBEDATASERVER_LIBS) \
- $(SOCKET_LIBS)
+ $(AM_CPPFLAGS) \
+ -DG_LOG_DOMAIN=\"libeews\" \
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+ -I$(top_builddir)/src/server \
+ $(SOUP_CFLAGS) \
+ $(LIBECAL_CFLAGS) \
+ $(LIBICAL_CFLAGS) \
+ $(LIBEDATASERVER_CFLAGS) \
+ $(DEBUG_CFLAGS) \
+ $(NULL)
+
+libeews_1_2_la_SOURCES = \
+ ews-errors.h \
+ ews-errors.c \
+ ews-marshal.h \
+ ews-marshal.c \
+ e-ews-connection.c \
+ e-ews-connection.h \
+ e-ews-folder.c \
+ e-ews-item.c \
+ e-ews-item-change.c \
+ e-ews-message.c \
+ e-soap-message.c \
+ e-soap-message.h \
+ e-soap-response.c \
+ e-soap-response.h \
+ $(NULL)
+
+libeews_1_2_la_LIBADD = \
+ $(SOUP_LIBS) \
+ $(LIBECAL_LIBS) \
+ $(LIBICAL_LIBS) \
+ $(LIBEDATASERVER_LIBS) \
+ $(SOCKET_LIBS) \
+ $(NULL)
libeews_1_2_la_LDFLAGS = $(NO_UNDEFINED)
libeewsincludedir = $(privincludedir)/ews
-libeewsinclude_HEADERS = \
- ews-errors.h \
- e-ews-connection.h \
- e-ews-folder.h \
- e-ews-item.h \
- e-ews-item-change.h \
- e-ews-message.h
+libeewsinclude_HEADERS = \
+ ews-errors.h \
+ e-ews-connection.h \
+ e-ews-folder.h \
+ e-ews-item.h \
+ e-ews-item-change.h \
+ e-ews-message.h \
+ $(NULL)
%-$(API_VERSION).pc: %.pc
- cp $< $@
+ cp $< $@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libeews-$(API_VERSION).pc
diff --git a/src/server/tests/Makefile.am b/src/server/tests/Makefile.am
index d2bbc54..0e0724a 100644
--- a/src/server/tests/Makefile.am
+++ b/src/server/tests/Makefile.am
@@ -1,13 +1,16 @@
#Placeholder for TestCases. Should have a target called make test, test-run.
+NULL =
+
SERVERS_EWS_CPPFLAGS= \
- -DG_LOG_DOMAIN=\"libeews\" \
- -I$(top_srcdir) \
- -I$(top_builddir) \
- $(SOUP_CFLAGS) \
- $(EVOLUTION_DATA_SERVER_CFLAGS) \
- $(LIBEDATASERVER_CFLAGS) \
- $(E_DATA_SERVER_CFLAGS)
+ -DG_LOG_DOMAIN=\"libeews\" \
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+ $(SOUP_CFLAGS) \
+ $(EVOLUTION_DATA_SERVER_CFLAGS) \
+ $(LIBEDATASERVER_CFLAGS) \
+ $(E_DATA_SERVER_CFLAGS) \
+ $(NULL)
libeews = $(top_builddir)/src/server/libeews-1.2.la
@@ -15,20 +18,21 @@ noinst_PROGRAMS = $(TEST_PROGS)
TESTS = testews
check_PROGRAMS = testews
-testews_SOURCES = \
- utils.c \
- test-connection.c \
- test-syncfolder.c \
- test-cuditem.c \
- test-getattachment.c \
- test-autocompletion.c \
- test-createfolder.c \
- test-deletefolder.c \
- test-getdelegate.c \
- test-libews.c \
- test-get-oof-settings.c \
- test-set-oof-settings.c \
- utils.h
+testews_SOURCES = \
+ utils.c \
+ test-connection.c \
+ test-syncfolder.c \
+ test-cuditem.c \
+ test-getattachment.c \
+ test-autocompletion.c \
+ test-createfolder.c \
+ test-deletefolder.c \
+ test-getdelegate.c \
+ test-libews.c \
+ test-get-oof-settings.c \
+ test-set-oof-settings.c \
+ utils.h \
+ $(NULL)
#Fixme: Ugly. Kill me later
testews_LDADD = $(LIBEDATASERVER_LIBS) $(libeews)
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index 175d252..20fd6cc 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -1,36 +1,41 @@
+NULL =
+
privlib_LTLIBRARIES = libewsutils.la
libewsutils_la_CPPFLAGS = \
- $(AM_CPPFLAGS) \
- -DG_LOG_DOMAIN=\"libeews\" \
- -I$(top_srcdir) \
- -I$(top_srcdir)/src/server \
- -I$(top_builddir) \
- -I$(top_builddir)/src/server \
- $(LIBEDATASERVER_CFLAGS) \
- $(SQLITE3_CFLAGS) \
- $(DEBUG_CFLAGS) \
- $(CAMEL_CFLAGS) \
- $(LIBEDATACAL_CFLAGS)
-
-libewsutils_la_SOURCES = \
- camel-ews-settings.c \
- camel-ews-settings.h \
- ews-esource-utils.h \
- ews-esource-utils.c \
- e-sqlite3-vfs.c \
- e-sqlite3-vfs.h \
- ews-camel-common.c \
- ews-camel-common.h \
- e-ews-query-to-restriction.c \
- e-ews-query-to-restriction.h
-
-libewsutils_la_LIBADD = \
- $(top_builddir)/src/server/libeews-1.2.la \
- $(SQLITE3_LIBS) \
- $(LIBEDATASERVER_LIBS) \
- $(CAMEL_LIBS) \
- $(LIBEDATACAL_LIBS)
+ $(AM_CPPFLAGS) \
+ -DG_LOG_DOMAIN=\"libeews\" \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/src/server \
+ -I$(top_builddir) \
+ -I$(top_builddir)/src/server \
+ $(LIBEDATASERVER_CFLAGS) \
+ $(SQLITE3_CFLAGS) \
+ $(DEBUG_CFLAGS) \
+ $(CAMEL_CFLAGS) \
+ $(LIBEDATACAL_CFLAGS) \
+ $(NULL)
+
+libewsutils_la_SOURCES = \
+ camel-ews-settings.c \
+ camel-ews-settings.h \
+ ews-esource-utils.h \
+ ews-esource-utils.c \
+ e-sqlite3-vfs.c \
+ e-sqlite3-vfs.h \
+ ews-camel-common.c \
+ ews-camel-common.h \
+ e-ews-query-to-restriction.c \
+ e-ews-query-to-restriction.h \
+ $(NULL)
+
+libewsutils_la_LIBADD = \
+ $(top_builddir)/src/server/libeews-1.2.la \
+ $(SQLITE3_LIBS) \
+ $(LIBEDATASERVER_LIBS) \
+ $(CAMEL_LIBS) \
+ $(LIBEDATACAL_LIBS) \
+ $(NULL)
libewsutils_la_LDFLAGS = $(NO_UNDEFINED)
@@ -39,15 +44,18 @@ noinst_PROGRAMS = ews-test-finditem-query
TESTS = ews-test-finditem-query
check_PROGRAMS = ews-test-finditem-query
-ews_test_finditem_query_CPPFLAGS = \
- $(libewsutils_la_CPPFLAGS)
+ews_test_finditem_query_CPPFLAGS = \
+ $(libewsutils_la_CPPFLAGS) \
+ $(NULL)
-ews_test_finditem_query_SOURCES = \
- ews-test-finditem-query.c \
- e-ews-query-to-restriction.c \
- e-ews-query-to-restriction.h
+ews_test_finditem_query_SOURCES = \
+ ews-test-finditem-query.c \
+ e-ews-query-to-restriction.c \
+ e-ews-query-to-restriction.h \
+ $(NULL)
-ews_test_finditem_query_LDADD = \
- $(libewsutils_la_LIBADD)
+ews_test_finditem_query_LDADD = \
+ $(libewsutils_la_LIBADD) \
+ $(NULL)
-include $(top_srcdir)/git.mk
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]