[Some initial broken support for building components as shlib. Mostly

just a playground for testing the idea.]

* Makefile.am: Added support for the ENABLE_SHLIB_COMPONENTS
conditional.

* GNOME_Evolution_Summary.oaf.in.in: New.

* e-summary-mail.c (update_folder_cb): Protect against
summary->mail being NULL.

* component-factory.c: Add a shlib factory.
(create_component): Get a @factory and @data.
(component_factory_init): Actually make it use a
BonoboGenericFactory again.

* configure.in: Add argument `--enable-shlib-components'.  New
substitutions OAF_SHLIB_LOCATION, OAF_SHLIB_PREFIX,
OAF_SHLIB_SUFFIX.

svn path=/trunk/; revision=16299

1 files changed, 74 insertions, 49 deletions

diff --git a/my-evolution/Makefile.am b/my-evolution/Makefile.am
index d178a0edb0..7faacbc288 100644
--- a/my-evolution/Makefile.am
+++ b/my-evolution/Makefile.am
@@ -1,5 +1,3 @@
-bin_PROGRAMS =	evolution-executive-summary
-
 INCLUDES = \
 	-I$(top_srcdir)						\
 	-I$(top_srcdir)/shell					\
@@ -26,42 +24,44 @@ MAIL_GENERATED =						\
 $(MAIL_GENERATED): $(IDLS)
 	$(ORBIT_IDL) -I $(srcdir) `$(GNOME_CONFIG) --cflags idl` $(top_srcdir)/mail/Mail.idl
 
-evolution_executive_summary_SOURCES =		\
+summary_sources =				\
 	$(MAIL_GENERATED)			\
-	component-factory.c		\
-	component-factory.h		\
-	e-cell-tri.c			\
-	e-cell-tri.h			\
-	e-summary.c			\
-	e-summary.h			\
-	e-summary-calendar.c		\
-	e-summary-calendar.h		\
-	e-summary-factory.c		\
-	e-summary-factory.h		\
-	e-summary-mail.c		\
-	e-summary-mail.h		\
-	e-summary-offline-handler.c	\
-	e-summary-offline-handler.h	\
-	e-summary-preferences.c		\
-	e-summary-preferences.h		\
-	e-summary-rdf.c			\
-	e-summary-rdf.h			\
-	e-summary-shown.c		\
-	e-summary-shown.h		\
-	e-summary-table.c		\
-	e-summary-table.h		\
-	e-summary-tasks.c		\
-	e-summary-tasks.h		\
-	e-summary-type.h		\
-	e-summary-weather.c		\
-	e-summary-weather.h		\
-	main.c				\
-	metar.c				\
-	metar.h				\
-	my-evolution-html.h		\
+	component-factory.c			\
+	component-factory.h			\
+	e-cell-tri.c				\
+	e-cell-tri.h				\
+	e-summary.c				\
+	e-summary.h				\
+	e-summary-calendar.c			\
+	e-summary-calendar.h			\
+	e-summary-factory.c			\
+	e-summary-factory.h			\
+	e-summary-mail.c			\
+	e-summary-mail.h			\
+	e-summary-offline-handler.c		\
+	e-summary-offline-handler.h		\
+	e-summary-preferences.c			\
+	e-summary-preferences.h			\
+	e-summary-rdf.c				\
+	e-summary-rdf.h				\
+	e-summary-shown.c			\
+	e-summary-shown.h			\
+	e-summary-table.c			\
+	e-summary-table.h			\
+	e-summary-tasks.c			\
+	e-summary-tasks.h			\
+	e-summary-type.h			\
+	e-summary-weather.c			\
+	e-summary-weather.h			\
+	metar.c					\
+	metar.h					\
+	my-evolution-html.h			\
 	weather.h
 
-evolution_executive_summary_LDADD = 					\
+summary_exe_sources = \
+	main.c
+
+summary_libs =				 				\
 	$(top_builddir)/calendar/gui/alarm-notify/libalarm.a		\
 	$(top_builddir)/shell/libeshell.la				\
 	$(top_builddir)/widgets/misc/libemiscwidgets.a			\
@@ -73,30 +73,55 @@ evolution_executive_summary_LDADD = 					\
 	$(top_builddir)/libwombat/libwombat.la				\
 	$(EVOLUTION_EXECUTIVE_SUMMARY_LIBS)
 
+if ENABLE_SHLIB_COMPONENTS
+
+lib_LTLIBRARIES = libevolution-executive-summary.la
+
+libevolution_executive_summary_la_SOURCES = \
+	$(summary_sources)
+
+libevolution_executive_summary_la_LIBADD = \
+	$(summary_libs)
+
+else
+
+bin_PROGRAMS = evolution-executive-summary
+
+evolution_executive_summary_SOURCES =		\
+	$(summary_sources)			\
+	$(summary_exe_sources)
+
+evolution_executive_summary_LDADD =		\
+	$(summary_libs)
+
+endif
+
 Locationdir = $(datadir)/evolution
 Location_DATA = Locations
 
+oaf_files = GNOME_Evolution_Summary.oaf
+oaf_in_files = $(oaf_files:.oaf=.oaf.in)
+oaf_in_in_files  = $(oaf_files:oaf=.oaf.in.in)
+
 oafdir = $(datadir)/oaf
-oaf_in_files = GNOME_Evolution_Summary.oaf.in
-oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
+oaf_DATA = $(oaf_files)
 
 gladedir = $(datadir)/evolution/glade
 glade_DATA = my-evolution.glade
 
 @XML_I18N_MERGE_OAF_RULE@
 
-EXTRA_DIST = $(oaf_in_files) $(oaf_DATA) $(Location_DATA) $(glade_DATA) Locations.h Location-translation-script
-
-if ENABLE_PURIFY
-PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-
-all-local: evolution-executive-summary.pure
-
-evolution-executive-summary.pure: evolution-executive-summary
-	@rm -f evolution-executive-summary.pure
-	$(PLINK) $(evolution_executive_summary_OBJECTS) $(evolution_executive_summary_LDADD) $(LIBS)
-
-endif
+EXTRA_DIST = 				\
+	$(summary_sources)		\
+	$(summary_exe_sources)		\
+	$(oaf_files)			\
+	$(oaf_in_files)			\
+	$(oaf_in_in_files)		\
+	$(oaf_DATA)			\
+	$(Location_DATA)		\
+	$(glade_DATA)			\
+	Locations.h			\
+	Location-translation-script
 
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)