debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-12-25 10:54:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Makefile: Make the top-level Makefile a little more independent.

Browse source 
Previously, the top-level Makefile was explicitly adding -I./lib to
the compiler flags. However, that's something that's much better done
from within the Makefile.local fragment within the lib directory
itself.
This commit is contained in:
Carl Worth 2009-11-10 08:34:54 -08:00
parent 1a6208bfbd
commit 946c94b6a1
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Makefile
View file

@ -4,15 +4,15 @@ CFLAGS=-g -O0
# Additional flags that we will append to whatever the user set.
# These aren't intended for the user to manipulate.
extra_cflags = -I./lib `pkg-config --cflags glib-2.0 gmime-2.4 talloc`
extra_cflags = `pkg-config --cflags glib-2.0 gmime-2.4 talloc`
extra_cxxflags = `xapian-config --cxxflags`
# Now smash together user's values with our extra values
override CFLAGS := $(CFLAGS) $(WARN_FLAGS) $(extra_cflags)
override CXXFLAGS := $(CXXFLAGS) $(WARN_FLAGS) $(extra_cflags) $(extra_cxxflags)
override CFLAGS += $(WARN_FLAGS) $(extra_cflags)
override CXXFLAGS += $(WARN_FLAGS) $(extra_cflags) $(extra_cxxflags)
override LDFLAGS := $(LDFLAGS) `pkg-config --libs glib-2.0 gmime-2.4 talloc` \
`xapian-config --libs`
override LDFLAGS += `pkg-config --libs glib-2.0 gmime-2.4 talloc` \
`xapian-config --libs`
# Include our local Makfile.local first so that its first target is default
include Makefile.local

1
lib/Makefile.local
View file

@ -1,4 +1,5 @@
dir=lib
extra_cflags += -I$(dir)
libnotmuch_c_srcs = \
$(dir)/libsha1.c \