[evolution-activesync: 1/3] Add $(NULL) to makefiles
- From: dwmw2 <dwmw2 src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-activesync: 1/3] Add $(NULL) to makefiles
- Date: Tue, 21 Apr 2015 11:18:20 +0000 (UTC)
commit 3e3d12b99e2ff04acf5dfc6619bc9e37148a3654
Author: Oliver Luo <lyc pku eecs gmail com>
Date: Tue Apr 21 11:09:32 2015 +0800
Add $(NULL) to makefiles
Add $(NULL) to makefiles to take advantage of the defensive programming.
camel/Makefile.am | 12 ++++++++----
check_tests/Makefile.am | 12 ++++++++----
eas-daemon/libeas/Makefile.am | 12 ++++++++----
eas-daemon/src/Makefile.am | 12 ++++++++----
eplugin/Makefile.am | 15 ++++++++++-----
libeasaccount/src/Makefile.am | 9 ++++++---
libeasaccount/tests/Makefile.am | 6 ++++--
libeasclient/Makefile.am | 12 ++++++++----
libeastest/src/Makefile.am | 12 ++++++++----
libevoeas/Makefile.am | 9 ++++++---
meego/Makefile.am | 3 ++-
11 files changed, 76 insertions(+), 38 deletions(-)
---
diff --git a/camel/Makefile.am b/camel/Makefile.am
index 31e7cab..c6c60e3 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -17,7 +17,8 @@ libcameleas_la_CPPFLAGS = \
-I$(top_srcdir)/camel \
-I$(top_srcdir)/libeasclient \
-I$(top_srcdir)/libevoeas \
- $(EVOLUTION_MAIL_CFLAGS)
+ $(EVOLUTION_MAIL_CFLAGS) \
+ $(NULL)
libcameleas_la_SOURCES = \
camel-eas-folder.c \
@@ -26,7 +27,8 @@ libcameleas_la_SOURCES = \
camel-eas-summary.c \
camel-eas-provider.c \
camel-eas-utils.c \
- camel-eas-transport.c
+ camel-eas-transport.c \
+ $(NULL)
noinst_HEADERS = \
camel-eas-folder.h \
@@ -35,7 +37,8 @@ noinst_HEADERS = \
camel-eas-store.h \
camel-eas-summary.h \
camel-eas-utils.h \
- camel-eas-transport.h
+ camel-eas-transport.h \
+ $(NULL)
libcameleas_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED)
@@ -50,7 +53,8 @@ libcameleas_la_LIBADD = \
$(SOUP_LIBS) \
$(DBUS_GLIB_LIBS) \
$(E_DATA_SERVER_LIBS) \
- $(EVOLUTION_MAIL_LIBS)
+ $(EVOLUTION_MAIL_LIBS) \
+ $(NULL)
EXTRA_DIST = libcameleas.urls
diff --git a/check_tests/Makefile.am b/check_tests/Makefile.am
index 3641417..c451309 100755
--- a/check_tests/Makefile.am
+++ b/check_tests/Makefile.am
@@ -5,12 +5,14 @@ check_eas_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(DBUS_GLIB_CFLAGS) \
-I$(top_srcdir)/libeasmail/src/ \
- $(EDATASERVER_CFLAGS)
+ $(EDATASERVER_CFLAGS) \
+ $(NULL)
check_eas_LDFLAGS = \
$(GLIB_LIBS) \
$(DBUS_GLIB_LIBS) \
- $(EDATASERVER_LIBS)
+ $(EDATASERVER_LIBS) \
+ $(NULL)
@@ -28,7 +30,8 @@ check_eas_SOURCES = eas_daemon_tests.c \
eas_con_info_translator_test.c \
eas_cal_info_translator_test.c \
eas_gobjects_unittests.c \
- eas_email_info_translator_test.c
+ eas_email_info_translator_test.c \
+ $(NULL)
check_eas_CFLAGS = @CHECK_CFLAGS@ $(GLIB_CFLAGS) $(WARNING_FLAGS)
@@ -42,6 +45,7 @@ check_eas_LDADD = $(top_builddir)/libeasmail/src/libeasmail.la \
$(top_builddir)/eas-daemon/src/activesyncd-eas-mail.o \
$(top_builddir)/eas-daemon/src/activesyncd-eas-sync.o \
$(top_builddir)/eas-daemon/src/activesyncd-eas-test.o \
- @CHECK_LIBS@ $(GLIB_LIBS)
+ @CHECK_LIBS@ $(GLIB_LIBS) \
+ $(NULL)
#eas_daemon_tests.c eas_daemon_tests.h
diff --git a/eas-daemon/libeas/Makefile.am b/eas-daemon/libeas/Makefile.am
index f3f8b0e..f5c7078 100644
--- a/eas-daemon/libeas/Makefile.am
+++ b/eas-daemon/libeas/Makefile.am
@@ -18,7 +18,8 @@ libeas_la_CPPFLAGS = \
$(GNOMEKEYRING_CFLAGS) \
-DG_LOG_DOMAIN=\"libeas\" \
-I$(top_srcdir)/libeasclient \
- -DASKPASS=\"@ASKPASS \"
+ -DASKPASS=\"@ASKPASS \" \
+ $(NULL)
libeas_la_LDFLAGS = \
$(GLIB_LIBS) \
@@ -30,12 +31,14 @@ libeas_la_LDFLAGS = \
$(LIBICAL_LIBS) \
$(GCONF_LIBS) \
$(LIBEBOOK_LIBS) \
- $(GNOMEKEYRING_LIBS)
+ $(GNOMEKEYRING_LIBS) \
+ $(NULL)
# We need libeassync for eas_item_info_serialise()
libeas_la_LIBADD = ../../libeasaccount/src/libeasaccount.la \
- ../../libeasclient/libeasclient.la
+ ../../libeasclient/libeasclient.la \
+ $(NULL)
libeas_la_SOURCES = \
@@ -102,6 +105,7 @@ libeas_la_SOURCES = \
eas-get-item-estimate-req.h \
eas-get-item-estimate-req.c \
eas-get-item-estimate-msg.h \
- eas-get-item-estimate-msg.c
+ eas-get-item-estimate-msg.c \
+ $(NULL)
diff --git a/eas-daemon/src/Makefile.am b/eas-daemon/src/Makefile.am
index 6da79f2..41764af 100644
--- a/eas-daemon/src/Makefile.am
+++ b/eas-daemon/src/Makefile.am
@@ -38,14 +38,16 @@ activesyncd_CPPFLAGS = \
$(SOUP_CFLAGS) \
-DG_LOG_DOMAIN=\"activesyncd\" \
-I$(top_srcdir)/eas-daemon/libeas \
- -I$(top_srcdir)/libeasclient
+ -I$(top_srcdir)/libeasclient \
+ $(NULL)
activesyncd_LDFLAGS = \
$(GLIB_LIBS) \
$(EDATASERVER_LIBS) \
$(DBUS_GLIB_LIBS) \
- $(SOUP_LIBS)
+ $(SOUP_LIBS) \
+ $(NULL)
AM_CFLAGS = $(INTI_CFLAGS)
@@ -66,13 +68,15 @@ activesyncd_SOURCES = activesyncd-common-defs.h \
eas-marshal.h \
eas-marshal.c \
eas-interface-base.h \
- eas-interface-base.c
+ eas-interface-base.c \
+ $(NULL)
activesyncd_LDADD = \
../libeas/libeas.la \
../../libeasclient/libeasclient.la \
../../libeastest/src/libeastest.la \
- $(INTI_LIBS)
+ $(INTI_LIBS) \
+ $(NULL)
CLEANFILES = $(BUILT_SOURCES) $(MARSHAL_GENERATED)
EXTRA_DIST = eas-marshal.list eas-sync.xml eas-common.xml eas-mail.xml eas-test.xml
diff --git a/eplugin/Makefile.am b/eplugin/Makefile.am
index 353e7a0..424aa3f 100644
--- a/eplugin/Makefile.am
+++ b/eplugin/Makefile.am
@@ -28,14 +28,16 @@ liborg_gnome_evolution_activesync_la_CPPFLAGS = \
$(LDAP_CFLAGS) \
$(GCONF_CFLAGS) \
$(SYNCEVOLUTION_DBUS_CFLAGS) \
- -I$(top_srcdir)/libeasaccount/src -I$(top_srcdir)/libeasclient -I$(top_srcdir)/camel
-I$(top_srcdir)/libevoeas
+ -I$(top_srcdir)/libeasaccount/src -I$(top_srcdir)/libeasclient -I$(top_srcdir)/camel
-I$(top_srcdir)/libevoeas \
+ $(NULL)
liborg_gnome_evolution_activesync_la_SOURCES = \
activesync-account-setup.c \
eas-account-listener.c \
- eas-account-listener.h
+ eas-account-listener.h \
+ $(NULL)
liborg_gnome_evolution_activesync_la_LIBADD = \
$(top_builddir)/libeasclient/libeasclient.la \
@@ -47,17 +49,20 @@ liborg_gnome_evolution_activesync_la_LIBADD = \
$(LDAP_LIBS) \
$(GCONF_LIBS) \
$(SYNCEVOLUTION_DBUS_LIBS) \
- $(DNS_LIBS)
+ $(DNS_LIBS) \
+ $(NULL)
liborg_gnome_evolution_activesync_la_LDFLAGS = \
- -module -avoid-version $(NO_UNDEFINED)
+ -module -avoid-version $(NO_UNDEFINED) \
+ $(NULL)
error_DATA = org-gnome-evolution-activesync.error
errordir = $(EVOLUTION_PLUGIN_errordir)
EXTRA_DIST = \
org-gnome-evolution-activesync.eplug.xml \
- org-gnome-evolution-activesync.error.xml
+ org-gnome-evolution-activesync.error.xml \
+ $(NULL)
BUILT_SOURCES = $(error_DATA) org-gnome-evolution-activesync.eplug
diff --git a/libeasaccount/src/Makefile.am b/libeasaccount/src/Makefile.am
index 5db2a9a..5e1c1d0 100644
--- a/libeasaccount/src/Makefile.am
+++ b/libeasaccount/src/Makefile.am
@@ -8,16 +8,19 @@ libeasaccount_la_CFLAGS = $(WARNING_FLAGS)
libeasaccount_la_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(GCONF_CFLAGS) \
- $(EDATASERVER_CFLAGS)
+ $(EDATASERVER_CFLAGS) \
+ $(NULL)
libeasaccount_la_LDFLAGS = \
$(GLIB_LIBS) \
$(GCONF_LIBS) \
- $(EDATASERVER_LIBS)
+ $(EDATASERVER_LIBS) \
+ $(NULL)
libeasaccount_la_SOURCES = eas-account.h eas-account.c \
- eas-account-list.h eas-account-list.c
+ eas-account-list.h eas-account-list.c \
+ $(NULL)
libeasaccountincludedir = $(privincludedir)/eas-account
diff --git a/libeasaccount/tests/Makefile.am b/libeasaccount/tests/Makefile.am
index d50fc66..ce4a45c 100644
--- a/libeasaccount/tests/Makefile.am
+++ b/libeasaccount/tests/Makefile.am
@@ -6,12 +6,14 @@ bin_PROGRAMS = libeasaccount_test
libeasaccount_test_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(EDATASERVER_CFLAGS) \
- $(GCONF_CFLAGS)
+ $(GCONF_CFLAGS) \
+ $(NULL)
libeasaccount_test_LDFLAGS = \
$(GLIB_LIBS) \
$(EDATASERVER_LIBS) \
- $(GCONF_LIBS)
+ $(GCONF_LIBS) \
+ $(NULL)
AM_CFLAGS = $(INTI_CFLAGS)
AM_CFLAGS += -g $(WARNING_FLAGS)
diff --git a/libeasclient/Makefile.am b/libeasclient/Makefile.am
index 6647ee0..c6745b8 100644
--- a/libeasclient/Makefile.am
+++ b/libeasclient/Makefile.am
@@ -4,11 +4,13 @@ lib_LTLIBRARIES = libeasclient.la
libeasclient_la_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(LIBXML_CFLAGS) \
- -DG_LOG_DOMAIN=\"libeasclient\"
+ -DG_LOG_DOMAIN=\"libeasclient\" \
+ $(NULL)
libeasclient_la_LDFLAGS = \
$(GLIB_LIBS) \
- $(LIBXML_LIBS)
+ $(LIBXML_LIBS) \
+ $(NULL)
libeasclient_la_SOURCES = \
eas-errors.c \
@@ -32,13 +34,15 @@ libeasclient_la_SOURCES = \
eas-logger.c \
eas-logger.h \
eas-dbus-client.c \
- eas-dbus-client.h
+ eas-dbus-client.h \
+ $(NULL)
libeasclientincludedir = $(privincludedir)/eas-client
libeasclientinclude_HEADERS = eas-item-info.h eas-sync-errors.h libeassync.h \
eas-attachment.h eas-folder.h libeasmail.h \
eas-errors.h \
- eas-email-info.h eas-mail-errors.h
+ eas-email-info.h eas-mail-errors.h \
+ $(NULL)
AM_CFLAGS = $(INTI_CFLAGS)
diff --git a/libeastest/src/Makefile.am b/libeastest/src/Makefile.am
index d544103..b4bec52 100644
--- a/libeastest/src/Makefile.am
+++ b/libeastest/src/Makefile.am
@@ -9,7 +9,8 @@ libeastest_la_CPPFLAGS = \
$(LIBXML_CFLAGS) \
$(SOUP_CFLAGS) \
-DG_LOG_DOMAIN=\"libeastest\" \
- -I$(top_srcdir)/eas-daemon/libeas
+ -I$(top_srcdir)/eas-daemon/libeas \
+ $(NULL)
#TODO remove unnecessary libs
libeastest_la_LDFLAGS = \
@@ -17,11 +18,13 @@ libeastest_la_LDFLAGS = \
$(EDATASERVER_LIBS) \
$(DBUS_GLIB_LIBS) \
$(LIBXML_LIBS) \
- $(SOUP_LIBS)
+ $(SOUP_LIBS) \
+ $(NULL)
libeastest_la_SOURCES = \
libeastest.h \
- libeastest.c
+ libeastest.c \
+ $(NULL)
interface_xml = ../../eas-daemon/src/eas-test.xml
@@ -35,7 +38,8 @@ AM_CFLAGS += -g $(WARNING_FLAGS)
libeastest_la_LIBADD = \
../../libeasclient/libeasclient.la \
- $(top_builddir)/eas-daemon/libeas/libeas.la
+ $(top_builddir)/eas-daemon/libeas/libeas.la \
+ $(NULL)
# Correctly clean the generated headers, but keep the xml description
CLEANFILES = $(BUILT_SOURCES)
diff --git a/libevoeas/Makefile.am b/libevoeas/Makefile.am
index 123e4a8..fa54a61 100644
--- a/libevoeas/Makefile.am
+++ b/libevoeas/Makefile.am
@@ -1,14 +1,17 @@
EVOLUTION_privlib_LTLIBRARIES = libevoeas.la
libevoeas_la_CPPFLAGS = \
- $(CAMEL_CFLAGS)
+ $(CAMEL_CFLAGS) \
+ $(NULL)
libevoeas_la_SOURCES = \
camel-eas-settings.c \
- camel-eas-settings.h
+ camel-eas-settings.h \
+ $(NULL)
libevoeas_la_LIBADD = \
- $(CAMEL_LIBS)
+ $(CAMEL_LIBS) \
+ $(NULL)
libevoeas_la_LDFLAGS = $(NO_UNDEFINED)
diff --git a/meego/Makefile.am b/meego/Makefile.am
index 6a78380..eae9012 100644
--- a/meego/Makefile.am
+++ b/meego/Makefile.am
@@ -24,4 +24,5 @@ EXTRA_DIST = \
$(UIDIR)/*.desktop \
$(UIDIR)/*.pro \
$(UIDIR)/README \
- $(UIDIR)/TODO
+ $(UIDIR)/TODO \
+ $(NULL)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]