diff options
author | Steven Rostedt <srostedt@redhat.com> | 2010-06-07 10:13:52 -0400 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2010-06-07 10:13:52 -0400 |
commit | 0cb912f09e407aaa9cd8b652bcaf662abc1b29bc (patch) | |
tree | 584c19b003d846e09490e839d1348f87c404fa47 | |
parent | b31973ab0712758efc041c1ce09bc1fa6bc9fc67 (diff) |
build: Use file names in BUILD_PYTHON macro
The BUILD_PYTHON macro is added to the CMD_TARGETS which is used
also by 'make clean'. This requires that BUILD_PYTHON have the actual
files that are built instead of the target names.
Reported-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rw-r--r-- | Makefile | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -47,10 +47,13 @@ ifndef VERBOSE | |||
47 | VERBOSE = 0 | 47 | VERBOSE = 0 |
48 | endif | 48 | endif |
49 | 49 | ||
50 | PYTHON := ctracecmd.so | ||
51 | PYTHON_GUI := ctracecmd.so ctracecmdgui.so | ||
52 | |||
50 | # Can build python? | 53 | # Can build python? |
51 | ifeq ($(shell sh -c "python-config --includes > /dev/null 2>&1 && echo y"), y) | 54 | ifeq ($(shell sh -c "python-config --includes > /dev/null 2>&1 && echo y"), y) |
52 | PYTHON_PLUGINS := plugin_python.so | 55 | PYTHON_PLUGINS := plugin_python.so |
53 | BUILD_PYTHON := python python-plugin | 56 | BUILD_PYTHON := $(PYTHON) $(PYTHON_PLUGINS) |
54 | PYTHON_SO_INSTALL := ctracecmd.install | 57 | PYTHON_SO_INSTALL := ctracecmd.install |
55 | PYTHON_PY_INSTALL := event-viewer.install tracecmd.install tracecmdgui.install | 58 | PYTHON_PY_INSTALL := event-viewer.install tracecmd.install tracecmdgui.install |
56 | endif | 59 | endif |
@@ -479,13 +482,13 @@ ctracecmdgui.so: $(TRACE_VIEW_OBJS) $(LIB_FILE) | |||
479 | $(CC) --shared $^ $(LIBS) $(CONFIG_LIBS) ctracecmdgui_wrap.o -o ctracecmdgui.so | 482 | $(CC) --shared $^ $(LIBS) $(CONFIG_LIBS) ctracecmdgui_wrap.o -o ctracecmdgui.so |
480 | 483 | ||
481 | PHONY += python | 484 | PHONY += python |
482 | python: ctracecmd.so | 485 | python: $(PYTHON) |
483 | 486 | ||
484 | PHONY += python-gui | 487 | PHONY += python-gui |
485 | python-gui: ctracecmd.so ctracecmdgui.so | 488 | python-gui: $(PYTHON_GUI) |
486 | 489 | ||
487 | PHONY += python-plugin | 490 | PHONY += python-plugin |
488 | python-plugin: plugin_python.so python | 491 | python-plugin: $(PYTHON_PLUGINs) |
489 | 492 | ||
490 | CFLAGS_plugin_python.o += $(PYTHON_DIR_SQ) | 493 | CFLAGS_plugin_python.o += $(PYTHON_DIR_SQ) |
491 | 494 | ||