From fd6cd9e3a6dc06f9b8e44ec13ac881ebd6793e6e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 23 Aug 2008 15:36:32 +0000 Subject: Progress update: - Discard libnm-glib method of monitoring network connectivity. - Decided to make EShell a singleton GObject after all. Makes the design cleaner, despite having to pass a singleton instance around. - Make the switcher button style persistent. svn path=/branches/kill-bonobo/; revision=36043 --- shell/Makefile.am | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'shell/Makefile.am') diff --git a/shell/Makefile.am b/shell/Makefile.am index 7cdaf7f048..55ff19f40a 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -26,13 +26,9 @@ INCLUDES = \ noinst_PROGRAMS = evolution -if NM_SUPPORT_GLIB -NM_SUPPORT_FILES = e-shell-nm-glib.c -else if NM_SUPPORT NM_SUPPORT_FILES = e-shell-nm.c endif -endif # Data Server CORBA stuff DATASERVER_IDL_GENERATED_H = \ @@ -174,6 +170,10 @@ uninstall-local: uninstall-evolution endif +MARSHAL_GENERATED = \ + e-shell-marshal.c \ + e-shell-marshal.h +@EVO_MARSHAL_RULE@ # Extra dist stuff @@ -182,6 +182,7 @@ EXTRA_DIST = \ $(glade_DATA) \ $(schema_in_files) \ ChangeLog.pre-1-4 \ + e-shell-marshal.list \ evolution-nognome.in # Purify support -- cgit v1.2.3