← Back to branch summary

~vorlon/ubuntu/raring/upstart/lp.1199778

« back to all changes in this revision

Viewing changes to util/Makefile.am

  • Committer: Steve Langasek
  • Date: 2013-11-07 03:06:51 UTC
  • Revision ID: steve.langasek@canonical.com-20131107030651-f1jzeyi7ifvvw1h8
Attempt to cherry-pick fixes for bug #1199778 to raring; something is still
missing though, the test suite segfaults on one of the json loads.

Show diffs side-by-side

added added

removed removed

Lines of Context:
util/Makefile.am
10
10
        -DINITCTL_BUILD \
11
11
        -DSBINDIR="\"$(sbindir)\"" \
12
12
        -I$(top_builddir) -I$(top_srcdir) -iquote$(builddir) -iquote$(srcdir) \
13
 
        -I$(top_srcdir)/intl
14
 
 
15
 
INITCTL_BINARY = $(abs_builddir)/initctl
16
 
UPSTART_BINARY = $(abs_builddir)/../init/init
17
 
 
18
 
AM_CPPFLAGS += \
19
 
        -DUPSTART_BINARY="\"$(UPSTART_BINARY)\"" \
20
 
        -DINITCTL_BINARY="\"$(INITCTL_BINARY)\""
 
13
        -I$(top_srcdir)/intl \
 
14
        -I$(top_srcdir)/test -iquote $(top_srcdir)/test
21
15
 
22
16
dist_man_MANS = \
23
17
        man/initctl.8 \
27
21
        man/telinit.8 \
28
22
        man/runlevel.7
29
23
 
30
 
 
31
24
sbin_PROGRAMS = \
32
25
        initctl \
33
26
        reboot \
189
182
          rm -f "$(DESTDIR)$(sbindir)/$$file"; \
190
183
        done
191
184
 
192
 
 
193
185
TESTS = \
194
186
        test_initctl \
195
187
        test_utmp \
206
198
test_initctl_LDADD = \
207
199
        com.ubuntu.Upstart.o \
208
200
        com.ubuntu.Upstart.Job.o com.ubuntu.Upstart.Instance.o \
 
201
        $(top_builddir)/test/libtest_util_common.a \
209
202
        $(NIH_LIBS) \
210
203
        $(NIH_DBUS_LIBS) \
211
204
        $(DBUS_LIBS)