diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-07-15 00:41:54 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-07-15 01:38:12 +0800 |
| commit | 6d9e836a6fa0bb501f9fad4306373092bd758d29 (patch) | |
| tree | 7843b42c00bc45175bbe8e80059cf2643aa1ee89 /shell | |
| parent | 374bd42f69aca2e132fd854c9619f3d7491f1f96 (diff) | |
| parent | e5fe0c9a3b74bf4910d768d65bb59a53c3792001 (diff) | |
| download | gsoc2013-evolution-6d9e836a6fa0bb501f9fad4306373092bd758d29.tar gsoc2013-evolution-6d9e836a6fa0bb501f9fad4306373092bd758d29.tar.gz gsoc2013-evolution-6d9e836a6fa0bb501f9fad4306373092bd758d29.tar.bz2 gsoc2013-evolution-6d9e836a6fa0bb501f9fad4306373092bd758d29.tar.lz gsoc2013-evolution-6d9e836a6fa0bb501f9fad4306373092bd758d29.tar.xz gsoc2013-evolution-6d9e836a6fa0bb501f9fad4306373092bd758d29.tar.zst gsoc2013-evolution-6d9e836a6fa0bb501f9fad4306373092bd758d29.zip | |
Merge branch 'master' into kill-bonobo
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/Makefile.am | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am index 878642ec21..877d4c83bc 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -27,10 +27,16 @@ AM_CPPFLAGS = \ $(TZDIALOG_CFLAGS) \ $(SHELL_CFLAGS) +if NM_SUPPORT +AM_CPPFLAGS += \ + $(DBUS_GLIB_CFLAGS) \ + $(NM_CFLAGS) +endif + bin_PROGRAMS = evolution if NM_SUPPORT -NM_SUPPORT_FILES = e-shell-nm.c +NM_SUPPORT_FILES = e-shell-nm.c endif # Data Server CORBA stuff @@ -103,6 +109,10 @@ libeshell_la_LIBADD = \ $(top_builddir)/widgets/menus/libmenus.la \ $(SHELL_LIBS) +if NM_SUPPORT +libeshell_la_LIBADD += $(DBUS_GLIB_LIBS) +endif + # Evolution executable if HAVE_WINDRES |