|
@@ -105,7 +105,7 @@ ifeq ($(config),1)
|
|
include config/Makefile
|
|
include config/Makefile
|
|
endif
|
|
endif
|
|
|
|
|
|
-export prefix bindir sharedir sysconfdir
|
|
|
|
|
|
+export prefix bindir sharedir sysconfdir DESTDIR
|
|
|
|
|
|
# sparse is architecture-neutral, which means that we need to tell it
|
|
# sparse is architecture-neutral, which means that we need to tell it
|
|
# explicitly what architecture to check for. Fix this up for yours..
|
|
# explicitly what architecture to check for. Fix this up for yours..
|
|
@@ -710,13 +710,20 @@ $(LIB_FILE): $(LIB_OBJS)
|
|
# libtraceevent.a
|
|
# libtraceevent.a
|
|
TE_SOURCES = $(wildcard $(TRACE_EVENT_DIR)*.[ch])
|
|
TE_SOURCES = $(wildcard $(TRACE_EVENT_DIR)*.[ch])
|
|
|
|
|
|
-$(LIBTRACEEVENT): $(TE_SOURCES)
|
|
|
|
- $(QUIET_SUBDIR0)$(TRACE_EVENT_DIR) $(QUIET_SUBDIR1) O=$(OUTPUT) CFLAGS="-g -Wall $(EXTRA_CFLAGS)" libtraceevent.a
|
|
|
|
|
|
+LIBTRACEEVENT_FLAGS = $(QUIET_SUBDIR1) O=$(OUTPUT)
|
|
|
|
+LIBTRACEEVENT_FLAGS += CFLAGS="-g -Wall $(EXTRA_CFLAGS)"
|
|
|
|
+LIBTRACEEVENT_FLAGS += plugin_dir=$(plugindir_SQ)
|
|
|
|
+
|
|
|
|
+$(LIBTRACEEVENT): $(TE_SOURCES) $(OUTPUT)PERF-CFLAGS
|
|
|
|
+ $(QUIET_SUBDIR0)$(TRACE_EVENT_DIR) $(LIBTRACEEVENT_FLAGS) libtraceevent.a plugins
|
|
|
|
|
|
$(LIBTRACEEVENT)-clean:
|
|
$(LIBTRACEEVENT)-clean:
|
|
$(call QUIET_CLEAN, libtraceevent)
|
|
$(call QUIET_CLEAN, libtraceevent)
|
|
@$(MAKE) -C $(TRACE_EVENT_DIR) O=$(OUTPUT) clean >/dev/null
|
|
@$(MAKE) -C $(TRACE_EVENT_DIR) O=$(OUTPUT) clean >/dev/null
|
|
|
|
|
|
|
|
+install-traceevent-plugins:
|
|
|
|
+ $(QUIET_SUBDIR0)$(TRACE_EVENT_DIR) $(LIBTRACEEVENT_FLAGS) install_plugins
|
|
|
|
+
|
|
LIBLK_SOURCES = $(wildcard $(LK_PATH)*.[ch])
|
|
LIBLK_SOURCES = $(wildcard $(LK_PATH)*.[ch])
|
|
|
|
|
|
# if subdir is set, we've been called from above so target has been built
|
|
# if subdir is set, we've been called from above so target has been built
|
|
@@ -785,7 +792,7 @@ cscope:
|
|
|
|
|
|
### Detect prefix changes
|
|
### Detect prefix changes
|
|
TRACK_CFLAGS = $(subst ','\'',$(CFLAGS)):\
|
|
TRACK_CFLAGS = $(subst ','\'',$(CFLAGS)):\
|
|
- $(bindir_SQ):$(perfexecdir_SQ):$(template_dir_SQ):$(prefix_SQ)
|
|
|
|
|
|
+ $(bindir_SQ):$(perfexecdir_SQ):$(template_dir_SQ):$(prefix_SQ):$(plugindir_SQ)
|
|
|
|
|
|
$(OUTPUT)PERF-CFLAGS: .FORCE-PERF-CFLAGS
|
|
$(OUTPUT)PERF-CFLAGS: .FORCE-PERF-CFLAGS
|
|
@FLAGS='$(TRACK_CFLAGS)'; \
|
|
@FLAGS='$(TRACK_CFLAGS)'; \
|
|
@@ -849,7 +856,7 @@ endif
|
|
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr'; \
|
|
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr'; \
|
|
$(INSTALL) tests/attr/* '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr'
|
|
$(INSTALL) tests/attr/* '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr'
|
|
|
|
|
|
-install: install-bin try-install-man
|
|
|
|
|
|
+install: install-bin try-install-man install-traceevent-plugins
|
|
|
|
|
|
install-python_ext:
|
|
install-python_ext:
|
|
$(PYTHON_WORD) util/setup.py --quiet install --root='/$(DESTDIR_SQ)'
|
|
$(PYTHON_WORD) util/setup.py --quiet install --root='/$(DESTDIR_SQ)'
|