← Back to branch summary

~dylanmccall/ubuntu/oneiric/network-manager-applet/lp852961-disable-autostart-for-gnome-shell

« back to all changes in this revision

Viewing changes to Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2011-05-30 13:25:18 UTC
  • mto: This revision was merged to the branch mainline in revision 68.
  • Revision ID: james.westby@ubuntu.com-20110530132518-ya5i5mcrl8szsmoj
Tags: upstream-0.8.9997+git.20110529t170033.9ec4c5d
Import upstream version 0.8.9997+git.20110529t170033.9ec4c5d

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile.am
8
8
        intltool-merge.in               \
9
9
        intltool-update.in
10
10
 
11
 
dbusservicedir = $(DBUS_SYS_DIR)
12
 
dbusservice_DATA = nm-applet.conf
13
 
 
14
 
DBUS_126_CONF = nm-applet-dbus-126.conf
15
 
DBUS_PRE_126_CONF = nm-applet-pre-dbus-126.conf
16
 
 
17
 
nm-applet.conf:
18
 
if HAVE_DBUS_126
19
 
        cp -f $(top_srcdir)/$(DBUS_126_CONF) nm-applet.conf
20
 
else
21
 
        cp -f $(top_srcdir)/$(DBUS_PRE_126_CONF) nm-applet.conf
22
 
endif
23
 
 
24
11
autostartdir = $(sysconfdir)/xdg/autostart
25
12
autostart_in_files = nm-applet.desktop.in
26
13
autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
27
14
 
 
15
applicationsdir = $(datadir)/applications
 
16
applications_DATA = $(autostart_DATA)
 
17
 
28
18
desktopdir = $(datadir)/applications
29
19
desktop_in_files = nm-connection-editor.desktop.in
30
20
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
39
29
EXTRA_DIST += \
40
30
        $(schemas_in_files) \
41
31
        $(autostart_in_files) \
42
 
        $(desktop_in_files) \
43
 
        $(DBUS_126_CONF) \
44
 
        $(DBUS_PRE_126_CONF)
 
32
        $(desktop_in_files)
45
33
 
46
34
CLEANFILES = \
47
35
        $(autostart_DATA) \
48
36
        $(desktop_DATA) \
49
 
        $(schemas_DATA) \
50
 
        $(dbusservice_DATA)
 
37
        $(schemas_DATA)
51
38
 
52
39
DISTCLEANFILES = intltool-extract intltool-merge intltool-update
53
40