From a58c7b50e9a4b2d03763eff154b47a47e3398d11 Mon Sep 17 00:00:00 2001 From: Peter Williams Date: Sat, 26 May 2001 04:59:00 +0000 Subject: Reference libeshell.la instead of libeshell.a. 2001-05-25 Peter Williams * gui/component/Makefile.am: Reference libeshell.la instead of libeshell.a. 2001-05-25 Peter Williams * gui/Makefile.am: Reference libeshell.la instead of libeshell.a. 2001-05-25 Peter Williams * component/Makefile.am: Reference libeshell.la instead of libeshell.a. 2001-05-25 Peter Williams * Makefile.am: Reference libeshell.la instead of libeshell.a. 2001-05-25 Peter Williams * Makefile.am: Change libeshell from a noinst_LIBRARIES to a lib_LTLIBRARIES. Install its headers in $includedir/evolution/shell. * evolution-storage.c (safe_corba_string): New, copy of e_safe_corba_string in libeutil. This way libeshell doesn't have a missing symbol when programs that don't have libeutil link to it. (evolution_storage_register): s,e_safe_corba_string,safe_corba_string,g. svn path=/trunk/; revision=10007 --- shell/Makefile.am | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) (limited to 'shell/Makefile.am') diff --git a/shell/Makefile.am b/shell/Makefile.am index 8cd1c9c3ef..2b9ba7a20e 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -47,33 +47,39 @@ idl_DATA = $(IDLS) # Shell library -noinst_LIBRARIES = \ - libeshell.a +lib_LTLIBRARIES = \ + libeshell.la -libeshell_a_SOURCES = \ +eshellincludedir = $(includedir)/evolution/shell + +eshellinclude_HEADERS = \ + Evolution.h \ + e-folder-tree.h \ + evolution-local-storage.h \ + evolution-session.h \ + evolution-shell-client.h \ + evolution-shell-component-client.h \ + evolution-shell-component.h \ + evolution-shell-component-dnd.h \ + evolution-shell-view.h \ + evolution-storage-listener.h \ + evolution-storage-set-view-listener.h \ + evolution-storage.h + +libeshell_la_SOURCES = \ $(IDL_GENERATED) \ e-folder-tree.c \ - e-folder-tree.h \ evolution-local-storage.c \ - evolution-local-storage.h \ evolution-session.c \ - evolution-session.h \ evolution-shell-client.c \ - evolution-shell-client.h \ evolution-shell-component-client.c \ - evolution-shell-component-client.h \ evolution-shell-component.c \ - evolution-shell-component.h \ evolution-shell-component-dnd.c \ - evolution-shell-component-dnd.h \ evolution-shell-view.c \ - evolution-shell-view.h \ evolution-storage-listener.c \ - evolution-storage-listener.h \ evolution-storage-set-view-listener.c \ - evolution-storage-set-view-listener.h \ evolution-storage.c \ - evolution-storage.h + $(eshellinclude_HEADERS) # Evolution executable @@ -138,7 +144,7 @@ evolution_SOURCES = \ main.c evolution_LDADD = \ - libeshell.a \ + libeshell.la \ importer/libevolution-importer.la \ $(top_builddir)/widgets/misc/libemiscwidgets.a \ $(top_builddir)/e-util/libeutil.la \ -- cgit v1.2.3