diff options
| author | Vladislav Valtchev (VMware) <vladislav.valtchev@gmail.com> | 2018-02-06 10:49:04 +0200 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2018-02-07 15:08:57 -0500 |
| commit | 0d7a907cf8bf2beb18c393269efaf1f54a11e312 (patch) | |
| tree | 25ef6cf3df1c93754fd8ac882e8d9137391edab3 /tracecmd | |
| parent | e8475feb26500cf49298956e5f0262677dbbc173 (diff) | |
| download | trace-cmd-0d7a907cf8bf2beb18c393269efaf1f54a11e312.tar.gz | |
trace-cmd: Make the trace-cmd target buildable out-of-tree
This patch allows the trace-cmd app to be buildable out-of-tree when the 'O'
variable is set at command line while invoking make.
At this stage, when the 'O' variable is set, the out-of-tree build will fail
for some targets like 'gui' (as it *already* happens on the master branch): with
this patch the final goal of a fully working out-of-tree build gets closer.
In successive steps, the remaining Makefiles will be made to support out-of-tree
builds, until everything works.
NOTE: the regular in-tree build of all targets clearly continues to work.
Signed-off-by: Vladislav Valtchev (VMware) <vladislav.valtchev@gmail.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Diffstat (limited to 'tracecmd')
| -rw-r--r-- | tracecmd/Makefile | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/tracecmd/Makefile b/tracecmd/Makefile index 860dc895..3a11024f 100644 --- a/tracecmd/Makefile +++ b/tracecmd/Makefile @@ -3,8 +3,10 @@ VERSION := $(TC_VERSION) PATCHLEVEL := $(TC_PATCHLEVEL) EXTRAVERSION := $(TC_EXTRAVERSION) -TC_VERSION := $(obj)/tracecmd/include/tc_version.h -TARGETS = trace-cmd $(TC_VERSION) +bdir:=$(obj)/tracecmd + +TC_VERSION := $(bdir)/include/tc_version.h +TARGETS = $(bdir)/trace-cmd $(TC_VERSION) BUILDGUI := 0 include $(src)/scripts/utils.mk @@ -31,10 +33,10 @@ TRACE_CMD_OBJS += trace-output.o TRACE_CMD_OBJS += trace-usage.o TRACE_CMD_OBJS += trace-msg.o -ALL_OBJS = $(TRACE_CMD_OBJS) +ALL_OBJS := $(TRACE_CMD_OBJS:%.o=$(bdir)/%.o) all_objs := $(sort $(ALL_OBJS)) -all_deps := $(all_objs:%.o=.%.d) +all_deps := $(all_objs:$(bdir)/%.o=$(bdir)/.%.d) CONFIG_INCLUDES = CONFIG_LIBS = @@ -42,23 +44,32 @@ CONFIG_FLAGS = all: $(TARGETS) -$(TC_VERSION): force +$(bdir): + @mkdir -p $(bdir) + +$(bdir)/include: | $(bidr) + @mkdir -p $(bdir)/include + +$(TC_VERSION): force | $(bdir)/include $(Q)$(call update_version.h) -trace-cmd: $(ALL_OBJS) +$(all_deps): | $(bdir) +$(all_objs): | $(bdir) + +$(bdir)/trace-cmd: $(ALL_OBJS) $(Q)$(do_app_build) -trace-cmd: $(LIBTRACECMD_STATIC) $(LIBTRACEEVENT_STATIC) +$(bdir)/trace-cmd: $(LIBTRACECMD_STATIC) $(LIBTRACEEVENT_STATIC) -%.o: %.c +$(bdir)/%.o: %.c $(Q)$(call do_compile) -$(all_deps): .%.d: %.c +$(all_deps): $(bdir)/.%.d: %.c $(Q)$(CC) -M $(CPPFLAGS) $(CFLAGS) $< > $@ $(all_deps): $(TC_VERSION) -$(all_objs): %.o : .%.d +$(all_objs): $(bdir)/%.o : $(bdir)/.%.d dep_includes := $(wildcard $(DEPS)) @@ -67,7 +78,7 @@ ifneq ($(dep_includes),) endif clean: - $(RM) *.a *.so *.o .*.d $(TARGETS) + $(RM) $(bdir)/*.a $(bdir)/*.so $(bdir)/*.o $(bdir)/.*.d $(TARGETS) force: .PHONY: clean |