debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 02:48:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix up Makefile for build.

Browse source 
Must set extra_c(xx)flags before including subdir Makefile.local's,
so that there is a blank slate that the subdirs can add on to.

Must include subdir Makefile.local's before global one, otherwise
the compat sources are not added to the list of those to be
compiled.

Signed-off-by: Aaron Ecay <aaronecay@gmail.com>
This commit is contained in:
Aaron Ecay 2010-04-11 19:44:52 -04:00 committed by Carl Worth
parent 16f0e7dcf4
commit c10085c77b
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Makefile
View file

@ -9,6 +9,13 @@ subdirs = compat completion emacs lib
global_deps = Makefile Makefile.local \ global_deps = Makefile Makefile.local \
$(subdirs:%=%/Makefile) $(subdirs:%=%/Makefile.local) $(subdirs:%=%/Makefile) $(subdirs:%=%/Makefile.local)
# Sub-directory Makefile.local fragments can append to these variables
# to have directory-specific cflags as necessary.
extra_cflags :=
extra_cxxflags :=
# Finally, include all of the Makefile.local fragments where all the # Finally, include all of the Makefile.local fragments where all the
# real work is done. # real work is done.
include Makefile.local $(subdirs:%=%/Makefile.local)
include $(subdirs:%=%/Makefile.local) Makefile.local

5
Makefile.local
View file

@ -33,11 +33,6 @@ Makefile.config: configure
@echo "" @echo ""
./configure ./configure
# Sub-directory Makefile.local fragments can append to these variables
# to have directory-specific cflags as necessary.
extra_cflags :=
extra_cxxflags :=
# Smash together user's values with our extra values # Smash together user's values with our extra values
FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags) FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags)
FINAL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags) FINAL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags)

2
compat/Makefile.local
View file

@ -3,7 +3,7 @@
dir := compat dir := compat
extra_cflags += -I$(dir) extra_cflags += -I$(dir)
notmuch_compat_srcs = notmuch_compat_srcs :=
ifneq ($(HAVE_GETLINE),1) ifneq ($(HAVE_GETLINE),1)
notmuch_compat_srcs += $(dir)/getline.c $(dir)/getdelim.c notmuch_compat_srcs += $(dir)/getline.c $(dir)/getdelim.c