diff options
| author |  Carl Worth <cworth@cworth.org> | 2010-03-31 22:29:16 -0700 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2010-03-31 22:54:08 -0700 |
| commit | ab95219a2fe3b7e3a019b98651e7cd7f36e411b3 (patch) | |
| tree | ebe762da3c175419098cdf492983643f897d9cc5 /Makefile.local | |
| parent | 784e55d0f990350d0be8e54892f0eb3afe087fc5 (diff) | |
Move some variable assignments from Makefile.local to Makefile.config
There's not any special configure logic for determining these variable
values, but if we did add some in the future, then these will now be
in the right place for that.
Additionally, this now makes Makefile.local the single place for the
user to look for manually tweaking a variable assignment, (say, for a
compiler that can't accept a particular warning argument).
With this change, there should rarely be any need for a user to poke
into any Makefile.local file.
Diffstat (limited to 'Makefile.local')
| -rw-r--r-- | Makefile.local | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/Makefile.local b/Makefile.local index d7cc9edc..aa822f6a 100644 --- a/Makefile.local +++ b/Makefile.local @@ -12,10 +12,6 @@ Makefile.config: configure @echo "" ./configure -SONAME = libnotmuch.so.1 -WARN_CXXFLAGS=-Wall -Wextra -Wwrite-strings -Wswitch-enum -WARN_CFLAGS=$(WARN_CXXFLAGS) -Wmissing-declarations - # Sub-directory Makefile.local fragments can append to these variables # to have directory-specific cflags as necessary. extra_cflags := @@ -26,15 +22,6 @@ FINAL_CFLAGS = $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags) FINAL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags) FINAL_LDFLAGS = $(LDFLAGS) $(CONFIGURE_LDFLAGS) -# Additional programs that are used during the compilation process. -EMACS ?= emacs --quick -# Lowercase to avoid clash with GZIP environment variable for passing -# arguments to gzip. -gzip = gzip - -bash_completion_dir = /etc/bash_completion.d -zsh_completion_dir = /usr/share/zsh/functions/Completion/Unix - all: notmuch notmuch.1.gz ifeq ($(MAKECMDGOALS),) @echo "" @@ -117,6 +104,8 @@ notmuch: $(notmuch_client_modules) lib/libnotmuch.so notmuch.1.gz: notmuch.1 $(call quiet,gzip) --stdout $^ > $@ +SONAME = libnotmuch.so.1 + install: all notmuch.1.gz for d in $(DESTDIR)$(prefix)/bin/ $(DESTDIR)$(libdir)/ \ $(DESTDIR)$(prefix)/include/ $(DESTDIR)$(prefix)/share/man/man1 ; \ |