Build a `libeshell.a' library in `shell/' so that we don't need to

link to the shell's object files directly from the components
anymore.  (That was really gross.)

svn path=/trunk/; revision=3546

11 files changed, 90 insertions, 81 deletions

diff --git a/ChangeLog b/ChangeLog
index 6c672b7994..e4a24c257e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-06-13  Ettore Perazzoli  <ettore@helixcode.com>
+
+	* notes/Makefile.am (SHELL_OBJS): Removed.
+	(evolution_notes_LDADD): Link with
+	`$(top_builddir)/shell/libeshell.a'.
+
 2000-06-12  Ettore Perazzoli  <ettore@helixcode.com>
 
 	* widgets/Makefile.am (SUBDIRS): build `misc' before everything
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index ea0932cfc4..c68c398062 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,9 @@
+2000-06-13  Ettore Perazzoli  <ettore@helixcode.com>
+
+	* gui/component/Makefile.am (SHELL_OBJS): Removed.
+	(evolution_addressbook_LDADD): Link with
+	`$(top_builddir)/shell/libeshell.a'.
+
 2000-06-12  Federico Mena Quintero  <federico@helixcode.com>
 
 	* contact-editor/e-contact-editor-categories.c: Removed the
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index 56dedae772..ade764904b 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -40,16 +40,8 @@ evolution_addressbook_SOURCES = 	\
 	addressbook.c			\
 	addressbook.h
 
-# FIXME We should make a libeshell library instead of this gross hack.
-SHELL_OBJS =						  \
-	$(top_builddir)/shell/Evolution-common.o 	  \
-	$(top_builddir)/shell/Evolution-stubs.o		  \
-	$(top_builddir)/shell/Evolution-skels.o		  \
-	$(top_builddir)/shell/evolution-shell-component.o \
-	$(top_builddir)/shell/evolution-storage.o
-
 evolution_addressbook_LDADD =						\
-	$(SHELL_OBJS)							\
+	$(top_builddir)/shell/libeshell.a				\
 	$(EXTRA_GNOME_LIBS)						\
 	$(BONOBO_HTML_GNOME_LIBS)					\
 	$(top_builddir)/addressbook/gui/minicard/libeminicard.a		\
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index bae6a3c3cc..62233a4eb9 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2000-06-13  Ettore Perazzoli  <ettore@helixcode.com>
+
+	* gui/Makefile.am (SHELL_OBJS): Removed.
+	(evolution_calendar_LDADD): Link with
+	`$(top_builddir)/shell/libeshell.a'.
+
 2000-06-09  Ettore Perazzoli  <ettore@helixcode.com>
 
 	* gui/component-factory.c (factory_fn): Pass NULL for the new args
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 7a126b79ef..7da994c995 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -88,15 +88,8 @@ evolution_calendar_SOURCES =			\
 	print.h					\
 	prop.c
 
-# FIXME We should make a libeshell library instead of this gross hack.
-SHELL_OBJS =					\
-	$(top_builddir)/shell/Evolution-common.o \
-	$(top_builddir)/shell/Evolution-stubs.o	\
-	$(top_builddir)/shell/Evolution-skels.o	\
-	$(top_builddir)/shell/evolution-shell-component.o
-
 evolution_calendar_LDADD =					\
-	$(SHELL_OBJS)						\
+	$(top_builddir)/shell/libeshell.a			\
 	$(EXTRA_GNOME_LIBS)					\
 	$(BONOBO_HTML_GNOME_LIBS)				\
 	$(top_builddir)/widgets/e-text/libetext.a		\
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 5a05b40867..af315d8c1c 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2000-06-13  Ettore Perazzoli  <ettore@helixcode.com>
+
+	* Makefile.am (SHELL_OBJS): Removed.
+	(evolution_mail_LDADD): Use `libeshell.a'.  Also use
+	`top_builddir' consistently.
+
 2000-06-12  Jeffrey Stedfast  <fejj@helixcode.com>
 
 	* mail-config.c: Got rid of sources_max_row and identities_max_row
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 81724fc04e..51c7aa3150 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -28,14 +28,6 @@ EVOLUTION_MAIL_CORBA_GENERATED = \
 	Mail-skels.c		\
 	Mail-stubs.c
 
-# FIXME We should make a libeshell library instead of this gross hack.
-SHELL_OBJS =					\
-	$(top_builddir)/shell/Evolution-common.o \
-	$(top_builddir)/shell/Evolution-stubs.o	\
-	$(top_builddir)/shell/Evolution-skels.o	\
-	$(top_builddir)/shell/evolution-shell-component.o \
-	$(top_builddir)/shell/evolution-storage.o
-
 # FIXME Is there any way around having to do this?
 CAMEL_OBJS_EXTRA =					\
 	$(top_builddir)/camel/providers/vee/libcamelvee.la
@@ -63,17 +55,17 @@ evolution_mail_SOURCES =		\
 
 
 evolution_mail_LDADD = 					\
-	$(SHELL_OBJS)					\
-	../composer/libcomposer.la		 	\
+	$(top_builddir)/shell/libeshell.a		\
+	$(top_builddir)/composer/libcomposer.la		\
 	$(top_builddir)/widgets/e-paned/libepaned.a	\
 	$(top_builddir)/widgets/misc/libemiscwidgets.a	\
-	../widgets/e-table/libetable.a			\
-	../widgets/e-text/libetext.a			\
+	$(top_builddir)/widgets/e-table/libetable.a	\
+	$(top_builddir)/widgets/e-text/libetext.a	\
 	$(CAMEL_OBJS_EXTRA)				\
-	../camel/libcamel.la				\
-	../e-util/libeutil.la				\
-	../libibex/libibex.la				\
-	../filter/libfilter.la				\
+	$(top_builddir)/camel/libcamel.la		\
+	$(top_builddir)/e-util/libeutil.la		\
+	$(top_builddir)/libibex/libibex.la		\
+	$(top_builddir)/filter/libfilter.la		\
 	$(BONOBO_HTML_GNOME_LIBS)			\
 	$(UNICODE_LIBS)
 
diff --git a/notes/Makefile.am b/notes/Makefile.am
index c24c2590ce..388e19152a 100644
--- a/notes/Makefile.am
+++ b/notes/Makefile.am
@@ -14,14 +14,6 @@ INCLUDES = \
 	-DEVOLUTION_DATADIR=\""$(datadir)"\"            \
 	-DG_LOG_DOMAIN=\"evolution-notes\"
 
-# FIXME We should make a libeshell library instead of this gross hack.
-SHELL_OBJS =					\
-	$(top_builddir)/shell/Evolution-common.o \
-	$(top_builddir)/shell/Evolution-stubs.o	\
-	$(top_builddir)/shell/Evolution-skels.o	\
-	$(top_builddir)/shell/evolution-shell-component.o \
-	$(top_builddir)/shell/evolution-storage.o
-
 evolution_notes_SOURCES =		\
 	component-factory.c		\
 	main.c				\
@@ -45,14 +37,10 @@ endif
 
 notes_test_LDADD =					\
 	$(top_builddir)/widgets/e-text/libetext.a 	\
-	../e-util/libeutil.la				\
+	$(top_builddir)/e-util/libeutil.la		\
 	$(BONOBO_HTML_GNOME_LIBS)			
 
 evolution_notes_LDADD = 				\
-	../e-util/libeutil.la				\
-	$(SHELL_OBJS)					\
+	$(top_builddir)/e-util/libeutil.la		\
+	$(top_builddir)/shell/libeshell.a		\
 	$(BONOBO_HTML_GNOME_LIBS)			
-
-
-
-
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 8bd30b6f36..8228fd213b 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,11 @@
+2000-06-13  Ettore Perazzoli  <ettore@helixcode.com>
+
+	* Makefile.am: Compile the CORBA-built files,
+	evolution-shell-component.c and evolution-storage.c into a
+	separate `libeshell.a' library.  Link the `evolution' executable
+	to it.  Also cleaned up a bit and got rid of the `CPP_FLAGS'
+	assignment.
+
 2000-06-12  Michael Meeks  <michael@helixcode.com>
 
 	* e-shell-folder-selection-dialog.c: include gnome-dialog.h
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 4d605d5a15..149046412c 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -1,39 +1,58 @@
 SUBDIRS = glade
 
-imagesdir = $(datadir)/images/evolution
+INCLUDES = 								\
+	-I$(top_srcdir)/widgets						\
+	-I$(top_srcdir)/widgets/misc					\
+	-I$(top_srcdir)							\
+	$(BONOBO_GNOME_CFLAGS)						\
+	-DEVOLUTION_IMAGES=\""$(datadir)/images/evolution"\"		\
+	-DEVOLUTION_VERSION=\""$(VERSION)"\"				\
+	-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"   		\
+	-DEVOLUTION_DATADIR=\""$(datadir)"\"            		\
+	-DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\"		\
+	-DG_LOG_DOMAIN=\"evolution-shell\"
 
-bin_PROGRAMS = evolution
+EXTRA_DIST = $(IDLS)
 
-INCLUDES = 						\
-	-I$(top_srcdir)/widgets				\
-	-I$(top_srcdir)/widgets/misc			\
-	-I$(top_srcdir)					\
-	$(BONOBO_GNOME_CFLAGS)				\
-	-DEVOLUTION_IMAGES=\""$(imagesdir)"\"		\
-	-DEVOLUTION_VERSION=\""$(VERSION)"\"		\
-	-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"   \
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"            \
-	-DG_LOG_DOMAIN=\"evolution-shell\"
+CLEANFILES = $(IDL_GENERATED)
+
+# CORBA stuff
+
+IDLS = \
+	Evolution.idl			\
+	Evolution-Shell.idl		\
+	Evolution-ShellComponent.idl	\
+	Evolution-Storage.idl
 
-EVOLUTION_CORBA_GENERATED = 	\
+IDL_GENERATED = \
 	Evolution.h		\
 	Evolution-common.c	\
 	Evolution-skels.c	\
 	Evolution-stubs.c
 
-CLEANFILES = $(EVOLUTION_CORBA_GENERATED)
+Evolution-impl.o: Evolution.h
 
-IDLS = 					\
-	Evolution.idl			\
-	Evolution-Shell.idl		\
-	Evolution-ShellComponent.idl	\
-	Evolution-Storage.idl
+$(IDL_GENERATED): $(IDLS)
+	$(ORBIT_IDL) -I$(datadir)/idl -I`$(GNOME_CONFIG) --datadir`/idl	\
+		-I$(srcdir) $(srcdir)/Evolution.idl
+
+# Shell library
 
-CPPFLAGS = \
-	-DE_GLADEDIR=\"$(datadir)/evolution/glade\"
+noinst_LIBRARIES =	\
+	libeshell.a
+
+libeshell_a_SOURCES = 				\
+	$(IDL_GENERATED)			\
+	evolution-shell-component.c		\
+	evolution-shell-component.h		\
+	evolution-storage.c			\
+	evolution-storage.h
+
+# Evolution executable
+
+bin_PROGRAMS = evolution
 
 evolution_SOURCES =				\
-	$(EVOLUTION_CORBA_GENERATED)		\
 	e-component-registry.c			\
 	e-component-registry.h			\
 	e-corba-storage-registry.c		\
@@ -77,18 +96,10 @@ evolution_SOURCES =				\
 	e-storage.h				\
 	evolution-shell-component-client.c	\
 	evolution-shell-component-client.h	\
-	evolution-shell-component.c		\
-	evolution-shell-component.h		\
-	evolution-storage.c			\
-	evolution-storage.h			\
 	main.c
 
-Evolution-impl.o: Evolution.h
-
-$(EVOLUTION_CORBA_GENERATED): $(IDLS)
-	$(ORBIT_IDL) -I$(datadir)/idl -I`$(GNOME_CONFIG) --datadir`/idl -I$(srcdir) $(srcdir)/Evolution.idl
-
 evolution_LDADD =						\
+	libeshell.a						\
 	$(top_builddir)/widgets/shortcut-bar/libshortcut-bar.a  \
 	$(top_builddir)/widgets/e-paned/libepaned.a		\
 	$(top_builddir)/widgets/e-text/libetext.a		\
@@ -96,9 +107,10 @@ evolution_LDADD =						\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(BONOBO_GNOME_LIBS)
 
-EXTRA_DIST = $(IDLS)
+# Purify support
 
 if ENABLE_PURIFY
+
 PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 
 all-local: evolution.pure
diff --git a/shell/e-shell-folder-creation-dialog.c b/shell/e-shell-folder-creation-dialog.c
index 342f65ff39..1fcfb779e3 100644
--- a/shell/e-shell-folder-creation-dialog.c
+++ b/shell/e-shell-folder-creation-dialog.c
@@ -39,7 +39,7 @@
 #include "e-shell-folder-creation-dialog.h"
 
 
-#define GLADE_FILE_NAME  E_GLADEDIR "/e-shell-folder-creation-dialog.glade"
+#define GLADE_FILE_NAME  EVOLUTION_GLADEDIR "/e-shell-folder-creation-dialog.glade"
 
 
 /* Data for the callbacks.  */