summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorRobert Love <rml@novell.com>2006-05-25 20:28:48 +0000
committerRobert Love <rlove@rlove.org>2006-05-25 20:28:48 +0000
commit00481771249a9e56afbdcc8429dbb316b2a59775 (patch)
tree4ea5768509c0175a191cc4b7cf71ac8730a79f94 /Makefile.am
parent3c1f5a04c58240f03ffb4eba68196446dc148541 (diff)
downloadNetworkManager-00481771249a9e56afbdcc8429dbb316b2a59775.tar.gz
2006-05-25 Robert Love <rml@novell.com>
Patch Valentine Sinitsyn <e_val@inbox.ru> to fix GNOME bug #342398: * configure.in, gnome/Makefile.am, Makefile.am: Add "--without-gnome" configure flag to disable building of the GNOME-based applet. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1765 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am8
1 files changed, 7 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 12b5da07f8..3e0401773f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,13 +15,19 @@ EXTRA_DIST = \
NetworkManager.pc.in \
intltool-extract.in \
intltool-merge.in \
- intltool-update.in \
+ intltool-update.in
+
+if WITH_GNOME
+EXTRA_DIST += \
nm-applet.desktop
+endif
DISTCLEANFILES = intltool-extract intltool-merge intltool-update
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = NetworkManager.pc
+if WITH_GNOME
autostartdir = $(datadir)/gnome/autostart
autostart_DATA = nm-applet.desktop
+endif