aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog8
-rw-r--r--shell/Makefile.am76
-rw-r--r--shell/e-shell-folder-creation-dialog.c2
3 files changed, 53 insertions, 33 deletions
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. */