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
2003-02-05 22:25:18 +00:00
parent fe4da718f0
commit fefb7820db
16 changed files with 71 additions and 38 deletions
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@ -1,3 +1,34 @@
+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:
--- 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@
--- 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>
--- 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>


--- 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>


--- 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>
--- 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>
--- 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>
--- 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;
--- 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>

--- 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>
--- 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>
--- 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>
--- 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"
--- 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		\
--- 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)