aboutsummaryrefslogtreecommitdiffhomepage
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Aaron Ecay <aaronecay@gmail.com>2010-04-11 19:44:52 -0400
committerGravatar Carl Worth <cworth@cworth.org>2010-04-14 10:46:36 -0700
commitc10085c77b407d9ea704f8b4f9e0a805f63e72cb (patch)
treef85057a74d2a22531f17ae0148cf991f4a2b13ff /Makefile
parent16f0e7dcf4dc42f9637fdc82f887761b246b98c9 (diff)
Fix up Makefile for build.
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>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 8 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 076efc79..faaaec64 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,13 @@ subdirs = compat completion emacs lib
global_deps = Makefile 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
# real work is done.
-include Makefile.local $(subdirs:%=%/Makefile.local)
+
+include $(subdirs:%=%/Makefile.local) Makefile.local