diff options
| author | David Bremner <david@tethera.net> | 2017-03-14 08:10:07 -0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2017-03-18 21:37:43 -0300 |
| commit | c39f6361d0798aa8d0dcd0b91f6b86ab9dc21c75 (patch) | |
| tree | 6e62c880186ea60974847f525b253c670f6c851b /util/Makefile.local | |
| parent | a8a270522231b186493ecd97d56a1343382d51d8 (diff) | |
rename libutil.a to libnotmuch_util.a
Apparently some systems (MacOS?) have a system library called libutil
and the name conflict causes problems. Since this library is quite
notmuch specific, rename it to something less generic.
Diffstat (limited to 'util/Makefile.local')
| -rw-r--r-- | util/Makefile.local | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/util/Makefile.local b/util/Makefile.local index 905f2376..a6962d49 100644 --- a/util/Makefile.local +++ b/util/Makefile.local @@ -3,14 +3,14 @@ dir := util extra_cflags += -I$(srcdir)/$(dir) -libutil_c_srcs := $(dir)/xutil.c $(dir)/error_util.c $(dir)/hex-escape.c \ +libnotmuch_util_c_srcs := $(dir)/xutil.c $(dir)/error_util.c $(dir)/hex-escape.c \ $(dir)/string-util.c $(dir)/talloc-extra.c $(dir)/zlib-extra.c \ $(dir)/util.c -libutil_modules := $(libutil_c_srcs:.c=.o) +libnotmuch_util_modules := $(libnotmuch_util_c_srcs:.c=.o) -$(dir)/libutil.a: $(libutil_modules) +$(dir)/libnotmuch_util.a: $(libnotmuch_util_modules) $(call quiet,AR) rcs $@ $^ -SRCS := $(SRCS) $(libutil_c_srcs) -CLEAN := $(CLEAN) $(libutil_modules) $(dir)/libutil.a +SRCS := $(SRCS) $(libnotmuch_util_c_srcs) +CLEAN := $(CLEAN) $(libnotmuch_util_modules) $(dir)/libnotmuch_util.a |