diff options
author | Steven Rostedt <srostedt@redhat.com> | 2009-12-31 17:21:52 -0500 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2009-12-31 17:21:52 -0500 |
commit | 53b43d308e644a77829977cbd2bd123a6bc64260 (patch) | |
tree | 8a701de915a01d63150fc8e1bd9092577a014f12 /Makefile | |
parent | 0a0bfaa72b4ff1af4fa0fd75128a31dcd326dbb7 (diff) | |
parent | 05e0559ecaff29d65a478e85addef12cf9d1a81b (diff) |
Merge branch 'trace-cmd' into trace-view
Conflicts:
Makefile
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 19 |
1 files changed, 14 insertions, 5 deletions
@@ -18,8 +18,11 @@ CFLAGS = -g -Wall $(CONFIG_FLAGS) | |||
18 | %.o: %.c | 18 | %.o: %.c |
19 | $(CC) -c $(CFLAGS) $(EXT) $(INCLUDES) $< -o $@ | 19 | $(CC) -c $(CFLAGS) $(EXT) $(INCLUDES) $< -o $@ |
20 | 20 | ||
21 | TARGETS = libparsevent.a libtracecmd.a trace-cmd plugin_hrtimer.so plugin_mac80211.so \ | 21 | PLUGINS = plugin_hrtimer.so plugin_mac80211.so plugin_sched_switch.so \ |
22 | plugin_sched_switch.so trace-graph trace-view kernelshark | 22 | plugin_kmem.so |
23 | |||
24 | TARGETS = libparsevent.a libtracecmd.a trace-cmd $(PLUGINS) \ | ||
25 | trace-graph trace-view kernelshark | ||
23 | 26 | ||
24 | all: $(TARGETS) | 27 | all: $(TARGETS) |
25 | 28 | ||
@@ -99,19 +102,25 @@ libtracecmd.so: $(TCMD_LIB_OBJS) | |||
99 | libtracecmd.a: $(TCMD_LIB_OBJS) | 102 | libtracecmd.a: $(TCMD_LIB_OBJS) |
100 | $(RM) $@; $(AR) rcs $@ $^ | 103 | $(RM) $@; $(AR) rcs $@ $^ |
101 | 104 | ||
102 | plugin_hrtimer.o: plugin_hrtimer.c parse-events.h | 105 | plugin_hrtimer.o: plugin_hrtimer.c parse-events.h trace-cmd.h |
103 | $(CC) -c $(CFLAGS) -fPIC -o $@ $< | 106 | $(CC) -c $(CFLAGS) -fPIC -o $@ $< |
104 | 107 | ||
105 | plugin_hrtimer.so: plugin_hrtimer.o | 108 | plugin_hrtimer.so: plugin_hrtimer.o |
106 | $(CC) -shared -nostartfiles -o $@ $< | 109 | $(CC) -shared -nostartfiles -o $@ $< |
107 | 110 | ||
108 | plugin_sched_switch.o: plugin_sched_switch.c parse-events.h | 111 | plugin_kmem.o: plugin_kmem.c parse-events.h trace-cmd.h |
112 | $(CC) -c $(CFLAGS) -fPIC -o $@ $< | ||
113 | |||
114 | plugin_kmem.so: plugin_kmem.o | ||
115 | $(CC) -shared -nostartfiles -o $@ $< | ||
116 | |||
117 | plugin_sched_switch.o: plugin_sched_switch.c parse-events.h trace-cmd.h | ||
109 | $(CC) -c $(CFLAGS) -fPIC -o $@ $< | 118 | $(CC) -c $(CFLAGS) -fPIC -o $@ $< |
110 | 119 | ||
111 | plugin_sched_switch.so: plugin_sched_switch.o | 120 | plugin_sched_switch.so: plugin_sched_switch.o |
112 | $(CC) -shared -nostartfiles -o $@ $< | 121 | $(CC) -shared -nostartfiles -o $@ $< |
113 | 122 | ||
114 | plugin_mac80211.o: plugin_mac80211.c parse-events.h | 123 | plugin_mac80211.o: plugin_mac80211.c parse-events.h trace-cmd.h |
115 | $(CC) -c $(CFLAGS) -fPIC -o $@ $< | 124 | $(CC) -c $(CFLAGS) -fPIC -o $@ $< |
116 | 125 | ||
117 | plugin_mac80211.so: plugin_mac80211.o | 126 | plugin_mac80211.so: plugin_mac80211.o |