verity: upgrade to new common.mk format
Migrates the Makefile format and module.mk to use the
newest common.mk. This also fixes link ordering (thanks vapier@)
Signed-off-by: Will Drewry <wad@chromium.org>
TEST=emerge-x86-alex verity, FEATURES=test emerge-x86-alex verity
BUG=None
Change-Id: I09e80e7730208e5c614bc93fe6348ab652703988
Reviewed-on: https://gerrit.chromium.org/gerrit/15853
Reviewed-by: Sonny Rao <sonnyrao@chromium.org>
Tested-by: Will Drewry <wad@chromium.org>
Commit-Ready: Will Drewry <wad@chromium.org>
diff --git a/Makefile b/Makefile
index f8f5d5a..59a7832 100644
--- a/Makefile
+++ b/Makefile
@@ -7,89 +7,58 @@
# Pull in chromium os defaults
include common.mk
-# Force g++ use.
-#CC = $(CXX)
-
# Prepend with our include
-CFLAGS := -Iinclude $(CFLAGS)
-CXXFLAGS := -Iinclude -I../ $(CXXFLAGS)
+CFLAGS += -I$(SRC)/include -I$(SRC)/..
+CXXFLAGS += -I$(SRC)/include -I$(SRC)/..
# Use openssl for digests
LDFLAGS += -lcrypto
ifneq ($(WITH_CHROME),0)
CXXFLAGS += -DWITH_CHROME=1
- LDFLAGS += -lpthread -lrt -lbase
+ LDFLAGS += -lbase -lpthread -lrt
WITH_CHROME = 1
endif
-# Helper so I can type "make verity" on the prompt
-verity: $(OUT)verity
-
-## Binary target linked against a shared libdm-bht.so
-#$(OUT)verity-l: $(OUT)libdm-bht.so $(OUT)verity_main.o
-# @# Build the target as a binary with extra flags
-# $(call cc_binary,-L$(OUT) -ldm-bht)
-## Adds verity to the default compile
-#all: $(OUT)verity-l
-## Add our targets to get auto-rm'd
-#RM_ON_CLEAN += $(OUT)verity-l
-
# Current toolchain doesn't support -pie statically linked binaries
-$(OUT)verity-static: \
- $(filter-out %_testrunner.o %_unittest.o,$(CXX_OBJECTS)) \
- $(C_OBJECTS) $(OUT)kernel/libkernel-pic.a \
- $(OUT)simple_file/libsimple_file-pic.a \
- $(shell $(CXX) -print-file-name=libcrypto.a) \
- $(shell $(CXX) -print-file-name=libz.a) \
- $(shell $(CXX) -print-file-name=libdl.a) \
- $(shell $(CXX) -print-file-name=libstdc++.a) \
- $(shell $(CXX) -print-file-name=libc.a)
- @# Build the target as a binary with extra flags
- $(call cc_binary,-static)
-all: $(OUT)verity-static
-RM_ON_CLEAN += $(wildcard $(OUT)verity-static)
+CXX_STATIC_BINARY(verity-static): \
+ $(filter-out %_testrunner.o %_unittest.o,$(CXX_OBJECTS)) \
+ $(C_OBJECTS) \
+ CXX_STATIC_LIBRARY(kernel/libkernel.pic.a) \
+ CXX_STATIC_LIBRARY(simple_file/libsimple_file.pic.a) \
+ $(shell $(CXX) -print-file-name=libcrypto.a) \
+ $(shell $(CXX) -print-file-name=libz.a) \
+ $(shell $(CXX) -print-file-name=libdl.a) \
+ $(shell $(CXX) -print-file-name=libstdc++.a) \
+ $(shell $(CXX) -print-file-name=libc.a)
+all: CXX_STATIC_BINARY(verity-static)
+clean: CLEAN(verity-static)
-$(OUT)verity: $(filter-out %_testrunner.o %_unittest.o,$(CXX_OBJECTS)) \
- $(C_OBJECTS) \
- $(OUT)kernel/libkernel-pie.a \
- $(OUT)simple_file/libsimple_file-pie.a
- $(call cxx_binary)
-all: $(OUT)verity
-RM_ON_CLEAN += $(OUT)verity
+CXX_BINARY(verity): $(filter-out %_testrunner.o %_unittest.o,$(CXX_OBJECTS)) \
+ $(C_OBJECTS) \
+ CXX_STATIC_LIBRARY(kernel/libkernel.pie.a) \
+ CXX_STATIC_LIBRARY(simple_file/libsimple_file.pie.a)
+all: CXX_BINARY(verity)
+clean: CLEAN(verity)
-# Current toolchain doesn't support -pie statically linked binaries
-#$(OUT)verity-static: $(C_OBJECTS) $(OUT)kernel/libkernel-pie.a \
-# /usr/lib/libcrypto.a
-# @# Build the target as a binary with extra flags
-# $(call cc_binary,-static)
-#all: $(OUT)verity-static
-#m_clean: $(wildcard $(OUT)verity)
+# Simple helper. Not ideal but here it is.
+verity: CXX_BINARY(verity)
# Shared dm-bht library
-$(OUT)libdm-bht.so: $(filter-out %verity_main.o,$(C_OBJECTS)) \
- $(OUT)kernel/libkernel-pic.a
- $(call cc_library)
-all: $(OUT)libdm-bht.so
-RM_ON_CLEAN += $(OUT)libdm-bht.so
+CXX_LIBRARY(libdm-bht.so): $(filter-out %verity_main.o,$(C_OBJECTS)) \
+ $(kernel_C_OBJECTS)
+all: CXX_LIBRARY(libdm-bht.so)
+clean: CLEAN(libdm-bht.so)
# Tests require libchrome
ifneq ($(WITH_CHROME),0)
# For this project, only the unittests are CXX
- $(OUT)verity_testrunner: $(filter-out %_main.o,$(CXX_OBJECTS)) \
+ CXX_BINARY(verity_testrunner): $(filter-out %_main.o,$(CXX_OBJECTS)) \
$(filter %dm-bht-userspace.o,$(C_OBJECTS)) \
- $(OUT)simple_file/libsimple_file-pie.a \
- $(OUT)kernel/libkernel-pie.a
+ CXX_STATIC_LIBRARY(kernel/libkernel.pie.a) \
+ CXX_STATIC_LIBRARY(simple_file/libsimple_file.pie.a)
$(call cxx_binary,-lgtest -lgmock)
- all: $(OUT)verity_testrunner
- RM_ON_CLEAN += $(OUT)verity_testrunner
- # Will run each prerequisite for tests.
- # If cross-compiled, this is done against the correct architecture.
- small_tests: $(OUT)verity_testrunner
-
- # No large tests here so we use the NONE target.
- large_tests: NONE
-else
- small_tests: NONE
- large_tests: NONE
+ all: CXX_BINARY(verity_testrunner)
+ clean: CLEAN(verity_testrunner)
+ tests: TEST(CXX_BINARY(verity_testrunner))
endif
diff --git a/common.mk b/common.mk
index c1dc71c..4b1071d 100644
--- a/common.mk
+++ b/common.mk
@@ -1,10 +1,21 @@
-# Copyright (C) 2010 The Chromium OS Authors. All rights reserved.
+# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE.makefile file.
+# found in the LICENSE file.
+#
+# If this file is part of another source distribution, it's license may be
+# stored in LICENSE.makefile or LICENSE.common.mk.
+#
+# NOTE NOTE NOTE
+# The authoritative common.mk is located in:
+# http://git.chromium.org/gitweb/?p=chromiumos/platform/common-mk.git
+# Please make all changes there, then copy into place in other repos.
+# NOTE NOTE NOTE
#
# This file provides a common architecture for building C/C++ source trees.
# It uses recursive makefile inclusion to create a single make process which
-# can be built in the source tree or with the build products places elsewhere.
+# can be built in the source tree or with the build artifacts placed elsewhere.
+#
+# It is fully parallelizable for all targets, including static archives.
#
# To use:
# 1. Place common.mk in your top source level
@@ -13,45 +24,74 @@
# include common.mk
# And then contains the remainder of your targets.
# 4. All build targets should look like:
-# $(BUILD)relative/path/target: ...
+# relative/path/target: relative/path/obj.o
#
# See existing makefiles for rule examples.
#
# Exported macros:
# - cc_binary, cxx_binary provide standard compilation steps for binaries
-# - cxx_library, cc_library provide standard compilation steps for sos
+# - cxx_library, cc_library provide standard compilation steps for
+# shared objects.
# All of the above optionally take an argument for extra flags.
# - update_archive creates/updates a given .a target
#
-# Exported variables
-# - RM_ON_CLEAN - append files to remove on calls to clean
-# - RMDIR_ON_CLEAN - append dirs to remove on calls to clean
+# Instead of using the build macros, most users can just use wrapped targets:
+# - CXX_BINARY, CC_BINARY, CC_STATIC_BINARY, CXX_STATIC_BINARY
+# - CXX_LIBRARY, CC_LIBRARY, CC_STATIC_LIBRARY, CXX_STATIC_LIBRARY
+# - E.g., CXX_BINARY(mahbinary): foo.o
+# - object.depends targets may be used when a prerequisite is required for an
+# object file. Because object files result in multiple build artifacts to
+# handle PIC and PIE weirdness. E.g.
+# foo.o.depends: generated/dbus.h
+# - TEST(binary) or TEST(CXX_BINARY(binary)) may be used as a prerequisite
+# for the tests target to trigger an automated test run.
+# - CLEAN(file_or_dir) dependency can be added to 'clean'.
+#
+# If source code is being generated, rules will need to be registered for
+# compiling the objects. This can be done by adding one of the following
+# to the Makefile:
+# - For C source files
+# $(eval $(call add_object_rules,sub/dir/gen_a.o sub/dir/gen_b.o,CC,c))
+# - For C++ source files
+# $(eval $(call add_object_rules,sub/dir/gen_a.o sub/dir/gen_b.o,CXX,cc))
#
# Exported targets meant to have prerequisites added to:
-# - all - Your $(OUT)target should be given
-# - small_tests - requires something, even if it is just NONE
-# - large_tests - requires something, even if it is just NONE
-# - NONE - nop target for *_tests
+# - all - Your desired targets should be given
+# - tests - Any TEST(test_binary) targets should be given
# - FORCE - force the given target to run regardless of changes
+# In most cases, using .PHONY is preferred.
#
# Possible command line variables:
# - COLOR=[0|1] to set ANSI color output (default: 1)
# - VERBOSE=[0|1] to hide/show commands (default: 0)
# - MODE=dbg to turn down optimizations (default: opt)
-# - ARCH=[x86|amd64|arm|supported qemu name]
-# (default: from portage or uname -m)
-# - SPLITDEBUG=[0|1] splits debug info in target.debug (default: 1)
-# [SPLITDEBUG=0 MODE=opt will disable compiling with -g]
+# - ARCH=[x86|arm|supported qemu name] (default: from portage or uname -m)
+# - SPLITDEBUG=[0|1] splits debug info in target.debug (default: 0)
+# If NOSTRIP=1, SPLITDEBUG will never strip the final emitted objects.
+# - NOSTRIP=[0|1] determines if binaries are stripped. (default: 1)
+# NOSTRIP=0 and MODE=opt will also drop -g from the CFLAGS.
# - VALGRIND=[0|1] runs tests under valgrind (default: 0)
-# - OUT=/path/to/builddir puts all output in given path
-# (default: $PWD/build-$MODE. Use OUT=. for normal behavior)
+# - OUT=/path/to/builddir puts all output in given path (default: $PWD)
# - VALGRIND_ARGS="" supplies extra memcheck arguments
#
-# External CXXFLAGS and CFLAGS should be passed via the environment since this
-# file does not use 'override' to control them.
+# Per-target(-ish) variable:
+# - NEEDS_ROOT=[0|1] allows a TEST() target to run with root.
+# Default is 0 unless it is running under QEmu.
+# - NEEDS_MOUNTS=[0|1] allows a TEST() target running on QEmu to get
+# setup mounts in the $(SYSROOT)
+#
+# Caveats:
+# - Directories or files with spaces in them DO NOT get along with GNU Make.
+# If you need them, all uses of dir/notdir/etc will need to have magic
+# wrappers. Proceed at risk to your own sanity.
+# - External CXXFLAGS and CFLAGS should be passed via the environment since
+# this file does not use 'override' to control them.
+# - Our version of GNU Make doesn't seem to support the 'private' variable
+# annotation, so you can't tag a variable private on a wrapping target.
# Behavior configuration variables
-SPLITDEBUG ?= 1
+SPLITDEBUG ?= 0
+NOSTRIP ?= 1
VALGRIND ?= 0
COLOR ?= 1
VERBOSE ?= 0
@@ -59,84 +99,138 @@
ARCH ?= $(shell uname -m)
# TODO: profiling support not completed.
PROFILING ?= 0
+NEEDS_ROOT = 0
+NEEDS_MOUNTS = 0
# Put objects in a separate tree based on makefile locations
# This means you can build a tree without touching it:
-# make -C $SRCDIR # will create ./build
+# make -C $SRCDIR # will create ./build-$(MODE)
# Or
# make -C $SRCDIR OUT=$PWD
# This variable is extended on subdir calls and doesn't need to be re-called.
-OUT ?= $(PWD)/build-$(MODE)/
+OUT ?= $(PWD)/
+
+# Make OUT now so we can use realpath.
+$(shell mkdir -p "$(OUT)")
+
+# TODO(wad) Relative paths are resolved against SRC and not the calling dir.
# Ensure a command-line supplied OUT has a slash
-override OUT := $(abspath $(OUT))/
+override OUT := $(realpath $(OUT))/
+
+# SRC is not meant to be set by the end user, but during make call relocation.
+# $(PWD) != $(CURDIR) all the time.
+export SRC ?= $(CURDIR)
+
+# Re-start in the $(OUT) directory if we're not there.
+# We may be invoked using -C or bare and we need to ensure behavior
+# is consistent so we check both PWD vs OUT and PWD vs CURDIR.
+override RELOCATE_BUILD := 0
+ifneq (${PWD}/,${OUT})
+override RELOCATE_BUILD := 1
+endif
+# Make sure we're running with no builtin targets. They cause
+# leakage and mayhem!
+ifneq (${PWD},${CURDIR})
+override RELOCATE_BUILD := 1
+# If we're run from the build dir, don't let it get cleaned up later.
+ifeq (${PWD}/,${OUT})
+$(shell touch "$(PWD)/.dont_delete_on_clean")
+endif
+endif # ifneq (${PWD},${CURDIR}
+
+# "Relocate" if we need to restart without implicit rules.
+ifeq ($(subst r,,$(MAKEFLAGS)),$(MAKEFLAGS))
+override RELOCATE_BUILD := 1
+endif
+
+ifeq (${RELOCATE_BUILD},1)
+# By default, silence build output. Reused below as well.
+QUIET = @
+ifeq ($(VERBOSE),1)
+ QUIET=
+endif
+
+# This target will override all targets, including prerequisites. To avoid
+# calling $(MAKE) once per prereq on the given CMDGOAL, we guard it with a local
+# variable.
+RUN_ONCE := 0
+MAKECMDGOALS ?= all
+# Keep the rules split as newer make does not allow them to be declared
+# on the same line. But the way :: rules work, the _all here will also
+# invoke the %:: rule while retaining "_all" as the default.
+_all::
+%::
+ $(if $(filter 0,$(RUN_ONCE)), \
+ $(QUIET)mkdir -p "$(OUT)" && \
+ cd $(OUT) && \
+ $(MAKE) -r -I "$(SRC)" -f "$(CURDIR)/Makefile" \
+ SRC="$(CURDIR)" OUT="$(OUT)" $(foreach g,$(MAKECMDGOALS),"$(g)"),)
+ $(eval RUN_ONCE := 1)
+pass-to-subcall := 1
+endif
+
+ifeq ($(pass-to-subcall),)
# Only call MODULE if we're in a submodule
MODULES_LIST := $(filter-out Makefile %.d,$(MAKEFILE_LIST))
-ifeq ($(words $(filter-out Makefile common.mk %.d,$(MAKEFILE_LIST))),0)
-# Setup a top level SRC
-SRC ?= $(PWD)
+ifeq ($(words $(filter-out Makefile common.mk %.d $(SRC)/Makefile \
+ $(SRC)/common.mk,$(MAKEFILE_LIST))),0)
+
+# All the top-level defines outside of module.mk.
#
# Helper macros
#
# Creates the actual archive with an index.
-# $(1) is the object suffix modified: pie or pic.
+# The target $@ must end with .pic.a or .pie.a.
define update_archive
- $(QUIET)mkdir -p $(dir $@)
+ $(QUIET)mkdir -p "$(dir $(TARGET_OR_MEMBER))"
$(QUIET)# Create the archive in one step to avoid parallel use accessing it
$(QUIET)# before all the symbols are present.
- @$(ECHO) "AR $(subst $(PWD)/,,$(^:.o=.$(1).o)) -> $(subst $(PWD)/,,$@)"
- $(QUIET)$(AR) rcs $@ $(^:.o=.$(1).o)
+ @$(ECHO) "AR $(subst \
+$(SRC)/,,$(^:.o=$(suffix $(basename $(TARGET_OR_MEMBER))).o)) \
+-> $(subst $(SRC)/,,$(TARGET_OR_MEMBER))"
+ $(QUIET)$(AR) rcs $(TARGET_OR_MEMBER) \
+ $(subst $(SRC)/,,$(^:.o=$(suffix $(basename $(TARGET_OR_MEMBER))).o))
endef
# Default compile from objects using pre-requisites but filters out
# subdirs and .d files.
define cc_binary
- $(call COMPILE_BINARY_implementation,CC,$(CFLAGS) $(1))
+ $(call COMPILE_BINARY_implementation,CC,$(CFLAGS) $(1),$(EXTRA_FLAGS))
endef
define cxx_binary
- $(call COMPILE_BINARY_implementation,CXX,$(CXXFLAGS) $(1))
+ $(call COMPILE_BINARY_implementation,CXX,$(CXXFLAGS) $(1),$(EXTRA_FLAGS))
endef
# Default compile from objects using pre-requisites but filters out
# subdirs and .d files.
define cc_library
- $(call COMPILE_LIBRARY_implementation,CC,$(CFLAGS) $(1))
+ $(call COMPILE_LIBRARY_implementation,CC,$(CFLAGS) $(1),$(EXTRA_FLAGS))
endef
define cxx_library
- $(call COMPILE_LIBRARY_implementation,CXX,$(CXXFLAGS) $(1))
+ $(call COMPILE_LIBRARY_implementation,CXX,$(CXXFLAGS) $(1),$(EXTRA_FLAGS))
endef
-
# Deletes files silently if they exist. Meant for use in any local
# clean targets.
define silent_rm
- $(QUIET)(test -n "$(wildcard $(1))" && \
- $(ECHO) -n '$(COLOR_RED)CLEANFILE$(COLOR_RESET) ' && \
- $(ECHO) '$(subst $(PWD)/,,$(wildcard $(1)))' && \
- $(RM) -f $(1) 2>/dev/null) || true
+ $(if $(wildcard $(1)),
+ $(QUIET)($(ECHO) -n '$(COLOR_RED)CLEANFILE$(COLOR_RESET) ' && \
+ $(ECHO) '$(subst $(OUT)/,,$(wildcard $(1)))' && \
+ $(RM) $(1) 2>/dev/null) || true,)
endef
define silent_rmdir
- $(QUIET)(test -n "$(wildcard $(1))" && \
- $(ECHO) -n '$(COLOR_RED)CLEANDIR$(COLOR_RESET) ' && \
- $(ECHO) '$(subst $(PWD)/,,$(wildcard $(1)))' && \
- $(RMDIR) $(1) 2>/dev/null) || true
+ $(if $(wildcard $(1)),
+ $(if $(wildcard $(1)/*),
+ $(QUIET)# $(1) not empty [$(wildcard $(1)/*)]. Not deleting.,
+ $(QUIET)($(ECHO) -n '$(COLOR_RED)CLEANDIR$(COLOR_RESET) ' && \
+ $(ECHO) '$(subst $(OUT)/,,$(wildcard $(1)))' && \
+ $(RMDIR) $(1) 2>/dev/null) || true),)
endef
-
-
-#
-# Default variables for use in including makefiles
-#
-
-# All objects for .c files at the top level
-C_OBJECTS := $(patsubst %.c,$(OUT)%.o,$(wildcard *.c))
-
-# All objects for .cxx files at the top level
-CXX_OBJECTS := $(patsubst %.cc,$(OUT)%.o,$(wildcard *.cc))
-
#
# Default variable values
#
@@ -166,29 +260,32 @@
# CXXFLAGS := -mahflag $(CXXFLAGS) # Prepend to the list
# CXXFLAGS := $(filter-out badflag,$(CXXFLAGS)) # Filter out a value
# The same goes for CFLAGS.
-CXXFLAGS := $(CXXFLAGS) -Wall -Werror -fstack-protector-all -DFORTIFY_SOURCE \
- -O2 -ggdb3 -DNDEBUG -Wa,--noexecstack
-CFLAGS := $(CFLAGS) -Wall -Werror -fstack-protector-all -DFORTIFY_SOURCE \
- -O2 -ggdb3 -DNDEBUG -Wa,--noexecstack
+# TODO(wad) Moving to -fvisibility=internal by default would be nice too.
+CXXFLAGS := $(CXXFLAGS) -Wall -Werror -fstack-protector-all \
+ -fno-strict-aliasing -D_FORTIFY_SOURCE=2 -ggdb3 -Wa,--noexecstack -O1 \
+ -fvisibility=internal -Wformat=2
+CFLAGS := $(CFLAGS) -Wall -Werror -fstack-protector-all -fno-strict-aliasing \
+ -DFORTIFY_SOURCE=2 -ggdb3 -Wa,--noexecstack -O1 -fvisibility=internal \
+ -Wformat=2
ifeq ($(PROFILING),1)
- CFLAGS := -pg
+ CFLAGS := -pg
CXXFLAGS := -pg
endif
-ifeq ($(MODE),dbg)
- CFLAGS := $(filter-out -O2 -DNDEBUG,$(CFLAGS)) -O1
- CXXFLAGS := $(filter-out -O2 -DNDEBUG,$(CXXFLAGS)) -O1
- # TODO: May need -nopie. need to check gdb
-else # opt
- ifeq ($(SPLITDEBUG),0)
+ifeq ($(MODE),opt)
+ # Up the optimizations.
+ CFLAGS := $(filter-out -O1,$(CFLAGS)) -O2
+ CXXFLAGS := $(filter-out -O1,$(CXXFLAGS)) -O2
+ # Only drop -g* if symbols aren't desired.
+ ifeq ($(NOSTRIP),0)
# TODO: do we want -fomit-frame-pointer on x86?
CFLAGS := $(filter-out -ggdb3,$(CFLAGS))
CXXFLAGS := $(filter-out -ggdb3,$(CXXFLAGS))
endif
endif
-LDFLAGS := $(LDFLAGS) -Wl,-z,relro -Wl,-z,noexecstack
+LDFLAGS := $(LDFLAGS) -Wl,-z,relro -Wl,-z,noexecstack -Wl,-z,now
# Fancy helpers for color if a prompt is defined
ifeq ($(COLOR),1)
@@ -217,14 +314,25 @@
COMPILE_PIE_FLAG =
endif
+# Favor member targets first for CXX_BINARY(%) magic.
+# And strip out nested members if possible.
+LP := (
+RP := )
+TARGET_OR_MEMBER = $(lastword $(subst $(LP), ,$(subst $(RP),,$(or $%,$@))))
+
# Default compile from objects using pre-requisites but filters out
# all non-.o files.
define COMPILE_BINARY_implementation
- @$(ECHO) "LD$(1) $(subst $(PWD)/,,$@)"
- $(QUIET)$($(1)) $(COMPILE_PIE_FLAGS) -o $@ \
- $(filter %.o %.so %.a,$(^:.o=.pie.o)) $(LDFLAGS) $(2)
- $(call strip_library)
- @$(ECHO) "BIN $(COLOR_GREEN)$(subst $(PWD)/,,$@)$(COLOR_RESET)"
+ @$(ECHO) "LD$(1) $(subst $(PWD)/,,$(TARGET_OR_MEMBER))"
+ $(QUIET)mkdir -p "$(dir $(TARGET_OR_MEMBER))"
+ $(QUIET)$($(1)) $(COMPILE_PIE_FLAGS) -o $(TARGET_OR_MEMBER) \
+ $(filter %.o %.a,$(^:.o=.pie.o)) \
+ $(foreach so,$(filter %.so,$^),-L$(dir $(so)) \
+ -l$(patsubst lib%,%,$(basename $(notdir $(so))))) \
+ $(2) $(LDFLAGS)
+ $(call conditional_strip)
+ @$(ECHO) -n "BIN "
+ @$(ECHO) "$(COLOR_GREEN)$(subst $(PWD)/,,$(TARGET_OR_MEMBER))$(COLOR_RESET)"
@$(ECHO) " $(COLOR_YELLOW)-----$(COLOR_RESET)"
endef
@@ -236,64 +344,203 @@
# Default compile from objects using pre-requisites but filters out
# all non-.o values. (Remember to add -L$(OUT) -llib)
+COMMA := ,
define COMPILE_LIBRARY_implementation
- @$(ECHO) "SHARED$(1) $(subst $(PWD)/,,$@)"
- $(QUIET)$($(1)) -shared -Wl,-E -o $@ \
- $(filter %.o %.so %.a,$(^:.o=.pic.o)) $(2) $(LDFLAGS)
- $(call strip_library)
- @$(ECHO) "LIB $(COLOR_GREEN)$(subst $(PWD)/,,$@)$(COLOR_RESET)"
+ @$(ECHO) "SHARED$(1) $(subst $(PWD)/,,$(TARGET_OR_MEMBER))"
+ $(QUIET)mkdir -p "$(dir $(TARGET_OR_MEMBER))"
+ $(QUIET)$($(1)) -shared -Wl,-E -o $(TARGET_OR_MEMBER) \
+ $(if $(filter %.a,$^),-Wl$(COMMA)--whole-archive,) \
+ $(filter %.o ,$(^:.o=.pic.o)) \
+ $(foreach a,$(filter %.a,$^),-L$(dir $(a)) \
+ -l$(patsubst lib%,%,$(basename $(notdir $(a))))) \
+ $(foreach so,$(filter %.so,$^),-L$(dir $(so)) \
+ -l$(patsubst lib%,%,$(basename $(notdir $(so))))) \
+ $(2) $(LDFLAGS)
+ $(call conditional_strip)
+ @$(ECHO) -n "LIB $(COLOR_GREEN)"
+ @$(ECHO) "$(subst $(PWD)/,,$(TARGET_OR_MEMBER))$(COLOR_RESET)"
@$(ECHO) " $(COLOR_YELLOW)-----$(COLOR_RESET)"
endef
-define strip_library
- @$(ECHO) "STRIP $(subst $(PWD)/,,$@)"
- $(if $(filter 1,$(SPLITDEBUG)), @$(ECHO) -n "DEBUG "; \
- $(ECHO) "$(COLOR_YELLOW)$(subst $(PWD)/,,$@).debug$(COLOR_RESET)")
- $(if $(filter 1,$(SPLITDEBUG)), \
- $(QUIET)$(OBJCOPY) --only-keep-debug "$@" "$@.debug")
- $(if $(filter-out dbg,$(MODE)),$(QUIET)$(STRIP) --strip-unneeded "$@",)
+define conditional_strip
+ $(if $(filter 0,$(NOSTRIP)),$(call strip_artifact))
endef
-define strip_binary
- @$(ECHO) "STRIP $(subst $(PWD)/,,$@)"
+define strip_artifact
+ @$(ECHO) "STRIP $(subst $(OUT)/,,$(TARGET_OR_MEMBER))"
$(if $(filter 1,$(SPLITDEBUG)), @$(ECHO) -n "DEBUG "; \
- $(ECHO) "$(COLOR_YELLOW)$(subst $(PWD)/,,$@).debug$(COLOR_RESET)")
+ $(ECHO) "$(COLOR_YELLOW)\
+$(subst $(OUT)/,,$(TARGET_OR_MEMBER)).debug$(COLOR_RESET)")
$(if $(filter 1,$(SPLITDEBUG)), \
- $(QUIET)$(OBJCOPY) --only-keep-debug "$@" "$@.debug")
- $(if $(filter-out dbg,$(MODE)),$(QUIET)$(STRIP) --strip-unneeded "$@",)
+ $(QUIET)$(OBJCOPY) --only-keep-debug "$(TARGET_OR_MEMBER)" \
+ "$(TARGET_OR_MEMBER).debug")
+ $(if $(filter-out dbg,$(MODE)),$(QUIET)$(STRIP) --strip-unneeded \
+ "$(TARGET_OR_MEMBER)",)
endef
#
-# Pattern rules
+# Global pattern rules
#
-%.o: %.pie.o %.pic.o
- $(QUIET)touch $@
+# Below, the archive member syntax is abused to create fancier
+# syntactic sugar for recipe authors that avoids needed to know
+# subcall options. The downside is that make attempts to look
+# into the phony archives for timestamps. This will cause the final
+# target to be rebuilt/linked on _every_ call to make even when nothing
+# has changed. Until a better way presents itself, we have helpers that
+# do the stat check on make's behalf. Dodgy but simple.
+define old_or_no_timestamp
+ $(if $(realpath $%),,$(1))
+ $(if $(shell find $^ -cnewer "$%" 2>/dev/null),$(1))
+endef
-$(OUT)%.pie.o: %.c
- $(call OBJECT_PATTERN_implementation,CC,$(CFLAGS) $(OBJ_PIE_FLAG))
+define check_deps
+ $(if $(filter 0,$(words $^)),\
+ $(error Missing dependencies or declaration of $@($%)),)
+endef
-$(OUT)%.pic.o: %.c
- $(call OBJECT_PATTERN_implementation,CC,$(CFLAGS) -fPIC)
+# Build a cxx target magically
+CXX_BINARY(%):
+ $(call check_deps)
+ $(call old_or_no_timestamp,$(call cxx_binary))
+clean: CLEAN(CXX_BINARY*)
-$(OUT)%.pie.o: %.cc
- $(call OBJECT_PATTERN_implementation,CXX,$(CXXFLAGS) $(OBJ_PIE_FLAG))
+CC_BINARY(%):
+ $(call check_deps)
+ $(call old_or_no_timestamp,$(call cc_binary))
+clean: CLEAN(CC_BINARY*)
-$(OUT)%.pic.o: %.cc
- $(call OBJECT_PATTERN_implementation,CXX,$(CXXFLAGS) -fPIC)
+CXX_STATIC_BINARY(%):
+ $(call check_deps)
+ $(call old_or_no_timestamp,$(call cxx_binary,-static))
+clean: CLEAN(CXX_STATIC_BINARY*)
+CC_STATIC_BINARY(%):
+ $(call check_deps)
+ $(call old_or_no_timestamp,$(call cc_binary,-static))
+clean: CLEAN(CC_STATIC_BINARY*)
+
+CXX_LIBRARY(%):
+ $(call check_deps)
+ $(call old_or_no_timestamp,$(call cxx_library))
+clean: CLEAN(CXX_LIBRARY*)
+
+CXX_LIBARY(%):
+ $(error Typo alert! LIBARY != LIBRARY)
+
+CC_LIBRARY(%):
+ $(call check_deps)
+ $(call old_or_no_timestamp,$(call cc_library))
+clean: CLEAN(CC_LIBRARY*)
+
+CC_LIBARY(%):
+ $(error Typo alert! LIBARY != LIBRARY)
+
+CXX_STATIC_LIBRARY(%):
+ $(call check_deps)
+ $(call old_or_no_timestamp,$(call update_archive))
+clean: CLEAN(CXX_STATIC_LIBRARY*)
+
+CXX_STATIC_LIBARY(%):
+ $(error Typo alert! LIBARY != LIBRARY)
+
+CC_STATIC_LIBRARY(%):
+ $(call check_deps)
+ $(call old_or_no_timestamp,$(call update_archive))
+clean: CLEAN(CC_STATIC_LIBRARY*)
+
+CC_STATIC_LIBARY(%):
+ $(error Typo alert! LIBARY != LIBRARY)
+
+
+TEST(%): % qemu_chroot_install
+ $(call TEST_implementation)
+.PHONY: TEST
+
+# multiple targets with a wildcard need to share an directory.
+# Don't use this directly it just makes sure the directory is removed _after_
+# the files are.
+CLEANFILE(%):
+ $(call silent_rm,$(TARGET_OR_MEMBER))
+.PHONY: CLEANFILE
+
+CLEAN(%): CLEANFILE(%)
+ $(QUIET)# CLEAN($%) meta-target called
+ $(if $(filter-out $(PWD)/,$(dir $(abspath $(TARGET_OR_MEMBER)))), \
+ $(call silent_rmdir,$(dir $(abspath $(TARGET_OR_MEMBER)))),\
+ $(QUIET)# Not deleting $(dir $(abspath $(TARGET_OR_MEMBER))) yet.)
+.PHONY: CLEAN
+
+#
+# Top-level objects and pattern rules
+#
+
+# All objects for .c files at the top level
+C_OBJECTS = $(patsubst $(SRC)/%.c,%.o,$(wildcard $(SRC)/*.c))
+
+
+# All objects for .cxx files at the top level
+CXX_OBJECTS = $(patsubst $(SRC)/%.cc,%.o,$(wildcard $(SRC)/*.cc))
+
+# Note, the catch-all pattern rules don't work in subdirectories because
+# we're building from the $(OUT) directory. At the top-level (here) they will
+# work, but we go ahead and match using the module form. Then we can place a
+# generic pattern rule to capture leakage from the main Makefile. (Later in the
+# file.)
+#
+# The reason target specific pattern rules work well for modules,
+# MODULE_C_OBJECTS, is because it scopes the behavior to the given target which
+# ensures we get a relative directory offset from $(OUT) which otherwise would
+# not match without further magic on a per-subdirectory basis.
+
+# Creates object file rules. Call with eval.
+# $(1) list of .o files
+# $(2) source type (CC or CXX)
+# $(3) source suffix (cc or c)
+# $(4) source dir: _only_ if $(SRC). Leave blank for obj tree.
+define add_object_rules
+$(patsubst %.o,%.pie.o,$(1)): %.pie.o: $(4)%.$(3) %.o.depends
+ $$(QUIET)mkdir -p "$$(dir $$@)"
+ $$(call OBJECT_PATTERN_implementation,$(2),\
+ $$(basename $$@),$$(CXXFLAGS) $$(OBJ_PIE_FLAG))
+
+$(patsubst %.o,%.pic.o,$(1)): %.pic.o: $(4)%.$(3) %.o.depends
+ $$(QUIET)mkdir -p "$$(dir $$@)"
+ $$(call OBJECT_PATTERN_implementation,$(2),\
+ $$(basename $$@),$$(CXXFLAGS) -fPIC)
+
+# Placeholder for depends
+$(patsubst %.o,%.o.depends,$(1)):
+ $$(QUIET)mkdir -p "$$(dir $$@)"
+ $$(QUIET)touch "$$@"
+
+$(1): %.o: %.pic.o %.pie.o
+ $$(QUIET)mkdir -p "$$(dir $$@)"
+ $$(QUIET)touch "$$@"
+endef
define OBJECT_PATTERN_implementation
- @$(ECHO) "$(subst $(PWD)/,,$(1)) $(subst $(PWD)/,,$<)"
- $(QUIET)mkdir -p $(dir $@)
- $(QUIET)$($(1)) -c -MD -MF $(basename $@).d -o $@ $< $(2)
+ @$(ECHO) "$(1) $(subst $(SRC)/,,$<) -> $(2).o"
+ $(QUIET)mkdir -p "$(dir $(2))"
+ $(QUIET)$($(1)) -c -MD -MF $(2).d $(3) -o $(2).o $<
$(QUIET)# Wrap all the deps in $(wildcard) so a missing header
$(QUIET)# won't cause weirdness. First we remove newlines and \,
$(QUIET)# then wrap it.
$(QUIET)sed -i -e :j -e '$$!N;s|\\\s*\n| |;tj' \
- -e 's|^\(.*\s*:\s*\)\(.*\)$$|\1 $$\(wildcard \2\)|' $(basename $@).d
+ -e 's|^\(.*\s*:\s*\)\(.*\)$$|\1 $$\(wildcard \2\)|' $(2).d
endef
+# Now actually register handlers for C(XX)_OBJECTS.
+$(eval $(call add_object_rules,$(C_OBJECTS),CC,c,$(SRC)/))
+$(eval $(call add_object_rules,$(CXX_OBJECTS),CXX,cc,$(SRC)/))
+
+# Disable default pattern rules to help avoid leakage.
+# These may already be handled by '-r', but let's keep it to be safe.
+%: %.o ;
+%.a: %.o ;
+%.o: %.c ;
+%.o: %.cc ;
+
# NOTE: A specific rule for archive objects is avoided because parallel
# update of the archive causes build flakiness.
# Instead, just make the objects the prerequisites and use update_archive
@@ -305,27 +552,48 @@
#
HOST_ARCH ?= $(shell uname -m)
+override ARCH := $(strip $(ARCH))
+override HOST_ARCH := $(strip $(HOST_ARCH))
# emake will supply "x86" or "arm" for ARCH, but
# if uname -m runs and you get x86_64, then this subst
# will break.
-QEMU_ARCH = $(ARCH)
ifeq ($(subst x86,i386,$(ARCH)),i386)
QEMU_ARCH := $(subst x86,i386,$(ARCH)) # x86 -> i386
else ifeq ($(subst amd64,x86_64,$(ARCH)),x86_64)
QEMU_ARCH := $(subst amd64,x86_64,$(ARCH)) # amd64 -> x86_64
+else
+ QEMU_ARCH = $(ARCH)
endif
+override QEMU_ARCH := $(strip $(QEMU_ARCH))
# If we're cross-compiling, try to use qemu for running the tests.
-QEMU_CMD ?=
ifneq ($(QEMU_ARCH),$(HOST_ARCH))
ifeq ($(SYSROOT),)
$(info SYSROOT not defined. qemu-based testing disabled)
else
# A SYSROOT is assumed for QEmu use.
USE_QEMU ?= 1
+
+ # Allow 64-bit hosts to run 32-bit without qemu.
+ ifeq ($(HOST_ARCH),x86_64)
+ ifeq ($(QEMU_ARCH),i386)
+ USE_QEMU = 0
+ endif
+ endif
endif
+else
+ USE_QEMU ?= 0
endif
+SYSROOT_OUT = $(OUT)
+ifneq ($(SYSROOT),)
+ SYSROOT_OUT = $(subst $(SYSROOT),,$(OUT))
+else
+ # Default to / when all the empty-sysroot logic is done.
+ SYSROOT = /
+endif
+
+
#
# Output full configuration at top level
#
@@ -334,8 +602,10 @@
ifneq ($(MAKECMDGOALS),clean)
$(info build configuration:)
$(info - OUT=$(OUT))
+ $(info - SRC=$(SRC))
$(info - MODE=$(MODE))
$(info - SPLITDEBUG=$(SPLITDEBUG))
+ $(info - NOSTRIP=$(NOSTRIP))
$(info - VALGRIND=$(VALGRIND))
$(info - COLOR=$(COLOR))
$(info - ARCH=$(ARCH))
@@ -355,125 +625,175 @@
$(QUIET)test -n "$^"
# Builds and runs tests for the target arch
-tests: small_tests large_tests
+# Run them in parallel
+tests:
+.PHONY: tests
-small_tests: qemu FORCE
- $(call TEST_implementation)
+qemu_clean:
+ $(call if_qemu,$(call silent_rm,$(OUT)/qemu-$(QEMU_ARCH)))
-large_tests: qemu FORCE
- $(call TEST_implementation)
-
-qemu_clean: FORCE
+qemu_chroot_install:
ifeq ($(USE_QEMU),1)
- $(call silent_rm,$(PWD)/qemu-$(QEMU_ARCH))
+ $(QUIET)$(ECHO) "QEMU Preparing qemu-$(QEMU_ARCH)"
+ $(QUIET)cp -fu /usr/bin/qemu-$(QEMU_ARCH) $(OUT)/qemu-$(QEMU_ARCH)
+ $(QUIET)chmod a+rx $(OUT)/qemu-$(QEMU_ARCH)
endif
-
-qemu: FORCE
-ifeq ($(USE_QEMU),1)
- $(QUIET)$(ECHO) "QEMU Preparing qemu-$(QEMU_ARCH)"
- $(QUIET)cp -f /usr/bin/qemu-$(QEMU_ARCH) $(PWD)/qemu-$(QEMU_ARCH)
- $(QUIET)chmod a+rx $(PWD)/qemu-$(QEMU_ARCH)
-endif
+.PHONY: qemu_clean qemu_chroot_install
-# TODO(wad) separate chroot from qemu to make it possible to cross-compile
-# and test outside of the chroot.
+# TODO(wad) Move to -L $(SYSROOT) and fakechroot when qemu-user
+# doesn't hang traversing /proc from SYSROOT.
+QEMU_CMD =
+ROOT_CMD = $(if $(filter 1,$(NEEDS_ROOT)),sudo , )
+MOUNT_CMD = $(if $(filter 1,$(NEEDS_MOUNTS)),$(ROOT_CMD) mount, \#)
+UMOUNT_CMD = $(if $(filter 1,$(NEEDS_MOUNTS)),$(ROOT_CMD) umount, \#)
+QEMU_LDPATH = $(SYSROOT_LDPATH):/lib64:/lib:/usr/lib64:/usr/lib
+ROOT_CMD_LDPATH = $(SYSROOT_LDPATH):$(SYSROOT)/lib64:
+ROOT_CMD_LDPATH := $(ROOT_CMD_LDPATH):$(SYSROOT)/lib:$(SYSROOT)/usr/lib64:
+ROOT_CMD_LDPATH := $(ROOT_CMD_LDPATH):$(SYSROOT)/usr/lib
ifeq ($(USE_QEMU),1)
- export QEMU_CMD = sudo chroot $(SYSROOT) \
- $(subst $(SYSROOT),,$(PWD))/qemu-$(QEMU_ARCH) \
- -drop-ld-preload \
- -E LD_LIBRARY_PATH="$(SYSROOT_LDPATH)" \
- -E HOME="$(HOME)" --
+ export QEMU_CMD = \
+ sudo chroot $(SYSROOT) $(SYSROOT_OUT)qemu-$(QEMU_ARCH) \
+ -drop-ld-preload \
+ -E LD_LIBRARY_PATH="$(QEMU_LDPATH):$(patsubst $(OUT),,$(LD_DIRS))" \
+ -E HOME="$(HOME)" --
+ # USE_QEMU conditional function
+ define if_qemu
+ $(1)
+ endef
+else
+ ROOT_CMD = $(if $(filter 1,$(NEEDS_ROOT)),sudo, ) \
+ LD_LIBRARY_PATH="$(ROOT_CMD_LDPATH):$(LD_DIRS)"
+ define if_qemu
+ $(2)
+ endef
endif
VALGRIND_CMD =
ifeq ($(VALGRIND),1)
- VALGRIND_CMD = /usr/bin/valgrind --tool=memcheck $(VALGRIND_ARGS) --
+ VALGRIND_CMD = /usr/bin/valgrind --tool=memcheck $(VALGRIND_ARGS) --
endif
define TEST_implementation
- $(QUIET)(test -z "$(filter FORCE qemu,$^)" && \
- $(ECHO) "No '$@' prerequisites defined!") || true
- $(QUIET)test -n "$^"
- $(QUIET)# TODO(wad) take root away after the chroot.
- $(QUIET)test "$(filter NONE,$^)" = "NONE" || \
- ((test "1" = "$(VALGRIND)" && test -n "$(USE_QEMU)" && \
- sudo mkdir -p $(SYSROOT)/proc && \
- sudo mount --bind /proc $(SYSROOT)/proc); \
- (status=0 && for tgt in $(subst $(SYSROOT),,$(filter-out FORCE qemu,$^)); \
- do \
- $(ECHO) "TEST $$tgt"; \
- $(QEMU_CMD) $(VALGRIND_CMD) $$tgt $(GTEST_ARGS); \
- status=$$((status + $$?)); \
- done; (test "1" = "$(VALGRIND)" && test -n "$(USE_QEMU)" && \
- sudo umount $(SYSROOT)/proc); exit $$status))
+ $(QUIET)$(call TEST_setup)
+ $(QUIET)$(call TEST_run)
+ $(QUIET)$(call TEST_teardown)
+ $(QUIET)exit $$(cat $(OUT)$(TARGET_OR_MEMBER).status.test)
endef
-
-# Add the defaults from this dir to rm_clean
-define default_rm_clean
- $(OUT)$(1)*.d $(OUT)$(1)*.o $(OUT)$(1)*.debug
+define TEST_setup
+ @$(ECHO) -n "TEST $(TARGET_OR_MEMBER) "
+ @$(ECHO) "[$(COLOR_YELLOW)SETUP$(COLOR_RESET)]"
+ $(QUIET)# Setup a target-specific results file
+ $(QUIET)(echo 1 > $(OUT)$(TARGET_OR_MEMBER).status.test)
+ $(QUIET)(echo > $(OUT)$(TARGET_OR_MEMBER).cleanup.test)
+ $(QUIET)# No setup if we are not using QEMU
+ $(QUIET)# TODO(wad) this is racy until we use a vfs namespace
+ $(call if_qemu,\
+ $(QUIET)sudo mkdir -p "$(SYSROOT)/proc" "$(SYSROOT)/dev")
+ $(call if_qemu,\
+ $(QUIET)$(MOUNT_CMD) --bind /proc "$(SYSROOT)/proc")
+ $(call if_qemu,\
+ $(QUIET)$(MOUNT_CMD) --bind /dev "$(SYSROOT)/dev")
+ $(call if_qemu,\
+ $(QUIET)(echo "$(UMOUNT_CMD) -l '$(SYSROOT)/proc'" \
+ >> "$(OUT)$(TARGET_OR_MEMBER).cleanup.test"))
+ $(call if_qemu,\
+ $(QUIET)(echo "$(UMOUNT_CMD) -l '$(SYSROOT)/dev'" \
+ >> "$(OUT)$(TARGET_OR_MEMBER).cleanup.test"))
endef
-# Start with the defaults
-RM_ON_CLEAN = $(call default_rm_clean)
-RMDIR_ON_CLEAN = $(OUT)
+define TEST_teardown
+ @$(ECHO) -n "TEST $(TARGET_OR_MEMBER) "
+ @$(ECHO) "[$(COLOR_YELLOW)TEARDOWN$(COLOR_RESET)]"
+ $(call if_qemu, $(QUIET)$(SHELL) "$(OUT)$(TARGET_OR_MEMBER).cleanup.test")
+endef
+
+# Use GTEST_ARGS.[arch] if defined.
+override GTEST_ARGS.real = \
+ $(call if_qemu,$(GTEST_ARGS.qemu.$(QEMU_ARCH)),$(GTEST_ARGS.host.$(HOST_ARCH)))
+
+define TEST_run
+ @$(ECHO) -n "TEST $(TARGET_OR_MEMBER) "
+ @$(ECHO) "[$(COLOR_GREEN)RUN$(COLOR_RESET)]"
+ $(QUIET)(echo 1 > "$(OUT)$(TARGET_OR_MEMBER).status.test")
+ -($(ROOT_CMD) $(QEMU_CMD) $(VALGRIND_CMD) \
+ "$(strip $(call if_qemu, $(SYSROOT_OUT),$(OUT))$(TARGET_OR_MEMBER))" \
+ $(if $(filter-out 0,$(words $(GTEST_ARGS.real))),$(GTEST_ARGS.real),\
+ $(GTEST_ARGS)) && \
+ echo 0 > "$(OUT)$(TARGET_OR_MEMBER).status.test")
+endef
# Recursive list reversal so that we get RMDIR_ON_CLEAN in reverse order.
define reverse
$(if $(1),$(call reverse,$(wordlist 2,$(words $(1)),$(1)))) $(firstword $(1))
endef
-rm_clean: FORCE
- $(call silent_rm,$(RM_ON_CLEAN))
+clean: qemu_clean
+clean: CLEAN($(OUT)*.d) CLEAN($(OUT)*.o) CLEAN($(OUT)*.debug)
+clean: CLEAN($(OUT)*.test) CLEAN($(OUT)*.depends)
-rmdir_clean: FORCE rm_clean
- $(call silent_rmdir,$(call reverse,$(RMDIR_ON_CLEAN)))
-
-clean: qemu_clean rmdir_clean
+clean:
+ $(QUIET)# Always delete the containing directory last.
+ $(call silent_rmdir,$(OUT))
FORCE: ;
# Empty rule for use when no special targets are needed, like large_tests
NONE:
-
-.PHONY: clean NONE qemu_clean valgrind rm_clean rmdir_clean
+
+.PHONY: clean NONE valgrind NONE
.DEFAULT_GOAL := all
# Don't let make blow away "intermediates"
-.PRECIOUS: $(OUT)%.pic.o $(OUT)%.pie.o
+.PRECIOUS: %.pic.o %.pie.o %.a %.pic.a %.pie.a %.test
# Start accruing build info
OUT_DIRS = $(OUT)
-SRC_DIRS = .
+LD_DIRS = $(OUT)
+SRC_DIRS = $(SRC)
include $(wildcard $(OUT)*.d)
-SUBMODULE_DIRS = $(wildcard */module.mk)
+SUBMODULE_DIRS = $(wildcard $(SRC)/*/module.mk)
include $(SUBMODULE_DIRS)
+
else ## In duplicate inclusions of common.mk
# Get the current inclusion directory without a trailing slash
MODULE := $(patsubst %/,%, \
$(dir $(lastword $(filter-out %common.mk,$(MAKEFILE_LIST)))))
+MODULE := $(subst $(SRC)/,,$(MODULE))
MODULE_NAME := $(subst /,_,$(MODULE))
+#VPATH := $(MODULE):$(VPATH)
+
# Depth first
-$(eval OUT_DIRS += $(OUT)/$(MODULE))
-$(eval SRC_DIRS += $(MODULE))
+$(eval OUT_DIRS += $(OUT)$(MODULE))
+$(eval SRC_DIRS += $(OUT)$(MODULE))
+$(eval LD_DIRS := $(LD_DIRS):$(OUT)$(MODULE))
# Add the defaults from this dir to rm_clean
-$(eval RM_ON_CLEAN += $(call default_rm_clean,$(MODULE)/))
-$(eval RMDIR_ON_CLEAN += $(wildcard $(OUT)$(MODULE)/))
+clean: CLEAN($(OUT)$(MODULE)/*.d) CLEAN($(OUT)$(MODULE)/*.o)
+clean: CLEAN($(OUT)$(MODULE)/*.debug) CLEAN($(OUT)$(MODULE)/*.test)
+clean: CLEAN($(OUT)$(MODULE)/*.depends)
$(info + submodule: $(MODULE_NAME))
# We must eval otherwise they may be dropped.
-$(eval $(MODULE_NAME)_C_OBJECTS ?= \
- $(patsubst %.c,$(OUT)%.o,$(wildcard $(MODULE)/*.c)))
-$(eval $(MODULE_NAME)_CXX_OBJECTS ?= \
- $(patsubst %.cc,$(OUT)%.o,$(wildcard $(MODULE)/*.cc)))
+MODULE_C_OBJECTS = $(patsubst $(SRC)/$(MODULE)/%.c,$(MODULE)/%.o,\
+ $(wildcard $(SRC)/$(MODULE)/*.c))
+$(eval $(MODULE_NAME)_C_OBJECTS ?= $(MODULE_C_OBJECTS))
+MODULE_CXX_OBJECTS = $(patsubst $(SRC)/$(MODULE)/%.cc,$(MODULE)/%.o,\
+ $(wildcard $(SRC)/$(MODULE)/*.cc))
+$(eval $(MODULE_NAME)_CXX_OBJECTS ?= $(MODULE_CXX_OBJECTS))
+
+# Note, $(MODULE) is implicit in the path to the %.c.
+# See $(C_OBJECTS) for more details.
+# Register rules for the module objects.
+$(eval $(call add_object_rules,$(MODULE_C_OBJECTS),CC,c,$(SRC)/))
+$(eval $(call add_object_rules,$(MODULE_CXX_OBJECTS),CXX,cc,$(SRC)/))
# Continue recursive inclusion of module.mk files
-SUBMODULE_DIRS = $(wildcard $(MODULE)/*/module.mk)
-
+SUBMODULE_DIRS = $(wildcard $(SRC)/$(MODULE)/*/module.mk)
include $(wildcard $(OUT)$(MODULE)/*.d)
include $(SUBMODULE_DIRS)
-endif
+endif
+endif ## pass-to-subcall wrapper for relocating the call directory
diff --git a/kernel/module.mk b/kernel/module.mk
index fcfc0a9..3f12edc 100644
--- a/kernel/module.mk
+++ b/kernel/module.mk
@@ -4,12 +4,6 @@
include common.mk
-$(OUT)kernel/libkernel-pic.a: $(kernel_C_OBJECTS)
- $(call update_archive,pic)
-$(OUT)kernel/libkernel-pie.a: $(kernel_C_OBJECTS)
- $(call update_archive,pie)
-
-# Add our target
-all: $(OUT)kernel/libkernel-pie.a $(OUT)kernel/libkernel-pic.a
-# Ditto
-RM_ON_CLEAN += $(OUT)kernel/libkernel-*.a
+CXX_STATIC_LIBRARY(kernel/libkernel.pic.a): $(kernel_C_OBJECTS)
+CXX_STATIC_LIBRARY(kernel/libkernel.pie.a): $(kernel_C_OBJECTS)
+clean: CLEAN(kernel/libkernel.pic.a) CLEAN(kernel/libkernel.pie.a)
diff --git a/simple_file/module.mk b/simple_file/module.mk
index b154e90..d2f35b0 100644
--- a/simple_file/module.mk
+++ b/simple_file/module.mk
@@ -4,16 +4,7 @@
include common.mk
-$(OUT)simple_file/libsimple_file-pie.a: $(simple_file_CXX_OBJECTS)
- $(call update_archive,pie)
-
-$(OUT)simple_file/libsimple_file-pic.a: $(simple_file_CXX_OBJECTS)
- $(call update_archive,pic)
-
-
-# Add our target
-all: $(OUT)simple_file/libsimple_file-pie.a
-all: $(OUT)simple_file/libsimple_file-pic.a
-# Ditto
-RM_ON_CLEAN += $(OUT)simple_file/libsimple_file-pie.a
-RM_ON_CLEAN += $(OUT)simple_file/libsimple_file-pic.a
+CXX_STATIC_LIBRARY(simple_file/libsimple_file.pie.a): $(simple_file_CXX_OBJECTS)
+CXX_STATIC_LIBRARY(simple_file/libsimple_file.pic.a): $(simple_file_CXX_OBJECTS)
+clean: CLEAN(simple_file/libsimple_file.pic.a)
+clean: CLEAN(simple_file/libsimple_file.pie.a)
