← Back to branch summary

~canonical-scott/upstart/trunk

« back to all changes in this revision

Viewing changes to init/Makefile.am

  • Committer: Scott James Remnant
  • Date: 2010-02-04 03:42:29 UTC
  • Revision ID: scott@netsplit.com-20100204034229-94ooua0a4mck3dnm
libnih is now released as its own project, so rather than expecting
to include it with the source we depend on it being outside of it.
* Makefile.am (SUBDIRS): Remove m4 directory along with the nih bits.
(EXTRA_DIST): Remove ChangeLog.nih
* configure.ac (AM_INIT_AUTOMAKE): Remove dist-bzip2, since we don't
actually use it; add color-tests and silent-rules.
(AM_SILENT_RULES): Use silent rules by default
(AM_MAINTAINER_MODE): Enable maintainer mode by default (as before),
but allow it to be disabled
(AM_GNU_GETTEXT_VERSION): Bump to 0.17
(NIH_INIT): Replace with the expanded out calls that we actually need.
(AC_CONFIG_FILES): Remove nih directories
Add magic to allow use of a local libnih source tree.
* init/Makefile.am (AM_CFLAGS): Add NIH_CFLAGS and NIH_DBUS_CFLAGS
(init_LDADD, test_system_LDADD, test_environ_LDADD, test_process_LDADD)
(test_job_class_LDADD, test_job_process_LDADD, test_job_LDADD)
(test_event_LDADD, test_event_operator_LDADD)
(test_blocked_LDADD, test_parse_job_LDADD)
(test_parse_conf_LDADD, test_conf_LDADD, test_control_LDADD):
Replace library paths with NIH_LIBS and NIH_DBUS_LIBS
($(com_ubuntu_Upstart_OUTPUTS)),
($(com_ubuntu_Upstart_Job_OUTPUTS)),
($(com_ubuntu_Upstart_Instance_OUTPUTS)): Use external nih-dbus-tool
and obey silent rules.
(test_system_LDFLAGS, test_environ_LDFLAGS)
(test_process_LDFLAGS, test_job_class_LDFLAGS)
(test_job_process_LDFLAGS, test_job_LDFLAGS, test_event_LDFLAGS)
(test_event_operator_LDFLAGS, test_blocked_LDFLAGS)
(test_parse_job_LDFLAGS, test_parse_conf_LDFLAGS)
(test_conf_LDFLAGS, test_control_LDFLAGS): Drop -static
* util/Makefile.am (AM_CFLAGS): Add NIH_CFLAGS and NIH_DBUS_CFLAGS
(initctl_LDADD, reboot_LDADD, runlevel_LDADD, shutdown_LDADD)
(test_initctl_LDADD, test_utmp_LDADD, test_sysv_LDADD)
(test_telinit_LDADD): Replace library paths with NIH_LIBS and
NIH_DBUS_LIBS
($(com_ubuntu_Upstart_OUTPUTS)):
($(com_ubuntu_Upstart_Job_OUTPUTS)):
($(com_ubuntu_Upstart_Instance_OUTPUTS)): Use external nih-dbus-tool
and obey silent rules.
(initctl_LDFLAGS, reboot_LDFLAGS, runlevel_LDFLAGS)
(shutdown_LDFLAGS, telinit_LDFLAGS, test_initctl_LDFLAGS)
(test_utmp_LDFLAGS, test_sysv_LDFLAGS, test_telinit_LDFLAGS): Drop
-static
* README: Add libnih to the dependencies.
* HACKING: Remove the instructions for checking out libnih, replace
with a description about how to use a libnih source tree instead of
the installed one.

Show diffs side-by-side

added added

removed removed

Lines of Context:
init/Makefile.am
3
3
initconfdir = $(sysconfdir)/init
4
4
 
5
5
AM_CFLAGS = \
 
6
        $(NIH_CFLAGS) \
 
7
        $(NIH_DBUS_CFLAGS) \
6
8
        $(DBUS_CFLAGS)
7
9
 
8
10
AM_CPPFLAGS = \
54
56
        $(com_ubuntu_Upstart_Job_OUTPUTS) \
55
57
        $(com_ubuntu_Upstart_Instance_OUTPUTS)
56
58
init_LDADD = \
57
 
        ../nih/libnih.la \
58
 
        ../nih-dbus/libnih-dbus.la \
59
59
        $(LTLIBINTL) \
 
60
        $(NIH_LIBS) \
 
61
        $(NIH_DBUS_LIBS) \
60
62
        $(DBUS_LIBS) \
61
63
        -lrt
62
64
 
68
70
com_ubuntu_Upstart_XML = \
69
71
        ../dbus/com.ubuntu.Upstart.xml
70
72
 
71
 
$(com_ubuntu_Upstart_OUTPUTS): $(com_ubuntu_Upstart_XML) $(top_builddir)/nih-dbus-tool/nih-dbus-tool
72
 
        $(top_builddir)/nih-dbus-tool/nih-dbus-tool \
73
 
                --mode=object --prefix=control --default-interface=com.ubuntu.Upstart0_6 \
 
73
$(com_ubuntu_Upstart_OUTPUTS): $(com_ubuntu_Upstart_XML)
 
74
        $(AM_V_GEN)$(NIH_DBUS_TOOL) \
 
75
                --package=$(PACKAGE) \
 
76
                --mode=object --prefix=control \
 
77
                --default-interface=com.ubuntu.Upstart0_6 \
74
78
                --output=$@ $<
75
79
 
76
80
 
81
85
com_ubuntu_Upstart_Job_XML = \
82
86
        ../dbus/com.ubuntu.Upstart.Job.xml
83
87
 
84
 
$(com_ubuntu_Upstart_Job_OUTPUTS): $(com_ubuntu_Upstart_Job_XML)  $(top_builddir)/nih-dbus-tool/nih-dbus-tool
85
 
        $(top_builddir)/nih-dbus-tool/nih-dbus-tool \
86
 
                --mode=object --prefix=job_class --default-interface=com.ubuntu.Upstart0_6.Job \
 
88
$(com_ubuntu_Upstart_Job_OUTPUTS): $(com_ubuntu_Upstart_Job_XML)
 
89
        $(AM_V_GEN)$(NIH_DBUS_TOOL) \
 
90
                --package=$(PACKAGE) \
 
91
                --mode=object --prefix=job_class \
 
92
                --default-interface=com.ubuntu.Upstart0_6.Job \
87
93
                --output=$@ $<
88
94
 
89
95
 
94
100
com_ubuntu_Upstart_Instance_XML = \
95
101
        ../dbus/com.ubuntu.Upstart.Instance.xml
96
102
 
97
 
$(com_ubuntu_Upstart_Instance_OUTPUTS): $(com_ubuntu_Upstart_Instance_XML) $(top_builddir)/nih-dbus-tool/nih-dbus-tool
98
 
        $(top_builddir)/nih-dbus-tool/nih-dbus-tool \
99
 
                --mode=object --prefix=job --default-interface=com.ubuntu.Upstart0_6.Instance \
 
103
$(com_ubuntu_Upstart_Instance_OUTPUTS): $(com_ubuntu_Upstart_Instance_XML)
 
104
        $(AM_V_GEN)$(NIH_DBUS_TOOL) \
 
105
                --package=$(PACKAGE) \
 
106
                --mode=object --prefix=job \
 
107
                --default-interface=com.ubuntu.Upstart0_6.Instance \
100
108
                --output=$@ $<
101
109
 
102
110
 
136
144
tests: $(BUILT_SOURCES) $(check_PROGRAMS)
137
145
 
138
146
test_system_SOURCES = tests/test_system.c
139
 
test_system_LDFLAGS = -static
140
147
test_system_LDADD = \
141
148
        system.o \
142
 
        ../nih/libnih.la
 
149
        $(NIH_LIBS)
143
150
 
144
151
test_environ_SOURCES = tests/test_environ.c
145
 
test_environ_LDFLAGS = -static
146
152
test_environ_LDADD = \
147
153
        environ.o \
148
 
        ../nih/libnih.la
 
154
        $(NIH_LIBS)
149
155
 
150
156
test_process_SOURCES = tests/test_process.c
151
 
test_process_LDFLAGS = -static
152
157
test_process_LDADD = \
153
158
        system.o environ.o process.o \
154
159
        job_class.o job_process.o job.o event.o event_operator.o blocked.o \
155
160
        parse_job.o parse_conf.o conf.o control.o \
156
161
        com.ubuntu.Upstart.o \
157
162
        com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
158
 
        ../nih/libnih.la \
159
 
        ../nih-dbus/libnih-dbus.la \
 
163
        $(NIH_LIBS) \
 
164
        $(NIH_DBUS_LIBS) \
160
165
        $(DBUS_LIBS)
161
166
 
162
167
test_job_class_SOURCES = tests/test_job_class.c
163
 
test_job_class_LDFLAGS = -static
164
168
test_job_class_LDADD = \
165
169
        system.o environ.o process.o \
166
170
        job_class.o job_process.o job.o event.o event_operator.o blocked.o \
167
171
        parse_job.o parse_conf.o conf.o control.o \
168
172
        com.ubuntu.Upstart.o \
169
173
        com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
170
 
        ../nih/libnih.la \
171
 
        ../nih-dbus/libnih-dbus.la \
 
174
        $(NIH_LIBS) \
 
175
        $(NIH_DBUS_LIBS) \
172
176
        $(DBUS_LIBS)
173
177
 
174
178
test_job_process_SOURCES = tests/test_job_process.c
175
 
test_job_process_LDFLAGS = -static
176
179
test_job_process_LDADD = \
177
180
        system.o environ.o process.o \
178
181
        job_class.o job_process.o job.o event.o event_operator.o blocked.o \
179
182
        parse_job.o parse_conf.o conf.o control.o \
180
183
        com.ubuntu.Upstart.o \
181
184
        com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
182
 
        ../nih/libnih.la \
183
 
        ../nih-dbus/libnih-dbus.la \
 
185
        $(NIH_LIBS) \
 
186
        $(NIH_DBUS_LIBS) \
184
187
        $(DBUS_LIBS)
185
188
 
186
189
test_job_SOURCES = tests/test_job.c
187
 
test_job_LDFLAGS = -static
188
190
test_job_LDADD = \
189
191
        system.o environ.o process.o \
190
192
        job_class.o job_process.o job.o event.o event_operator.o blocked.o \
191
193
        parse_job.o parse_conf.o conf.o control.o \
192
194
        com.ubuntu.Upstart.o \
193
195
        com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
194
 
        ../nih/libnih.la \
195
 
        ../nih-dbus/libnih-dbus.la \
 
196
        $(NIH_LIBS) \
 
197
        $(NIH_DBUS_LIBS) \
196
198
        $(DBUS_LIBS)
197
199
 
198
200
test_event_SOURCES = tests/test_event.c
199
 
test_event_LDFLAGS = -static
200
201
test_event_LDADD = \
201
202
        system.o environ.o process.o \
202
203
        job_class.o job_process.o job.o event.o event_operator.o blocked.o \
203
204
        parse_job.o parse_conf.o conf.o control.o \
204
205
        com.ubuntu.Upstart.o \
205
206
        com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
206
 
        ../nih/libnih.la \
207
 
        ../nih-dbus/libnih-dbus.la \
 
207
        $(NIH_LIBS) \
 
208
        $(NIH_DBUS_LIBS) \
208
209
        $(DBUS_LIBS)
209
210
 
210
211
test_event_operator_SOURCES = tests/test_event_operator.c
211
 
test_event_operator_LDFLAGS = -static
212
212
test_event_operator_LDADD = \
213
213
        system.o environ.o process.o \
214
214
        job_class.o job_process.o job.o event.o event_operator.o blocked.o \
215
215
        parse_job.o parse_conf.o conf.o control.o \
216
216
        com.ubuntu.Upstart.o \
217
217
        com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
218
 
        ../nih/libnih.la \
219
 
        ../nih-dbus/libnih-dbus.la \
 
218
        $(NIH_LIBS) \
 
219
        $(NIH_DBUS_LIBS) \
220
220
        $(DBUS_LIBS)
221
221
 
222
222
test_blocked_SOURCES = tests/test_blocked.c
223
 
test_blocked_LDFLAGS = -static
224
223
test_blocked_LDADD = \
225
224
        system.o environ.o process.o \
226
225
        job_class.o job_process.o job.o event.o event_operator.o blocked.o \
227
226
        parse_job.o parse_conf.o conf.o control.o \
228
227
        com.ubuntu.Upstart.o \
229
228
        com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
230
 
        ../nih/libnih.la \
231
 
        ../nih-dbus/libnih-dbus.la \
 
229
        $(NIH_LIBS) \
 
230
        $(NIH_DBUS_LIBS) \
232
231
        $(DBUS_LIBS)
233
232
 
234
233
test_parse_job_SOURCES = tests/test_parse_job.c
235
 
test_parse_job_LDFLAGS = -static
236
234
test_parse_job_LDADD = \
237
235
        system.o environ.o process.o \
238
236
        job_class.o job_process.o job.o event.o event_operator.o blocked.o \
239
237
        parse_job.o parse_conf.o conf.o control.o \
240
238
        com.ubuntu.Upstart.o \
241
239
        com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
242
 
        ../nih/libnih.la \
243
 
        ../nih-dbus/libnih-dbus.la \
 
240
        $(NIH_LIBS) \
 
241
        $(NIH_DBUS_LIBS) \
244
242
        $(DBUS_LIBS)
245
243
 
246
244
test_parse_conf_SOURCES = tests/test_parse_conf.c
247
 
test_parse_conf_LDFLAGS = -static
248
245
test_parse_conf_LDADD = \
249
246
        system.o environ.o process.o \
250
247
        job_class.o job_process.o job.o event.o event_operator.o blocked.o \
251
248
        parse_job.o parse_conf.o conf.o control.o \
252
249
        com.ubuntu.Upstart.o \
253
250
        com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
254
 
        ../nih/libnih.la \
255
 
        ../nih-dbus/libnih-dbus.la \
 
251
        $(NIH_LIBS) \
 
252
        $(NIH_DBUS_LIBS) \
256
253
        $(DBUS_LIBS)
257
254
 
258
255
test_conf_SOURCES = tests/test_conf.c
259
 
test_conf_LDFLAGS = -static
260
256
test_conf_LDADD = \
261
257
        system.o environ.o process.o \
262
258
        job_class.o job_process.o job.o event.o event_operator.o blocked.o \
263
259
        parse_job.o parse_conf.o conf.o control.o \
264
260
        com.ubuntu.Upstart.o \
265
261
        com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
266
 
        ../nih/libnih.la \
267
 
        ../nih-dbus/libnih-dbus.la \
 
262
        $(NIH_LIBS) \
 
263
        $(NIH_DBUS_LIBS) \
268
264
        $(DBUS_LIBS)
269
265
 
270
266
test_control_SOURCES = tests/test_control.c
271
 
test_control_LDFLAGS = -static
272
267
test_control_LDADD = \
273
268
        system.o environ.o process.o \
274
269
        job_class.o job_process.o job.o event.o event_operator.o blocked.o \
275
270
        parse_job.o parse_conf.o conf.o control.o \
276
271
        com.ubuntu.Upstart.o \
277
272
        com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
278
 
        ../nih/libnih.la \
279
 
        ../nih-dbus/libnih-dbus.la \
 
273
        $(NIH_LIBS) \
 
274
        $(NIH_DBUS_LIBS) \
280
275
        $(DBUS_LIBS)
281
276
 
282
277