[PATCH 1/2] Makefile: evaluate pkg-config once

classic Classic list List threaded Threaded
3 messages Options
Chris Wilson-2 Chris Wilson-2
Reply | Threaded
Open this post in threaded view
|

[PATCH 1/2] Makefile: evaluate pkg-config once

Currently the same `pkg-config ...` is executed for every target, so
just store the results in a variable.
---
 Makefile |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 96aaa73..023b2ec 100644
--- a/Makefile
+++ b/Makefile
@@ -4,15 +4,16 @@ CFLAGS=-O2
 
 # Additional flags that we will append to whatever the user set.
 # These aren't intended for the user to manipulate.
-extra_cflags = `pkg-config --cflags glib-2.0 gmime-2.4 talloc`
-extra_cxxflags = `xapian-config --cxxflags`
+extra_cflags := $(shell pkg-config --cflags glib-2.0 gmime-2.4 talloc)
+extra_cxxflags := $(shell xapian-config --cxxflags)
 
 # Now smash together user's values with our extra values
 override CFLAGS += $(WARN_FLAGS) $(extra_cflags)
 override CXXFLAGS += $(WARN_FLAGS) $(extra_cflags) $(extra_cxxflags)
 
-override LDFLAGS += `pkg-config --libs glib-2.0 gmime-2.4 talloc` \
- `xapian-config --libs`
+override LDFLAGS += \
+ $(shell pkg-config --libs glib-2.0 gmime-2.4 talloc) \
+ $(shell xapian-config --libs)
 
 # Include our local Makefile.local first so that its first target is default
 include Makefile.local
--
1.6.5.2


Chris Wilson-2 Chris Wilson-2
Reply | Threaded
Open this post in threaded view
|

[PATCH 2/2] reply: Pointer mismatch.

Apparently typeof (size_t) != unsigned int on my x86-64.
---
 notmuch-reply.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/notmuch-reply.c b/notmuch-reply.c
index 4a4a782..344b6e3 100644
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -78,7 +78,7 @@ address_is_users (const char *address, notmuch_config_t *config)
 {
     const char *primary;
     char **other;
-    unsigned int i, other_len;
+    size_t i, other_len;
 
     primary = notmuch_config_get_user_primary_email (config);
     if (strcmp (primary, address) == 0)
--
1.6.5.2


Carl Worth-2 Carl Worth-2
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH 2/2] reply: Pointer mismatch.

In reply to this post by Chris Wilson-2
On Wed, 18 Nov 2009 11:34:54 +0000, Chris Wilson <[hidden email]> wrote:
> Currently the same `pkg-config ...` is executed for every target, so
> just store the results in a variable.

On Wed, 18 Nov 2009 11:34:55 +0000, Chris Wilson <[hidden email]> wrote:
> Apparently typeof (size_t) != unsigned int on my x86-64.

Thanks! Both pushed.

-Carl