← Back to branch summary

~canonical-scott/upstart/trunk

« back to all changes in this revision

Viewing changes to util/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:
util/Makefile.am
1
1
## Process this file with automake to produce Makefile.in
2
2
 
3
3
AM_CFLAGS = \
 
4
        $(NIH_CFLAGS) \
 
5
        $(NIH_DBUS_CFLAGS) \
4
6
        $(DBUS_CFLAGS)
5
7
 
6
8
AM_CPPFLAGS = \
32
34
        $(com_ubuntu_Upstart_OUTPUTS) \
33
35
        $(com_ubuntu_Upstart_Job_OUTPUTS) \
34
36
        $(com_ubuntu_Upstart_Instance_OUTPUTS)
35
 
initctl_LDFLAGS = -static
36
37
initctl_LDADD = \
37
 
        ../nih/libnih.la \
38
 
        ../nih-dbus/libnih-dbus.la \
39
38
        $(LTLIBINTL) \
 
39
        $(NIH_LIBS) \
 
40
        $(NIH_DBUS_LIBS) \
40
41
        $(DBUS_LIBS)
41
42
 
42
43
reboot_SOURCES = \
43
44
        reboot.c \
44
45
        utmp.c utmp.h
45
 
reboot_LDFLAGS = -static
46
46
reboot_LDADD = \
47
 
        ../nih/libnih.la \
48
 
        $(LTLIBINTL)
 
47
        $(LTLIBINTL) \
 
48
        $(NIH_LIBS)
49
49
 
50
50
runlevel_SOURCES = \
51
51
        runlevel.c \
52
52
        utmp.c utmp.h
53
 
runlevel_LDFLAGS = -static
54
53
runlevel_LDADD = \
55
 
        ../nih/libnih.la \
56
 
        $(LTLIBINTL)
 
54
        $(LTLIBINTL) \
 
55
        $(NIH_LIBS)
57
56
 
58
57
shutdown_SOURCES = \
59
58
        shutdown.c \
61
60
        sysv.c sysv.h
62
61
nodist_shutdown_SOURCES = \
63
62
        $(com_ubuntu_Upstart_OUTPUTS)
64
 
shutdown_LDFLAGS = -static
65
63
shutdown_LDADD = \
66
 
        ../nih/libnih.la \
67
 
        ../nih-dbus/libnih-dbus.la \
68
64
        $(LTLIBINTL) \
 
65
        $(NIH_LIBS) \
 
66
        $(NIH_DBUS_LIBS) \
69
67
        $(DBUS_LIBS)
70
68
 
71
69
telinit_SOURCES = \
74
72
        sysv.c sysv.h
75
73
nodist_telinit_SOURCES = \
76
74
        $(com_ubuntu_Upstart_OUTPUTS)
77
 
telinit_LDFLAGS = -static
78
75
telinit_LDADD = \
79
 
        ../nih/libnih.la \
80
 
        ../nih-dbus/libnih-dbus.la \
81
76
        $(LTLIBINTL) \
 
77
        $(NIH_LIBS) \
 
78
        $(NIH_DBUS_LIBS) \
82
79
        $(DBUS_LIBS)
83
80
 
84
81
 
89
86
com_ubuntu_Upstart_XML = \
90
87
        ../dbus/com.ubuntu.Upstart.xml
91
88
 
92
 
$(com_ubuntu_Upstart_OUTPUTS): $(com_ubuntu_Upstart_XML) $(top_builddir)/nih-dbus-tool/nih-dbus-tool
93
 
        $(top_builddir)/nih-dbus-tool/nih-dbus-tool \
94
 
                --mode=proxy --prefix=upstart --default-interface=com.ubuntu.Upstart0_6 \
 
89
$(com_ubuntu_Upstart_OUTPUTS): $(com_ubuntu_Upstart_XML)
 
90
        $(AM_V_GEN)$(NIH_DBUS_TOOL) \
 
91
                --package=$(PACKAGE) \
 
92
                --mode=proxy --prefix=upstart \
 
93
                --default-interface=com.ubuntu.Upstart0_6 \
95
94
                --output=$@ $<
96
95
 
97
96
 
102
101
com_ubuntu_Upstart_Job_XML = \
103
102
        ../dbus/com.ubuntu.Upstart.Job.xml
104
103
 
105
 
$(com_ubuntu_Upstart_Job_OUTPUTS): $(com_ubuntu_Upstart_Job_XML)  $(top_builddir)/nih-dbus-tool/nih-dbus-tool
106
 
        $(top_builddir)/nih-dbus-tool/nih-dbus-tool \
107
 
                --mode=proxy --prefix=job_class --default-interface=com.ubuntu.Upstart0_6.Job \
 
104
$(com_ubuntu_Upstart_Job_OUTPUTS): $(com_ubuntu_Upstart_Job_XML)
 
105
        $(AM_V_GEN)$(NIH_DBUS_TOOL) \
 
106
                --package=$(PACKAGE) \
 
107
                --mode=proxy --prefix=job_class \
 
108
                --default-interface=com.ubuntu.Upstart0_6.Job \
108
109
                --output=$@ $<
109
110
 
110
111
 
115
116
com_ubuntu_Upstart_Instance_XML = \
116
117
        ../dbus/com.ubuntu.Upstart.Instance.xml
117
118
 
118
 
$(com_ubuntu_Upstart_Instance_OUTPUTS): $(com_ubuntu_Upstart_Instance_XML) $(top_builddir)/nih-dbus-tool/nih-dbus-tool
119
 
        $(top_builddir)/nih-dbus-tool/nih-dbus-tool \
120
 
                --mode=proxy --prefix=job --default-interface=com.ubuntu.Upstart0_6.Instance \
 
119
$(com_ubuntu_Upstart_Instance_OUTPUTS): $(com_ubuntu_Upstart_Instance_XML)
 
120
        $(AM_V_GEN)$(NIH_DBUS_TOOL) \
 
121
                --package=$(PACKAGE) \
 
122
                --mode=proxy --prefix=job \
 
123
                --default-interface=com.ubuntu.Upstart0_6.Instance \
121
124
                --output=$@ $<
122
125
 
123
126
 
178
181
 
179
182
test_initctl_SOURCES = tests/test_initctl.c initctl.c
180
183
test_initctl_CFLAGS = $(AM_CFLAGS) -DTEST
181
 
test_initctl_LDFLAGS = -static
182
184
test_initctl_LDADD = \
183
185
        com.ubuntu.Upstart.o \
184
186
        com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
185
 
        ../nih/libnih.la \
186
 
        ../nih-dbus/libnih-dbus.la \
 
187
        $(NIH_LIBS) \
 
188
        $(NIH_DBUS_LIBS) \
187
189
        $(DBUS_LIBS)
188
190
 
189
191
test_utmp_SOURCES = tests/test_utmp.c
190
 
test_utmp_LDFLAGS = -static
191
192
test_utmp_LDADD = \
192
193
        utmp.o \
193
 
        ../nih/libnih.la
 
194
        $(NIH_LIBS)
194
195
 
195
196
test_sysv_SOURCES = tests/test_sysv.c
196
197
nodist_test_sysv_SOURCES = \
197
198
        $(com_ubuntu_Upstart_OUTPUTS)
198
 
test_sysv_LDFLAGS = -static
199
199
test_sysv_LDADD = \
200
200
        sysv.o utmp.o \
201
 
        ../nih/libnih.la \
202
 
        ../nih-dbus/libnih-dbus.la \
203
201
        $(LTLIBINTL) \
 
202
        $(NIH_LIBS) \
 
203
        $(NIH_DBUS_LIBS) \
204
204
        $(DBUS_LIBS)
205
205
 
206
206
test_telinit_SOURCES = tests/test_telinit.c telinit.c
207
207
test_telinit_CFLAGS = $(AM_CFLAGS) -DTEST
208
 
test_telinit_LDFLAGS = -static
209
208
test_telinit_LDADD = \
210
209
        sysv.o utmp.o \
211
210
        com.ubuntu.Upstart.o \
212
211
        com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
213
 
        ../nih/libnih.la \
214
 
        ../nih-dbus/libnih-dbus.la \
 
212
        $(NIH_LIBS) \
 
213
        $(NIH_DBUS_LIBS) \
215
214
        $(DBUS_LIBS)
216
215
 
217
216