Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Side by Side Diff: init/Makefile.am

Issue 524041: Changes to make upstart log performance stats to a file. (Closed)
Patch Set: More tab/space stuff Created 10 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « debian/changelog ('k') | init/Makefile.in » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 ## Process this file with automake to produce Makefile.in 1 ## Process this file with automake to produce Makefile.in
2 2
3 initconfdir = $(sysconfdir)/init 3 initconfdir = $(sysconfdir)/init
4 4
5 AM_CFLAGS = \ 5 AM_CFLAGS = \
6 $(DBUS_CFLAGS) 6 $(DBUS_CFLAGS)
7 7
8 AM_CPPFLAGS = \ 8 AM_CPPFLAGS = \
9 -DLOCALEDIR="\"$(localedir)\"" \ 9 -DLOCALEDIR="\"$(localedir)\"" \
10 -DCONFFILE="\"$(sysconfdir)/init.conf\"" \ 10 -DCONFFILE="\"$(sysconfdir)/init.conf\"" \
(...skipping 30 matching lines...) Expand all
41 job_class.c job_class.h \ 41 job_class.c job_class.h \
42 job_process.c job_process.h \ 42 job_process.c job_process.h \
43 job.c job.h \ 43 job.c job.h \
44 event.c event.h \ 44 event.c event.h \
45 event_operator.c event_operator.h \ 45 event_operator.c event_operator.h \
46 blocked.c blocked.h \ 46 blocked.c blocked.h \
47 parse_job.c parse_job.h \ 47 parse_job.c parse_job.h \
48 parse_conf.c parse_conf.h \ 48 parse_conf.c parse_conf.h \
49 conf.c conf.h \ 49 conf.c conf.h \
50 control.c control.h \ 50 control.c control.h \
51 perf_log.c perf_log.h \
51 errors.h 52 errors.h
52 nodist_init_SOURCES = \ 53 nodist_init_SOURCES = \
53 $(com_ubuntu_Upstart_OUTPUTS) \ 54 $(com_ubuntu_Upstart_OUTPUTS) \
54 $(com_ubuntu_Upstart_Job_OUTPUTS) \ 55 $(com_ubuntu_Upstart_Job_OUTPUTS) \
55 $(com_ubuntu_Upstart_Instance_OUTPUTS) 56 $(com_ubuntu_Upstart_Instance_OUTPUTS)
56 init_LDADD = \ 57 init_LDADD = \
57 ../nih/libnih.la \ 58 ../nih/libnih.la \
58 ../nih-dbus/libnih-dbus.la \ 59 ../nih-dbus/libnih-dbus.la \
59 $(LTLIBINTL) \ 60 $(LTLIBINTL) \
60 $(DBUS_LIBS) \ 61 $(DBUS_LIBS) \
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 test_process \ 123 test_process \
123 test_job_class \ 124 test_job_class \
124 test_job_process \ 125 test_job_process \
125 test_job \ 126 test_job \
126 test_event \ 127 test_event \
127 test_event_operator \ 128 test_event_operator \
128 test_blocked \ 129 test_blocked \
129 test_parse_job \ 130 test_parse_job \
130 test_parse_conf \ 131 test_parse_conf \
131 test_conf \ 132 test_conf \
132 » test_control 133 » test_control \
134 » test_perf_log
133 135
134 check_PROGRAMS = $(TESTS) 136 check_PROGRAMS = $(TESTS)
135 137
136 tests: $(BUILT_SOURCES) $(check_PROGRAMS) 138 tests: $(BUILT_SOURCES) $(check_PROGRAMS)
137 139
138 test_system_SOURCES = tests/test_system.c 140 test_system_SOURCES = tests/test_system.c
139 test_system_LDFLAGS = -static 141 test_system_LDFLAGS = -static
140 test_system_LDADD = \ 142 test_system_LDADD = \
141 system.o \ 143 system.o \
142 ../nih/libnih.la 144 ../nih/libnih.la
143 145
144 test_environ_SOURCES = tests/test_environ.c 146 test_environ_SOURCES = tests/test_environ.c
145 test_environ_LDFLAGS = -static 147 test_environ_LDFLAGS = -static
146 test_environ_LDADD = \ 148 test_environ_LDADD = \
147 environ.o \ 149 environ.o \
148 ../nih/libnih.la 150 ../nih/libnih.la
149 151
150 test_process_SOURCES = tests/test_process.c 152 test_process_SOURCES = tests/test_process.c
151 test_process_LDFLAGS = -static 153 test_process_LDFLAGS = -static
152 test_process_LDADD = \ 154 test_process_LDADD = \
153 system.o environ.o process.o \ 155 system.o environ.o process.o \
154 job_class.o job_process.o job.o event.o event_operator.o blocked.o \ 156 job_class.o job_process.o job.o event.o event_operator.o blocked.o \
155 » parse_job.o parse_conf.o conf.o control.o \ 157 » parse_job.o parse_conf.o conf.o control.o perf_log.o \
156 com.ubuntu.Upstart.o \ 158 com.ubuntu.Upstart.o \
157 com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \ 159 com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
158 ../nih/libnih.la \ 160 ../nih/libnih.la \
159 ../nih-dbus/libnih-dbus.la \ 161 ../nih-dbus/libnih-dbus.la \
160 $(DBUS_LIBS) 162 $(DBUS_LIBS)
161 163
162 test_job_class_SOURCES = tests/test_job_class.c 164 test_job_class_SOURCES = tests/test_job_class.c
163 test_job_class_LDFLAGS = -static 165 test_job_class_LDFLAGS = -static
164 test_job_class_LDADD = \ 166 test_job_class_LDADD = \
165 system.o environ.o process.o \ 167 system.o environ.o process.o \
166 job_class.o job_process.o job.o event.o event_operator.o blocked.o \ 168 job_class.o job_process.o job.o event.o event_operator.o blocked.o \
167 » parse_job.o parse_conf.o conf.o control.o \ 169 » parse_job.o parse_conf.o conf.o control.o perf_log.o \
168 com.ubuntu.Upstart.o \ 170 com.ubuntu.Upstart.o \
169 com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \ 171 com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
170 ../nih/libnih.la \ 172 ../nih/libnih.la \
171 ../nih-dbus/libnih-dbus.la \ 173 ../nih-dbus/libnih-dbus.la \
172 $(DBUS_LIBS) 174 $(DBUS_LIBS)
173 175
174 test_job_process_SOURCES = tests/test_job_process.c 176 test_job_process_SOURCES = tests/test_job_process.c
175 test_job_process_LDFLAGS = -static 177 test_job_process_LDFLAGS = -static
176 test_job_process_LDADD = \ 178 test_job_process_LDADD = \
177 system.o environ.o process.o \ 179 system.o environ.o process.o \
178 job_class.o job_process.o job.o event.o event_operator.o blocked.o \ 180 job_class.o job_process.o job.o event.o event_operator.o blocked.o \
179 » parse_job.o parse_conf.o conf.o control.o \ 181 » parse_job.o parse_conf.o conf.o control.o perf_log.o \
180 com.ubuntu.Upstart.o \ 182 com.ubuntu.Upstart.o \
181 com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \ 183 com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
182 ../nih/libnih.la \ 184 ../nih/libnih.la \
183 ../nih-dbus/libnih-dbus.la \ 185 ../nih-dbus/libnih-dbus.la \
184 $(DBUS_LIBS) 186 $(DBUS_LIBS)
185 187
186 test_job_SOURCES = tests/test_job.c 188 test_job_SOURCES = tests/test_job.c
187 test_job_LDFLAGS = -static 189 test_job_LDFLAGS = -static
188 test_job_LDADD = \ 190 test_job_LDADD = \
189 system.o environ.o process.o \ 191 system.o environ.o process.o \
190 job_class.o job_process.o job.o event.o event_operator.o blocked.o \ 192 job_class.o job_process.o job.o event.o event_operator.o blocked.o \
191 » parse_job.o parse_conf.o conf.o control.o \ 193 » parse_job.o parse_conf.o conf.o control.o perf_log.o \
192 com.ubuntu.Upstart.o \ 194 com.ubuntu.Upstart.o \
193 com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \ 195 com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
194 ../nih/libnih.la \ 196 ../nih/libnih.la \
195 ../nih-dbus/libnih-dbus.la \ 197 ../nih-dbus/libnih-dbus.la \
196 $(DBUS_LIBS) 198 $(DBUS_LIBS)
197 199
198 test_event_SOURCES = tests/test_event.c 200 test_event_SOURCES = tests/test_event.c
199 test_event_LDFLAGS = -static 201 test_event_LDFLAGS = -static
200 test_event_LDADD = \ 202 test_event_LDADD = \
201 system.o environ.o process.o \ 203 system.o environ.o process.o \
202 job_class.o job_process.o job.o event.o event_operator.o blocked.o \ 204 job_class.o job_process.o job.o event.o event_operator.o blocked.o \
203 » parse_job.o parse_conf.o conf.o control.o \ 205 » parse_job.o parse_conf.o conf.o control.o perf_log.o \
204 com.ubuntu.Upstart.o \ 206 com.ubuntu.Upstart.o \
205 com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \ 207 com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
206 ../nih/libnih.la \ 208 ../nih/libnih.la \
207 ../nih-dbus/libnih-dbus.la \ 209 ../nih-dbus/libnih-dbus.la \
208 $(DBUS_LIBS) 210 $(DBUS_LIBS)
209 211
210 test_event_operator_SOURCES = tests/test_event_operator.c 212 test_event_operator_SOURCES = tests/test_event_operator.c
211 test_event_operator_LDFLAGS = -static 213 test_event_operator_LDFLAGS = -static
212 test_event_operator_LDADD = \ 214 test_event_operator_LDADD = \
213 system.o environ.o process.o \ 215 system.o environ.o process.o \
214 job_class.o job_process.o job.o event.o event_operator.o blocked.o \ 216 job_class.o job_process.o job.o event.o event_operator.o blocked.o \
215 » parse_job.o parse_conf.o conf.o control.o \ 217 » parse_job.o parse_conf.o conf.o control.o perf_log.o \
216 com.ubuntu.Upstart.o \ 218 com.ubuntu.Upstart.o \
217 com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \ 219 com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
218 ../nih/libnih.la \ 220 ../nih/libnih.la \
219 ../nih-dbus/libnih-dbus.la \ 221 ../nih-dbus/libnih-dbus.la \
220 $(DBUS_LIBS) 222 $(DBUS_LIBS)
221 223
222 test_blocked_SOURCES = tests/test_blocked.c 224 test_blocked_SOURCES = tests/test_blocked.c
223 test_blocked_LDFLAGS = -static 225 test_blocked_LDFLAGS = -static
224 test_blocked_LDADD = \ 226 test_blocked_LDADD = \
225 system.o environ.o process.o \ 227 system.o environ.o process.o \
226 job_class.o job_process.o job.o event.o event_operator.o blocked.o \ 228 job_class.o job_process.o job.o event.o event_operator.o blocked.o \
227 » parse_job.o parse_conf.o conf.o control.o \ 229 » parse_job.o parse_conf.o conf.o control.o perf_log.o \
228 com.ubuntu.Upstart.o \ 230 com.ubuntu.Upstart.o \
229 com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \ 231 com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
230 ../nih/libnih.la \ 232 ../nih/libnih.la \
231 ../nih-dbus/libnih-dbus.la \ 233 ../nih-dbus/libnih-dbus.la \
232 $(DBUS_LIBS) 234 $(DBUS_LIBS)
233 235
234 test_parse_job_SOURCES = tests/test_parse_job.c 236 test_parse_job_SOURCES = tests/test_parse_job.c
235 test_parse_job_LDFLAGS = -static 237 test_parse_job_LDFLAGS = -static
236 test_parse_job_LDADD = \ 238 test_parse_job_LDADD = \
237 system.o environ.o process.o \ 239 system.o environ.o process.o \
238 job_class.o job_process.o job.o event.o event_operator.o blocked.o \ 240 job_class.o job_process.o job.o event.o event_operator.o blocked.o \
239 » parse_job.o parse_conf.o conf.o control.o \ 241 » parse_job.o parse_conf.o conf.o control.o perf_log.o \
240 com.ubuntu.Upstart.o \ 242 com.ubuntu.Upstart.o \
241 com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \ 243 com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
242 ../nih/libnih.la \ 244 ../nih/libnih.la \
243 ../nih-dbus/libnih-dbus.la \ 245 ../nih-dbus/libnih-dbus.la \
244 $(DBUS_LIBS) 246 $(DBUS_LIBS)
245 247
246 test_parse_conf_SOURCES = tests/test_parse_conf.c 248 test_parse_conf_SOURCES = tests/test_parse_conf.c
247 test_parse_conf_LDFLAGS = -static 249 test_parse_conf_LDFLAGS = -static
248 test_parse_conf_LDADD = \ 250 test_parse_conf_LDADD = \
249 system.o environ.o process.o \ 251 system.o environ.o process.o \
250 job_class.o job_process.o job.o event.o event_operator.o blocked.o \ 252 job_class.o job_process.o job.o event.o event_operator.o blocked.o \
251 » parse_job.o parse_conf.o conf.o control.o \ 253 » parse_job.o parse_conf.o conf.o control.o perf_log.o \
252 com.ubuntu.Upstart.o \ 254 com.ubuntu.Upstart.o \
253 com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \ 255 com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
254 ../nih/libnih.la \ 256 ../nih/libnih.la \
255 ../nih-dbus/libnih-dbus.la \ 257 ../nih-dbus/libnih-dbus.la \
256 $(DBUS_LIBS) 258 $(DBUS_LIBS)
257 259
258 test_conf_SOURCES = tests/test_conf.c 260 test_conf_SOURCES = tests/test_conf.c
259 test_conf_LDFLAGS = -static 261 test_conf_LDFLAGS = -static
260 test_conf_LDADD = \ 262 test_conf_LDADD = \
261 system.o environ.o process.o \ 263 system.o environ.o process.o \
262 job_class.o job_process.o job.o event.o event_operator.o blocked.o \ 264 job_class.o job_process.o job.o event.o event_operator.o blocked.o \
263 » parse_job.o parse_conf.o conf.o control.o \ 265 » parse_job.o parse_conf.o conf.o control.o perf_log.o \
264 com.ubuntu.Upstart.o \ 266 com.ubuntu.Upstart.o \
265 com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \ 267 com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
266 ../nih/libnih.la \ 268 ../nih/libnih.la \
267 ../nih-dbus/libnih-dbus.la \ 269 ../nih-dbus/libnih-dbus.la \
268 $(DBUS_LIBS) 270 $(DBUS_LIBS)
269 271
270 test_control_SOURCES = tests/test_control.c 272 test_control_SOURCES = tests/test_control.c
271 test_control_LDFLAGS = -static 273 test_control_LDFLAGS = -static
272 test_control_LDADD = \ 274 test_control_LDADD = \
273 system.o environ.o process.o \ 275 system.o environ.o process.o \
274 job_class.o job_process.o job.o event.o event_operator.o blocked.o \ 276 job_class.o job_process.o job.o event.o event_operator.o blocked.o \
275 » parse_job.o parse_conf.o conf.o control.o \ 277 » parse_job.o parse_conf.o conf.o control.o perf_log.o \
276 com.ubuntu.Upstart.o \ 278 com.ubuntu.Upstart.o \
277 com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \ 279 com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
278 ../nih/libnih.la \ 280 ../nih/libnih.la \
279 ../nih-dbus/libnih-dbus.la \ 281 ../nih-dbus/libnih-dbus.la \
280 $(DBUS_LIBS) 282 $(DBUS_LIBS)
281 283
284 test_perf_log_SOURCES = tests/test_perf_log.c
285 test_perf_log_LDFLAGS = -static
286 test_perf_log_LDADD = \
287 system.o environ.o process.o \
288 job_class.o job_process.o job.o event.o event_operator.o blocked.o \
289 parse_job.o parse_conf.o conf.o control.o perf_log.o \
290 com.ubuntu.Upstart.o \
291 com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
292 ../nih/libnih.la \
293 ../nih-dbus/libnih-dbus.la \
294 $(DBUS_LIBS)
282 295
283 install-data-local: 296 install-data-local:
284 $(MKDIR_P) $(DESTDIR)$(initconfdir) 297 $(MKDIR_P) $(DESTDIR)$(initconfdir)
285 298
286 clean-local: 299 clean-local:
287 rm -f *.gcno *.gcda 300 rm -f *.gcno *.gcda
288 301
289 maintainer-clean-local: 302 maintainer-clean-local:
290 rm -f *.gcov 303 rm -f *.gcov
OLDNEW
« no previous file with comments | « debian/changelog ('k') | init/Makefile.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698