From fefb7820db99e63564395beeec82949ccb0e3b9f Mon Sep 17 00:00:00 2001
From: Dan Winship <danw@src.gnome.org>
Date: Wed, 5 Feb 2003 22:25:18 +0000
Subject: 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
---
 shell/glade/Makefile.am | 2 --
 1 file changed, 2 deletions(-)

(limited to 'shell/glade')

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