← Back to branch summary

~ubuntu-branches/ubuntu/wily/modemmanager/wily

« back to all changes in this revision

Viewing changes to data/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2013-12-20 15:35:26 UTC
  • mfrom: (1.2.2)
  • Revision ID: package-import@ubuntu.com-20131220153526-j3xu9gp51ltzlizc
Tags: 1.0.0-1
http://bugs.debian.org/728214
http://bugs.debian.org/728215
* New upstream release. (Closes: #728214, #728215)
* debian/control: add a versioned dependency for libqmi -- we need at least
  version 1.4.
* debian/control: build-depends on libmbim-glib-dev 1.4
* debian/rules: run the local autogen.sh rather than gnome-autogen.sh.
* debian/rules: drop --with-tests. 
* debian/rules: clean up after gtk-doc files left around.
* debian/patches/glib_fixes.patch: link against glib explicitly for the
  huawei modem helper tests.
* debian/libmm-glib0.symbols: updated symbols.
* debian/watch: update watch file for new location of upstream source.

Show diffs side-by-side

added added

removed removed

Lines of Context:
data/Makefile.am
34
34
# DBus Activation file
35
35
dbusactivationdir = $(datadir)/dbus-1/system-services
36
36
dbusactivation_DATA = org.freedesktop.ModemManager1.service
37
 
dbusactivation_in_files_systemd = org.freedesktop.ModemManager1.service.systemd.in
38
 
dbusactivation_in_files_nosystemd = org.freedesktop.ModemManager1.service.nosystemd.in
39
 
if HAVE_SYSTEMD
40
 
org.freedesktop.ModemManager1.service: org.freedesktop.ModemManager1.service.systemd.in
41
 
        $(edit) $< >$@
42
 
else
43
 
org.freedesktop.ModemManager1.service: org.freedesktop.ModemManager1.service.nosystemd.in
44
 
        $(edit) $< >$@
45
 
endif
46
 
 
 
37
dbusactivation_in_files = org.freedesktop.ModemManager1.service.in
47
38
 
48
39
# Icon
49
40
icondir=${datadir}/icons/hicolor/22x22/apps
65
56
 
66
57
 
67
58
# Polkit
68
 
dist_polkit_policy_in_files = org.freedesktop.ModemManager1.policy.in
 
59
polkit_policy_in_in_files = org.freedesktop.ModemManager1.policy.in.in
69
60
if WITH_POLKIT
70
61
polkit_policydir = $(datadir)/polkit-1/actions
71
 
dist_polkit_policy_DATA = $(dist_polkit_policy_in_files:.policy.in=.policy)
 
62
polkit_policy_DATA = $(polkit_policy_in_in_files:.policy.in.in=.policy)
72
63
@INTLTOOL_POLICY_RULE@
73
64
endif
74
65
 
82
73
 
83
74
DISTCLEANFILES = \
84
75
        $(dbusactivation_DATA) \
85
 
        $(dbusservice_DATA)
 
76
        $(dbusservice_DATA) \
 
77
        $(polkit_policy_DATA)
86
78
 
87
79
if HAVE_SYSTEMD
88
80
DISTCLEANFILES += $(systemdsystemunit_DATA)
91
83
 
92
84
EXTRA_DIST = \
93
85
        $(systemdsystemunit_in_files) \
94
 
        $(dbusactivation_in_files_systemd) \
95
 
        $(dbusactivation_in_files_nosystemd) \
 
86
        $(dbusactivation_in_files) \
96
87
        $(dbusservice_file_polkit) \
97
88
        $(dbusservice_file_nopolkit) \
98
89
        $(icon_DATA) \
99
 
        $(dist_polkit_policy_in_files) \
 
90
        $(polkit_policy_in_in_files) \
100
91
        $(logos) \
101
92
        $(diagrams)