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 /lib | |
| 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 'lib')
| -rw-r--r-- | lib/Makefile.local | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Makefile.local b/lib/Makefile.local index cd92fc79..d36fd5a0 100644 --- a/lib/Makefile.local +++ b/lib/Makefile.local @@ -60,8 +60,8 @@ libnotmuch_modules := $(libnotmuch_c_srcs:.c=.o) $(libnotmuch_cxx_srcs:.cc=.o) $(dir)/libnotmuch.a: $(libnotmuch_modules) $(call quiet,AR) rcs $@ $^ -$(dir)/$(LIBNAME): $(libnotmuch_modules) notmuch.sym util/libutil.a parse-time-string/libparse-time-string.a - $(call quiet,CXX $(CXXFLAGS)) $(libnotmuch_modules) $(FINAL_LIBNOTMUCH_LDFLAGS) $(LIBRARY_LINK_FLAG) -o $@ util/libutil.a parse-time-string/libparse-time-string.a +$(dir)/$(LIBNAME): $(libnotmuch_modules) notmuch.sym util/libnotmuch_util.a parse-time-string/libparse-time-string.a + $(call quiet,CXX $(CXXFLAGS)) $(libnotmuch_modules) $(FINAL_LIBNOTMUCH_LDFLAGS) $(LIBRARY_LINK_FLAG) -o $@ util/libnotmuch_util.a parse-time-string/libparse-time-string.a notmuch.sym: $(srcdir)/$(dir)/notmuch.h $(libnotmuch_modules) sh $(srcdir)/$(lib)/gen-version-script.sh $< $(libnotmuch_modules) > $@ |