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 /test | |
| 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 'test')
| -rw-r--r-- | test/Makefile.local | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/Makefile.local b/test/Makefile.local index 46805972..0df72c92 100644 --- a/test/Makefile.local +++ b/test/Makefile.local @@ -12,15 +12,15 @@ smtp_dummy_srcs = \ smtp_dummy_modules = $(smtp_dummy_srcs:.c=.o) -$(dir)/arg-test: $(dir)/arg-test.o command-line-arguments.o util/libutil.a +$(dir)/arg-test: $(dir)/arg-test.o command-line-arguments.o util/libnotmuch_util.a $(call quiet,CC) $^ -o $@ $(LDFLAGS) -$(dir)/hex-xcode: $(dir)/hex-xcode.o command-line-arguments.o util/libutil.a +$(dir)/hex-xcode: $(dir)/hex-xcode.o command-line-arguments.o util/libnotmuch_util.a $(call quiet,CC) $^ -o $@ $(LDFLAGS) $(TALLOC_LDFLAGS) random_corpus_deps = $(dir)/random-corpus.o $(dir)/database-test.o \ notmuch-config.o status.o command-line-arguments.o \ - lib/libnotmuch.a util/libutil.a \ + lib/libnotmuch.a util/libnotmuch_util.a \ parse-time-string/libparse-time-string.a $(dir)/random-corpus: $(random_corpus_deps) |