On Fri, 9 Aug 2019 13:22:29 +0000 Tzvetomir Stoyanov <tstoyanov@xxxxxxxxxx> wrote: > > > +$(TC_VERSION): force | $(bdir)/include > > > + $(Q)$(call update_version.h) > > > + > > > > Hi Ceco, > > > > Why the addition of TC_VERISON here? It's not stated in the change log > > to why this was copied over. I ever removed all references from > > TC_VERSION and it still builds fine. > > > > -- Steve > > > There is a dependency: trace-output.c includes version.h, which > includes tc_version.h. > When trace-output.c is moved to the lib/trace-cmd directory, it > includes tc_version.h from > lib/trace-cmd/include. It makes sense, otherwise the libtracecmd will > depend on the trace-cmd > application. That's why I duplicated that TC_VERISON logic in > lib/trace-cmd/Makefile. It > forces lib/trace-cmd/include/tc_version.h to be generated on every > libtracecmd build. Yeah, we can't have that. > Now we have two auto generated files: > lib/trace-cmd/include/tc_version.h > tracecmd/include/tc_version.h > > May be we should move tc_version.h to be generated in include/, so we > can use the same file from > both the application and the library ? I looked at why we have version.h there, and it's to get FILE_VERSION_STRING, which is only used in trace-output.c. And this is created via the Makefile. Hmm, we may need to move all the file version logic into lib/trace-event as the only files that should ever care about this is trace-output.c and trace-input.c, which are both in the lib/trace-event (not something trace-cmd should worry about). -- Steve > > > > > > $(bdir)/libtracecmd.a: $(OBJS) > > > $(Q)$(call do_build_static_lib) > > > > > > @@ -43,6 +49,8 @@ $(bdir)/trace-util.o: $(obj)/plugins/trace_plugin_dir > > > $(DEPS): $(bdir)/.%.d: %.c > > > $(Q)$(CC) -M $(CPPFLAGS) $(CFLAGS) $< > $@ > > > > > > +$(DEPS): $(TC_VERSION) > > > + > > > $(OBJS): $(bdir)/%.o : $(bdir)/.%.d > > > > > > dep_includes := $(wildcard $(DEPS)) > > > @@ -54,4 +62,5 @@ endif > > > clean: > > > $(RM) $(bdir)/*.a $(bdir)/*.so $(bdir)/*.o $(bdir)/.*.d > > > > > > +force: > > > .PHONY: clean > > > diff --git a/tracecmd/trace-output.c b/lib/trace-cmd/trace-output.c > > > similarity index 100% > > > rename from tracecmd/trace-output.c > > > rename to lib/trace-cmd/trace-output.c > > > diff --git a/tracecmd/Makefile b/tracecmd/Makefile > > > index bcd437a..6968f83 100644 > > > --- a/tracecmd/Makefile > > > +++ b/tracecmd/Makefile > > > @@ -29,7 +29,6 @@ TRACE_CMD_OBJS += trace-restore.o > > > TRACE_CMD_OBJS += trace-check-events.o > > > TRACE_CMD_OBJS += trace-show.o > > > TRACE_CMD_OBJS += trace-list.o > > > -TRACE_CMD_OBJS += trace-output.o > > > TRACE_CMD_OBJS += trace-usage.o > > > TRACE_CMD_OBJS += trace-msg.o > > > > > > >
|