From e53eacd2d9b6b775dab6e8bd8cd39f0691192437 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Wed, 4 Dec 2002 19:52:45 +0000 Subject: Updated to be a shared library. * GNOME_Evolution_Summary.server.in.in: Updated to be a shared library. * main.c: Removed. * Makefile.am: Update to compile as a shared library. * component-factory.c: Changed to be a shared library factory, for both the ShellComponent and the ConfigControl objects. * e-summary-preferences.c (e_summary_preferences_init_config_control): Renamed from e_summary_preferences_register_config_control_factory. (e_summary_preferences_create_control): Renamed from factory_fn and removed all args. svn path=/trunk/; revision=19007 --- my-evolution/Makefile.am | 33 ++++++--------------------------- 1 file changed, 6 insertions(+), 27 deletions(-) (limited to 'my-evolution/Makefile.am') diff --git a/my-evolution/Makefile.am b/my-evolution/Makefile.am index 68b10e53c2..049deefebc 100644 --- a/my-evolution/Makefile.am +++ b/my-evolution/Makefile.am @@ -62,9 +62,6 @@ summary_sources = \ my-evolution-html.h \ weather.h -summary_exe_sources = \ - main.c - summary_libs = \ $(top_builddir)/calendar/gui/alarm-notify/libalarm.a \ $(top_builddir)/shell/libeshell.la \ @@ -77,28 +74,11 @@ summary_libs = \ $(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 - -libexec_PROGRAMS = evolution-executive-summary - -evolution_executive_summary_SOURCES = \ - $(summary_sources) \ - $(summary_exe_sources) - -evolution_executive_summary_LDADD = \ - $(summary_libs) - -endif +componentdir = $(prefix)/evolution/components +component_LTLIBRARIES = libevolution-executive-summary.la +libevolution_executive_summary_la_SOURCES = $(summary_sources) +libevolution_executive_summary_la_LIBADD = $(summary_libs) +libevolution_executive_summary_la_LDFLAGS = -module -avoid-version Locationdir = $(datadir)/evolution Location_DATA = Locations @@ -111,7 +91,7 @@ server_in_files = GNOME_Evolution_Summary.server.in.in serverdir = $(libdir)/bonobo/servers server_DATA = $(server_in_files:.server.in.in=.server) $(server_in_files:.server.in.in=.server.in): $(server_in_files) - sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@ + sed -e "s|\@COMPONENTDIR\@|$(componentdir)|" $< > $@ @INTLTOOL_SERVER_RULE@ @@ -137,7 +117,6 @@ install-data-local: EXTRA_DIST = \ $(summary_sources) \ - $(summary_exe_sources) \ $(server_in_files) \ $(server_DATA) \ $(Location_DATA) \ -- cgit v1.2.3