Define EVOLUTION_IMAGES using $(imagesdir). Define EVOLUTION_GLADEDIR

	* Makefile.am (INCLUDES): Define EVOLUTION_IMAGES using
	$(imagesdir). Define EVOLUTION_GLADEDIR using $(gladedir)
	(eshellincludedir): Define in terms of $(privincludedir)
	(evolution_LDFLAGS): Remove this. gmodule-2's LDFLAGS include the
	equivalent of -export-dynamic for us.
	(serverdir, etspecdir): Remove. Defined in configure.in now.

	* e-folder.c: #include <string.h>
	* e-corba-config-page.c: Likewise
	* e-shell-config.c: Likewise
	* e-shell-folder-creation-dialog.c: Likewise
	* e-shell-folder-title-bar.c: Likewise
	* e-shell-startup-wizard.c: Likewise
	* evolution-activity-client.c: Likewise.
	* evolution-shell-component-client.c: Likewise
	* evolution-shell-component-utils.c: Likewise
	* evolution-storage.c: Likewise
	* evolution-test-component.c: Likewise

	* e-shortcuts-view.c (destroy_group_cb): Remove unused variable

	* importer/Makefile.am (INCLUDES): Remove -I$(includedir). Define
	EVOLUTION_GLADEDIR using $(gladedir).
	(libevolution_importerincludedir): Define in terms of
	$(privincludedir)
	(gladedir): Removed. Defined in configure.in now.

	* glade/Makefile.am (gladedir): Likewise

svn path=/trunk/; revision=19774

16 files changed, 71 insertions, 38 deletions

diff --git a/shell/ChangeLog b/shell/ChangeLog
index 02e3bd0610..fa52f220bc 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,36 @@
 2003-02-05  Dan Winship  <danw@ximian.com>
 
+	* Makefile.am (INCLUDES): Define EVOLUTION_IMAGES using
+	$(imagesdir). Define EVOLUTION_GLADEDIR using $(gladedir)
+	(eshellincludedir): Define in terms of $(privincludedir)
+	(evolution_LDFLAGS): Remove this. gmodule-2's LDFLAGS include the
+	equivalent of -export-dynamic for us.
+	(serverdir, etspecdir): Remove. Defined in configure.in now.
+
+	* e-folder.c: #include <string.h>
+	* e-corba-config-page.c: Likewise
+	* e-shell-config.c: Likewise
+	* e-shell-folder-creation-dialog.c: Likewise
+	* e-shell-folder-title-bar.c: Likewise
+	* e-shell-startup-wizard.c: Likewise
+	* evolution-activity-client.c: Likewise.
+	* evolution-shell-component-client.c: Likewise
+	* evolution-shell-component-utils.c: Likewise
+	* evolution-storage.c: Likewise
+	* evolution-test-component.c: Likewise
+
+	* e-shortcuts-view.c (destroy_group_cb): Remove unused variable
+
+	* importer/Makefile.am (INCLUDES): Remove -I$(includedir). Define
+	EVOLUTION_GLADEDIR using $(gladedir).
+	(libevolution_importerincludedir): Define in terms of
+	$(privincludedir)
+	(gladedir): Removed. Defined in configure.in now.
+
+	* glade/Makefile.am (gladedir): Likewise
+
+2003-02-05  Dan Winship  <danw@ximian.com>
+
 	* importer/evolution-intelligent-importer.c:
 	s/BonoboXObject/BonoboObject/
 
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 882737f569..32e4dadf36 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -1,24 +1,24 @@
 SUBDIRS = glade importer
 
-INCLUDES =									\
-	-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED				\
-	-DBONOBO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED			\
-	-I$(top_srcdir)/widgets							\
-	-I$(top_srcdir)/widgets/misc						\
-	-I$(top_srcdir)/libical/src/libical					\
-	-I$(top_builddir)/libical/src/libical					\
-	-I$(top_srcdir)								\
-	-DEVOLUTION_IMAGES=\""$(datadir)/evolution-$(BASE_VERSION)/images"\"	\
-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"				\
-	-DEVOLUTION_DATADIR=\""$(datadir)"\"					\
-	-DEVOLUTION_GLADEDIR=\"$(datadir)/evolution-$(BASE_VERSION)/glade\"	\
-	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"				\
-	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"				\
-	-DPREFIX=\"$(prefix)\"							\
-	-DSYSCONFDIR=\""$(sysconfdir)"\"					\
-	-DDATADIR=\""$(datadir)"\"						\
-	-DLIBDIR=\""$(datadir)"\"						\
-	-DG_LOG_DOMAIN=\"evolution-shell\"					\
+INCLUDES =							\
+	-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED		\
+	-DBONOBO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED	\
+	-I$(top_srcdir)/widgets					\
+	-I$(top_srcdir)/widgets/misc				\
+	-I$(top_srcdir)/libical/src/libical			\
+	-I$(top_builddir)/libical/src/libical			\
+	-I$(top_srcdir)						\
+	-DEVOLUTION_IMAGES=\""$(imagesdir)"\"			\
+	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"		\
+	-DEVOLUTION_DATADIR=\""$(datadir)"\"			\
+	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"			\
+	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\"		\
+	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\"		\
+	-DPREFIX=\""$(prefix)"\"				\
+	-DSYSCONFDIR=\""$(sysconfdir)"\"			\
+	-DDATADIR=\""$(datadir)"\"				\
+	-DLIBDIR=\""$(datadir)"\"				\
+	-DG_LOG_DOMAIN=\"evolution-shell\"			\
 	$(SHELL_CFLAGS)
 
 noinst_PROGRAMS = evolution evolution-test-component
@@ -87,7 +87,7 @@ idl_DATA = $(IDLS)
 privlib_LTLIBRARIES =	\
 	libeshell.la
 
-eshellincludedir = $(includedir)/evolution-$(BASE_VERSION)/shell
+eshellincludedir = $(privincludedir)/shell
 
 eshellinclude_HEADERS = 			\
 	Evolution.h				\
@@ -245,8 +245,6 @@ evolution_LDADD =							\
 	$(top_builddir)/libical/src/libical/libical-evolution.la	\
 	$(SHELL_LIBS)
 
-evolution_LDFLAGS = -export-dynamic
-
 # Test component
 
 evolution_test_component_SOURCES =	\
@@ -263,13 +261,11 @@ install-test-component: evolution-test-component
 
 # Misc stuff
 
-serverdir = $(libdir)/bonobo/servers
 server_in_files = GNOME_Evolution_Shell.server.in.in
 server_DATA = $(server_in_files:.server.in.in=.server)
 $(server_in_files:.server.in.in=.server.in): $(server_in_files)
 	sed -e "s|\@BINDIR\@|$(bindir)|" $< > $@
 
-etspecdir = $(datadir)/evolution-$(BASE_VERSION)/etspec/
 etspec_DATA = e-storage-set-view.etspec
 
 @INTLTOOL_SERVER_RULE@
diff --git a/shell/e-corba-config-page.c b/shell/e-corba-config-page.c
index c795f89d5c..50fd1bdfd6 100644
--- a/shell/e-corba-config-page.c
+++ b/shell/e-corba-config-page.c
@@ -28,6 +28,7 @@
 
 #include "Evolution.h"
 
+#include <string.h>
 #include <gal/util/e-util.h>
 
 #include <bonobo/bonobo-widget.h>
diff --git a/shell/e-folder.c b/shell/e-folder.c
index 914038d34e..0568308488 100644
--- a/shell/e-folder.c
+++ b/shell/e-folder.c
@@ -29,9 +29,9 @@
 
 #include "e-util/e-corba-utils.h"
 
+#include <string.h>
 #include <glib.h>
 #include <gtk/gtksignal.h>
-
 #include <gal/util/e-util.h>
 
 
diff --git a/shell/e-shell-config.c b/shell/e-shell-config.c
index 19928c1db6..5eba72280d 100644
--- a/shell/e-shell-config.c
+++ b/shell/e-shell-config.c
@@ -28,6 +28,7 @@
 #include "evolution-config-control.h"
 #include "evolution-folder-selector-button.h"
 
+#include <string.h>
 #include <bonobo/bonobo-generic-factory.h>
 
 
diff --git a/shell/e-shell-folder-creation-dialog.c b/shell/e-shell-folder-creation-dialog.c
index 9fe4f1efec..fc409e9194 100644
--- a/shell/e-shell-folder-creation-dialog.c
+++ b/shell/e-shell-folder-creation-dialog.c
@@ -24,6 +24,7 @@
 #include <config.h>
 #endif
 
+#include <string.h>
 #include <glib.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnome/gnome-util.h>
diff --git a/shell/e-shell-folder-title-bar.c b/shell/e-shell-folder-title-bar.c
index 7c6e2384d8..00886095bb 100644
--- a/shell/e-shell-folder-title-bar.c
+++ b/shell/e-shell-folder-title-bar.c
@@ -24,6 +24,7 @@
 #include <config.h>
 #endif
 
+#include <string.h>
 #include <gtk/gtklabel.h>
 #include <gtk/gtkimage.h>
 #include <gtk/gtkrc.h>
diff --git a/shell/e-shell-startup-wizard.c b/shell/e-shell-startup-wizard.c
index 3213f64009..97afc874df 100644
--- a/shell/e-shell-startup-wizard.c
+++ b/shell/e-shell-startup-wizard.c
@@ -33,7 +33,9 @@
 
 #include <evolution-wizard.h>
 #include "Evolution.h"
+#include "importer/GNOME_Evolution_Importer.h"
 
+#include <string.h>
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <gnome.h>
diff --git a/shell/e-shortcuts-view.c b/shell/e-shortcuts-view.c
index 13fa72d088..ba6115d07c 100644
--- a/shell/e-shortcuts-view.c
+++ b/shell/e-shortcuts-view.c
@@ -166,7 +166,6 @@ destroy_group_cb (GtkWidget *widget,
 	EShortcutsViewPrivate *priv;
 	GtkWidget *message_dialog;
 	GtkResponseType response;
-	char *question;
 
 	menu_data = (RightClickMenuData *) data;
 	shortcuts_view = menu_data->shortcuts_view;
diff --git a/shell/evolution-activity-client.c b/shell/evolution-activity-client.c
index 1447f46bc5..1ab93402d0 100644
--- a/shell/evolution-activity-client.c
+++ b/shell/evolution-activity-client.c
@@ -35,6 +35,8 @@
 
 #include "e-shell-marshal.h"
 
+#include <string.h>
+
 #include <gtk/gtksignal.h>
 #include <gtk/gtkmain.h>
 
diff --git a/shell/evolution-shell-component-client.c b/shell/evolution-shell-component-client.c
index 09f91a7bc0..621741a66f 100644
--- a/shell/evolution-shell-component-client.c
+++ b/shell/evolution-shell-component-client.c
@@ -24,6 +24,7 @@
 #include <config.h>
 #endif
 
+#include <string.h>
 #include <glib.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtktypeutils.h>
diff --git a/shell/evolution-shell-component-utils.c b/shell/evolution-shell-component-utils.c
index 8c468d2100..e855dad320 100644
--- a/shell/evolution-shell-component-utils.c
+++ b/shell/evolution-shell-component-utils.c
@@ -25,6 +25,7 @@
 
 #include "evolution-shell-component-utils.h"
 
+#include <string.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnome/gnome-util.h>
 #include <bonobo/bonobo-ui-util.h>
diff --git a/shell/evolution-storage.c b/shell/evolution-storage.c
index 53443114a8..0b349e6319 100644
--- a/shell/evolution-storage.c
+++ b/shell/evolution-storage.c
@@ -35,8 +35,8 @@
 
 #include "e-shell-marshal.h"
 
+#include <string.h>
 #include <gal/util/e-util.h>
-
 #include <gtk/gtksignal.h>
 #include <bonobo/bonobo-object.h>
 #include <bonobo/bonobo-exception.h>
diff --git a/shell/evolution-test-component.c b/shell/evolution-test-component.c
index adce60c76c..f922e88fc4 100644
--- a/shell/evolution-test-component.c
+++ b/shell/evolution-test-component.c
@@ -51,6 +51,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include <stdlib.h>
+#include <string.h>
 
 
 #define COMPONENT_ID "OAFIID:GNOME_Evolution_TestComponent_ShellComponent"
diff --git a/shell/glade/Makefile.am b/shell/glade/Makefile.am
index d1dcff6046..7e90c140e2 100644
--- a/shell/glade/Makefile.am
+++ b/shell/glade/Makefile.am
@@ -1,5 +1,3 @@
-gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade
-
 glade_DATA =						\
 	e-active-connection-dialog.glade		\
 	e-shell-config-default-folders.glade		\
diff --git a/shell/importer/Makefile.am b/shell/importer/Makefile.am
index 94f532db3c..103dfb8312 100644
--- a/shell/importer/Makefile.am
+++ b/shell/importer/Makefile.am
@@ -1,10 +1,9 @@
-INCLUDES =									\
-	-I$(top_srcdir)								\
-	-I$(top_srcdir)/shell							\
-	-I$(top_builddir)/shell							\
-	-I$(includedir)								\
-	-DG_LOG_DOMAIN=\"Evolution-Importer\"					\
-	-DEVOLUTION_GLADEDIR=\"$(datadir)/evolution-$(BASE_VERSION)/glade\"	\
+INCLUDES =					\
+	-I$(top_srcdir)				\
+	-I$(top_srcdir)/shell			\
+	-I$(top_builddir)/shell			\
+	-DG_LOG_DOMAIN=\"Evolution-Importer\"	\
+	-DEVOLUTION_GLADEDIR="\"$(gladedir)\""	\
 	$(SHELL_CFLAGS)
 
 privlib_LTLIBRARIES = libevolution-importer.la
@@ -37,7 +36,7 @@ idl_DATA = $(IDLS)
 
 # Component
 
-libevolution_importerincludedir = $(includedir)/evolution-$(BASE_VERSION)/importer
+libevolution_importerincludedir = $(privincludedir)/importer
 libevolution_importer_la_SOURCES = 		\
 	$(IDL_GENERATED)			\
 	evolution-intelligent-importer.c	\
@@ -58,7 +57,6 @@ libevolution_importer_la_LIBADD =		\
 	$(top_builddir)/e-util/libeutil.la 	\
 	$(SHELL_LIBS)
 
-gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade
 glade_DATA = import.glade
 
 EXTRA_DIST = $(glade_DATA) $(IDLS)