unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
* [PATCH] configure: combine common parts of CONFIGURE_C{,XX}FLAGS
@ 2016-05-13 21:29 Tomi Ollila
  2016-05-19 11:05 ` David Bremner
  0 siblings, 1 reply; 2+ messages in thread
From: Tomi Ollila @ 2016-05-13 21:29 UTC (permalink / raw)
  To: notmuch; +Cc: tomi.ollila

By combining the common parts of CONFIGURE_CFLAGS and CONFIGURE_CXXFLAGS
to a separate make variable and using that as part of their
definitions makes setting of these easier, DRYer and less error prone
(especially as we cannot check potential typing errors there).
---

This patch requires (at least patches 1-4) from David's "libconfig..."
series ( id:1463135893-7471-1-git-send-email-david@tethera.net ).

I made slight reordering of the now common flags. these 4 first lines
in added lines basically shows that all flags in removed lines are there
(and XAPIAN_CXXFLAGS is the only thing differing in CONFIGURE_CXXFLAGS).

> +	\$(GMIME_CFLAGS) \$(TALLOC_CFLAGS) \$(ZLIB_CFLAGS)	\\
> +	-DHAVE_VALGRIND=\$(HAVE_VALGRIND) \$(VALGRIND_CFLAGS)	\\
> +	-DHAVE_GETLINE=\$(HAVE_GETLINE)				\\
> +	-DHAVE_CANONICALIZE_FILE_NAME=\$(HAVE_CANONICALIZE_FILE_NAME) \\


 configure | 47 ++++++++++++++++++-----------------------------
 1 file changed, 18 insertions(+), 29 deletions(-)

diff --git a/configure b/configure
index eb143b2..1cb71ff 100755
--- a/configure
+++ b/configure
@@ -1082,35 +1082,24 @@ WITH_BASH = ${WITH_BASH}
 WITH_ZSH = ${WITH_ZSH}
 
 # Combined flags for compiling and linking against all of the above
-CONFIGURE_CFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS)      \\
-		   -DHAVE_CANONICALIZE_FILE_NAME=\$(HAVE_CANONICALIZE_FILE_NAME) \\
-		   \$(ZLIB_CFLAGS)					 \\
-		   \$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND)   \\
-		   \$(VALGRIND_CFLAGS)                                   \\
-		   -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR)                 \\
-		   -DHAVE_STRSEP=\$(HAVE_STRSEP)                         \\
-		   -DHAVE_TIMEGM=\$(HAVE_TIMEGM)                         \\
-		   -DHAVE_D_TYPE=\$(HAVE_D_TYPE)                         \\
-		   -DSTD_GETPWUID=\$(STD_GETPWUID)                       \\
-		   -DSTD_ASCTIME=\$(STD_ASCTIME)                         \\
-		   -DHAVE_XAPIAN_COMPACT=\$(HAVE_XAPIAN_COMPACT)	 \\
-		   -DHAVE_XAPIAN_FIELD_PROCESSOR=\$(HAVE_XAPIAN_FIELD_PROCESSOR) \\
-		   -DUTIL_BYTE_ORDER=\$(UTIL_BYTE_ORDER)
-
-CONFIGURE_CXXFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS)    \\
-		     -DHAVE_CANONICALIZE_FILE_NAME=\$(HAVE_CANONICALIZE_FILE_NAME) \\
-		     \$(ZLIB_CFLAGS)					 \\
-		     \$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND) \\
-		     \$(VALGRIND_CFLAGS) \$(XAPIAN_CXXFLAGS)             \\
-		     -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR)               \\
-		     -DHAVE_STRSEP=\$(HAVE_STRSEP)                       \\
-		     -DHAVE_TIMEGM=\$(HAVE_TIMEGM)                       \\
-		     -DHAVE_D_TYPE=\$(HAVE_D_TYPE)                       \\
-		     -DSTD_GETPWUID=\$(STD_GETPWUID)                     \\
-		     -DSTD_ASCTIME=\$(STD_ASCTIME)                       \\
-		     -DHAVE_XAPIAN_COMPACT=\$(HAVE_XAPIAN_COMPACT)       \\
-		     -DHAVE_XAPIAN_FIELD_PROCESSOR=\$(HAVE_XAPIAN_FIELD_PROCESSOR) \\
-		     -DUTIL_BYTE_ORDER=\$(UTIL_BYTE_ORDER)
+COMMON_CONFIGURE_CFLAGS = \\
+	\$(GMIME_CFLAGS) \$(TALLOC_CFLAGS) \$(ZLIB_CFLAGS)	\\
+	-DHAVE_VALGRIND=\$(HAVE_VALGRIND) \$(VALGRIND_CFLAGS)	\\
+	-DHAVE_GETLINE=\$(HAVE_GETLINE)				\\
+	-DHAVE_CANONICALIZE_FILE_NAME=\$(HAVE_CANONICALIZE_FILE_NAME) \\
+	-DHAVE_STRCASESTR=\$(HAVE_STRCASESTR)			\\
+	-DHAVE_STRSEP=\$(HAVE_STRSEP)				\\
+	-DHAVE_TIMEGM=\$(HAVE_TIMEGM)				\\
+	-DHAVE_D_TYPE=\$(HAVE_D_TYPE)				\\
+	-DSTD_GETPWUID=\$(STD_GETPWUID)				\\
+	-DSTD_ASCTIME=\$(STD_ASCTIME)				\\
+	-DHAVE_XAPIAN_COMPACT=\$(HAVE_XAPIAN_COMPACT)		\\
+	-DHAVE_XAPIAN_FIELD_PROCESSOR=\$(HAVE_XAPIAN_FIELD_PROCESSOR) \\
+	-DUTIL_BYTE_ORDER=\$(UTIL_BYTE_ORDER)
+
+CONFIGURE_CFLAGS = \$(COMMON_CONFIGURE_CFLAGS)
+
+CONFIGURE_CXXFLAGS = \$(COMMON_CONFIGURE_CFLAGS) \$(XAPIAN_CXXFLAGS)
 
 CONFIGURE_LDFLAGS =  \$(GMIME_LDFLAGS) \$(TALLOC_LDFLAGS) \$(ZLIB_LDFLAGS) \$(XAPIAN_LDFLAGS)
 EOF
-- 
2.8.2

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] configure: combine common parts of CONFIGURE_C{,XX}FLAGS
  2016-05-13 21:29 [PATCH] configure: combine common parts of CONFIGURE_C{,XX}FLAGS Tomi Ollila
@ 2016-05-19 11:05 ` David Bremner
  0 siblings, 0 replies; 2+ messages in thread
From: David Bremner @ 2016-05-19 11:05 UTC (permalink / raw)
  To: Tomi Ollila, notmuch; +Cc: tomi.ollila

Tomi Ollila <tomi.ollila@iki.fi> writes:

> By combining the common parts of CONFIGURE_CFLAGS and CONFIGURE_CXXFLAGS
> to a separate make variable and using that as part of their
> definitions makes setting of these easier, DRYer and less error prone
> (especially as we cannot check potential typing errors there).

pushed,

d

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-05-19 11:05 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-13 21:29 [PATCH] configure: combine common parts of CONFIGURE_C{,XX}FLAGS Tomi Ollila
2016-05-19 11:05 ` David Bremner

Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).