Add some text to configure on how to install dependencies with yum.

[notmuch] / Makefile

diff --git a/Makefile b/Makefile
index 7a9e44c629b833b27e3fbfe54fcd8657e49d78b2..588f8538eb44d4ab1002390bad7457a47b1e0da1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,36 +1,26 @@
-# Default FLAGS, (can be overridden by user such as "make CFLAGS=-O2")
-WARN_FLAGS=-Wall -Wextra -Wmissing-declarations -Wwrite-strings -Wswitch-enum
+# Default FLAGS, (can be overridden by user such as "make CFLAGS=-g")
 CFLAGS=-O2
 
+WARN_CXXFLAGS=-Wall -Wextra -Wwrite-strings -Wswitch-enum
+WARN_CFLAGS=$(WARN_CXXFLAGS) -Wmissing-declarations
+
 # Additional programs that are used during the compilation process.
 EMACS ?= emacs
 # Lowercase to avoid clash with GZIP environment variable for passing
 # arguments to gzip.
 gzip = gzip
 
-# Additional flags that we will append to whatever the user set.
-# These aren't intended for the user to manipulate.
-extra_cflags := $(shell pkg-config --cflags glib-2.0 gmime-2.4 talloc)
-extra_cxxflags := $(shell xapian-config --cxxflags)
-
-emacs_lispdir := $(shell pkg-config emacs --variable sitepkglispdir)
-# Hard-code if this system doesn't have an emacs.pc file
-ifeq ($(emacs_lispdir),)
-       emacs_lispdir = $(prefix)/share/emacs/site-lisp
-endif
-
 bash_completion_dir = /etc/bash_completion.d
 
 all_deps = Makefile Makefile.local Makefile.config \
                   lib/Makefile lib/Makefile.local
 
-# Now smash together user's values with our extra values
-override CFLAGS += $(WARN_FLAGS) $(extra_cflags)
-override CXXFLAGS += $(WARN_FLAGS) $(extra_cflags) $(extra_cxxflags)
+extra_cflags :=
+extra_cxxflags :=
 
-override LDFLAGS += \
-       $(shell pkg-config --libs glib-2.0 gmime-2.4 talloc) \
-       $(shell xapian-config --libs)
+# Now smash together user's values with our extra values
+override CFLAGS += $(WARN_CFLAGS) $(extra_cflags)
+override CXXFLAGS += $(WARN_CXXFLAGS) $(extra_cflags) $(extra_cxxflags)
 
 all: notmuch notmuch.1.gz