~upstart-devel/upstart/trunk

« back to all changes in this revision

Viewing changes to init/Makefile.am

  • Committer: Steve Langasek
  • Date: 2016-05-02 19:46:28 UTC
  • mto: This revision was merged to the branch mainline in revision 1668.
  • Revision ID: steve.langasek@canonical.com-20160502194628-e3yxonkc4y2li7n6
Adjust the script-oriented logging tests to use read from a fifo instead of sleep 999, for clearer process handling; and fix the descriptions of a couple of tests to match what they're actually doing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
64
64
        errors.h \
65
65
        apparmor.c apparmor.h
66
66
nodist_init_SOURCES = \
 
67
        $(org_freedesktop_DBus_OUTPUTS) \
67
68
        $(com_ubuntu_Upstart_OUTPUTS) \
68
69
        $(com_ubuntu_Upstart_Job_OUTPUTS) \
69
70
        $(com_ubuntu_Upstart_Instance_OUTPUTS)
125
126
                --default-interface=com.ubuntu.Upstart0_6.Instance \
126
127
                --output=$@ $<
127
128
 
 
129
org_freedesktop_DBus_OUTPUTS = \
 
130
        org.freedesktop.DBus.c \
 
131
        org.freedesktop.DBus.h
 
132
 
 
133
org_freedesktop_DBus_XML = \
 
134
        ../dbus/org.freedesktop.DBus.xml
 
135
 
 
136
$(org_freedesktop_DBus_OUTPUTS): $(org_freedesktop_DBus_XML)
 
137
        $(AM_V_GEN)$(NIH_DBUS_TOOL) \
 
138
                --package=$(PACKAGE) \
 
139
                --mode=proxy --prefix=control_dbus \
 
140
                --default-interface=org.freedesktop.DBus \
 
141
                --output=$@ $<
 
142
 
128
143
# These have to be built sources because we can't compile object files
129
144
# without the header file existing first
130
145
BUILT_SOURCES = \
 
146
        $(org_freedesktop_DBus_OUTPUTS) \
131
147
        $(com_ubuntu_Upstart_OUTPUTS) \
132
148
        $(com_ubuntu_Upstart_Job_OUTPUTS) \
133
149
        $(com_ubuntu_Upstart_Instance_OUTPUTS)
134
150
 
135
151
CLEANFILES = \
 
152
        $(org_freedesktop_DBus_OUTPUTS) \
136
153
        $(com_ubuntu_Upstart_OUTPUTS) \
137
154
        $(com_ubuntu_Upstart_Job_OUTPUTS) \
138
155
        $(com_ubuntu_Upstart_Instance_OUTPUTS)
231
248
        job_class.o job_process.o job.o event.o event_operator.o blocked.o \
232
249
        parse_job.o parse_conf.o conf.o control.o quiesce.o \
233
250
        session.o log.o state.o xdg.o apparmor.o \
 
251
        org.freedesktop.DBus.o \
234
252
        com.ubuntu.Upstart.o \
235
253
        com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
236
254
        $(top_builddir)/test/libtest_util_common.a \
249
267
        job_class.o job_process.o job.o event.o event_operator.o blocked.o \
250
268
        parse_job.o parse_conf.o conf.o control.o quiesce.o \
251
269
        session.o log.o state.o xdg.o apparmor.o \
 
270
        org.freedesktop.DBus.o \
252
271
        com.ubuntu.Upstart.o \
253
272
        com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
254
273
        $(NIH_LIBS) \
266
285
        job_class.o job_process.o job.o event.o event_operator.o blocked.o \
267
286
        parse_job.o parse_conf.o conf.o control.o quiesce.o \
268
287
        session.o log.o state.o xdg.o apparmor.o \
 
288
        org.freedesktop.DBus.o \
269
289
        com.ubuntu.Upstart.o \
270
290
        com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
271
291
        $(top_builddir)/test/libtest_util_common.a \
284
304
        job_class.o job_process.o job.o event.o event_operator.o blocked.o \
285
305
        parse_job.o parse_conf.o conf.o control.o quiesce.o \
286
306
        session.o log.o state.o xdg.o apparmor.o \
 
307
        org.freedesktop.DBus.o \
287
308
        com.ubuntu.Upstart.o \
288
309
        com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
289
310
        $(top_builddir)/test/libtest_util_common.a \
302
323
        job_class.o job_process.o job.o event.o event_operator.o blocked.o \
303
324
        parse_job.o parse_conf.o conf.o control.o quiesce.o \
304
325
        session.o log.o state.o xdg.o apparmor.o \
 
326
        org.freedesktop.DBus.o \
305
327
        com.ubuntu.Upstart.o \
306
328
        com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
307
329
        $(top_builddir)/test/libtest_util_common.a \
320
342
        job_class.o job_process.o job.o event.o event_operator.o blocked.o \
321
343
        parse_job.o parse_conf.o conf.o control.o quiesce.o \
322
344
        session.o log.o state.o xdg.o apparmor.o \
 
345
        org.freedesktop.DBus.o \
323
346
        com.ubuntu.Upstart.o \
324
347
        com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
325
348
        $(top_builddir)/test/libtest_util_common.a \
338
361
        job_class.o job_process.o job.o event.o event_operator.o blocked.o \
339
362
        parse_job.o parse_conf.o conf.o control.o quiesce.o \
340
363
        session.o log.o state.o xdg.o apparmor.o \
 
364
        org.freedesktop.DBus.o \
341
365
        com.ubuntu.Upstart.o \
342
366
        com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
343
367
        $(NIH_LIBS) \
355
379
        job_class.o job_process.o job.o event.o event_operator.o blocked.o \
356
380
        parse_job.o parse_conf.o conf.o control.o quiesce.o \
357
381
        session.o log.o state.o xdg.o apparmor.o \
 
382
        org.freedesktop.DBus.o \
358
383
        com.ubuntu.Upstart.o \
359
384
        com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
360
385
        $(top_builddir)/test/libtest_util_common.a \
373
398
        job_class.o job_process.o job.o event.o event_operator.o blocked.o \
374
399
        parse_job.o parse_conf.o conf.o control.o quiesce.o \
375
400
        session.o log.o state.o xdg.o apparmor.o \
 
401
        org.freedesktop.DBus.o \
376
402
        com.ubuntu.Upstart.o \
377
403
        com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
378
404
        $(NIH_LIBS) \
390
416
        job_class.o job_process.o job.o event.o event_operator.o blocked.o \
391
417
        parse_job.o parse_conf.o conf.o control.o quiesce.o \
392
418
        session.o log.o state.o xdg.o apparmor.o \
 
419
        org.freedesktop.DBus.o \
393
420
        com.ubuntu.Upstart.o \
394
421
        com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
395
422
        $(top_builddir)/test/libtest_util_common.a \
408
435
        job_class.o job_process.o job.o event.o event_operator.o blocked.o \
409
436
        parse_job.o parse_conf.o conf.o control.o quiesce.o \
410
437
        session.o log.o state.o xdg.o apparmor.o \
 
438
        org.freedesktop.DBus.o \
411
439
        com.ubuntu.Upstart.o \
412
440
        com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
413
441
        $(NIH_LIBS) \
430
458
        job_class.o job_process.o job.o event.o event_operator.o blocked.o \
431
459
        parse_job.o parse_conf.o conf.o control.o quiesce.o \
432
460
        session.o log.o state.o xdg.o apparmor.o \
 
461
        org.freedesktop.DBus.o \
433
462
        com.ubuntu.Upstart.o \
434
463
        com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
435
464
        $(top_builddir)/test/libtest_util_common.a \
448
477
        job_class.o job_process.o job.o event.o event_operator.o blocked.o \
449
478
        parse_job.o parse_conf.o control.o quiesce.o \
450
479
        session.o log.o state.o xdg.o apparmor.o \
 
480
        org.freedesktop.DBus.o \
451
481
        com.ubuntu.Upstart.o \
452
482
        com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
453
483
        $(NIH_LIBS) \
479
509
        job_class.o job_process.o job.o event.o event_operator.o blocked.o \
480
510
        parse_job.o parse_conf.o conf.o control.o quiesce.o \
481
511
        session.o log.o state.o xdg.o apparmor.o cgroup.o \
 
512
        org.freedesktop.DBus.o \
482
513
        com.ubuntu.Upstart.o \
483
514
        com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
484
515
        $(top_builddir)/test/libtest_util_common.a \
495
526
        job_class.o job_process.o job.o event.o event_operator.o blocked.o \
496
527
        parse_job.o parse_conf.o conf.o control.o quiesce.o \
497
528
        session.o log.o state.o xdg.o apparmor.o \
 
529
        org.freedesktop.DBus.o \
498
530
        com.ubuntu.Upstart.o \
499
531
        com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
500
532
        $(NIH_LIBS) \
512
544
        job_class.o job_process.o job.o event.o event_operator.o blocked.o \
513
545
        parse_job.o parse_conf.o conf.o control.o quiesce.o \
514
546
        session.o log.o state.o xdg.o apparmor.o \
 
547
        org.freedesktop.DBus.o \
515
548
        com.ubuntu.Upstart.o \
516
549
        com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
517
550
        $(top_builddir)/test/libtest_util_common.a \