[evolution-patches] Getting e-d-s working with gnome-build

From: Philip Van Hoof <spam pvanhoof be>
To: evolution-patches lists ximian com
Cc: Harish Krishnaswamy <kharish novell com>
Subject: [evolution-patches] Getting e-d-s working with gnome-build
Date: Sun, 05 Jun 2005 00:37:43 +0200

Hi there,

This rather strange patch will remove the fact that all the "targetdir" variables are declared in the configure.in file.

You see the thing is, these days some IDE's will try to parse the Makefile.am files. Gnome-build (which you can find in cvs.gnome.org) is such a parser being used by a popular development environment (Anjuta 2.0). Gnome-build, however, won't succeed in parsing a Makefile.am where the target isn't complete (for example where the targetdir variable isn't specified). Therefore , and since Anjuta uses gnome-build, e-d-s can't be used with a IDE like Anjuta 2.0.

This patch will modify that. It will put the targetdir variables in the Makefile.am's. Since the locations depend on variables like API_VERSION they shouldn't be changed manually anyhow. They aren't locations that change often or frequently. And not much developers want to specify the location would the build-environment instruct the pre-compiler to alter filepaths if a developer would do this.

So I don't see any good reason for putting it in the configure.in file. And since doing that does cause that some useful tools, like gnome-build, get confused; I'd prefer it to be like most Makefile.am/configure.in combinations.

I also attached a screenshot which shows that after you apply this patch, the gnome-build test application will successfully load e-d-s by parsing it's Makefile.am infrastructure.

Making it possible to develop the different Evolution components using IDE's like Eclipse (Some Eclipse developers are planning to start using gnome-build in the CDT plugin of Eclipse -- I talked to Andrew and Ben on GUADEC about this --), will make it more easy for newcomers to join the Evolution project. It's my opinion that therefore, we shouldn't ignore the different development tools and environments (like Eclipse, Anjuta, etcetera).

-- 
Philip Van Hoof, Software Developer @ Cronos
home: me at pvanhoof dot be
gnome: pvanhoof at gnome dot org
work: philip dot vanhoof at cronos dot be
junk: philip dot vanhoof at gmail dot com
http://www.pvanhoof.be/

Index: configure.in
===================================================================
RCS file: /cvs/gnome/evolution-data-server/configure.in,v
retrieving revision 1.110
diff -u -r1.110 configure.in
--- configure.in	28 May 2005 11:55:37 -0000	1.110
+++ configure.in	4 Jun 2005 22:25:07 -0000
@@ -1151,30 +1151,30 @@
 privincludedir='${includedir}'/evolution-data-server-$BASE_VERSION
 AC_SUBST(privincludedir)
 
-privlibdir='${libdir}'/evolution-data-server-$BASE_VERSION
-AC_SUBST(privlibdir)
+dnl privlibdir='${libdir}'/evolution-data-server-$BASE_VERSION
+dnl AC_SUBST(privlibdir)
 
-idldir="$datadir/idl/evolution-data-server-$API_VERSION"
-AC_SUBST(idldir)
+dnl idldir="$datadir/idl/evolution-data-server-$API_VERSION"
+dnl AC_SUBST(idldir)
 
-imagesdir="$datadir/pixmaps/evolution-data-server-$BASE_VERSION"
-AC_SUBST(imagesdir)
+dnl imagesdir="$datadir/pixmaps/evolution-data-server-$BASE_VERSION"
+dnl AC_SUBST(imagesdir)
 
-serverdir="$libdir/bonobo/servers"
-AC_SUBST(serverdir)
+dnl serverdir="$libdir/bonobo/servers"
+dnl AC_SUBST(serverdir)
 
-extensiondir='${libdir}'/evolution-data-server-$API_VERSION/extensions
-AC_SUBST(extensiondir)
+dnl extensiondir='${libdir}'/evolution-data-server-$API_VERSION/extensions
+dnl AC_SUBST(extensiondir)
 
-gladedir="$privdatadir/glade"
-AC_SUBST(gladedir)
+dnl gladedir="$privdatadir/glade"
+dnl AC_SUBST(gladedir)
 
-weatherdatadir="$privdatadir/weather"
-AC_SUBST(weatherdatadir)
+dnl weatherdatadir="$privdatadir/weather"
+dnl AC_SUBST(weatherdatadir)
 
 dnl separate camel from e-d-s?  or should it be under the same spot?  same for now.
-camel_providerdir='${libdir}'/evolution-data-server-$API_VERSION/camel-providers
-AC_SUBST(camel_providerdir)
+dnl camel_providerdirsetting='${libdir}'/evolution-data-server-$API_VERSION/camel-providers
+dnl AC_SUBST(camel_providerdir)
 
 dnl ************************
 dnl IDL/Component Versioning
Index: addressbook/backends/file/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/backends/file/Makefile.am,v
retrieving revision 1.8
diff -u -r1.8 Makefile.am
--- addressbook/backends/file/Makefile.am	31 Jan 2005 22:42:33 -0000	1.8
+++ addressbook/backends/file/Makefile.am	4 Jun 2005 22:25:07 -0000
@@ -7,6 +7,7 @@
 	-I$(top_srcdir)/libdb/dist			\
         $(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
+extensiondir = $(libdir)/evolution-data-server-$(API_VERSION)/extensions
 extension_LTLIBRARIES = libebookbackendfile.la
 
 libebookbackendfile_la_SOURCES =			\
Index: addressbook/backends/groupwise/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/backends/groupwise/Makefile.am,v
retrieving revision 1.8
diff -u -r1.8 Makefile.am
--- addressbook/backends/groupwise/Makefile.am	31 Jan 2005 22:42:33 -0000	1.8
+++ addressbook/backends/groupwise/Makefile.am	4 Jun 2005 22:25:07 -0000
@@ -7,6 +7,8 @@
 	-I$(top_srcdir)/servers/groupwise               \
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)                \
 	$(SOUP_CFLAGS)	
+
+extensiondir = $(libdir)/evolution-data-server-$(API_VERSION)/extensions
 extension_LTLIBRARIES = libebookbackendgroupwise.la
 
 libebookbackendgroupwise_la_SOURCES =			\
Index: addressbook/backends/ldap/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/backends/ldap/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- addressbook/backends/ldap/Makefile.am	31 Jan 2005 22:42:34 -0000	1.7
+++ addressbook/backends/ldap/Makefile.am	4 Jun 2005 22:25:07 -0000
@@ -7,6 +7,7 @@
 	$(LDAP_CFLAGS)					\
         $(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
+extensiondir = $(libdir)/evolution-data-server-$(API_VERSION)/extensions
 extension_LTLIBRARIES = libebookbackendldap.la
 
 libebookbackendldap_la_SOURCES =			\
@@ -28,4 +29,4 @@
 ldapschemadir = $(privdatadir)
 ldapschema_DATA= $(LDAP_SCHEMA)
 
-EXTRA_DIST = $(LDAP_SCHEMA)
\ No newline at end of file
+EXTRA_DIST = $(LDAP_SCHEMA)
Index: addressbook/backends/vcf/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/backends/vcf/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- addressbook/backends/vcf/Makefile.am	31 Jan 2005 22:42:34 -0000	1.7
+++ addressbook/backends/vcf/Makefile.am	4 Jun 2005 22:25:07 -0000
@@ -6,6 +6,7 @@
 	-I$(top_builddir)/addressbook			\
         $(EVOLUTION_ADDRESSBOOK_CFLAGS)
 
+extensiondir = $(libdir)/evolution-data-server-$(API_VERSION)/extensions
 extension_LTLIBRARIES = libebookbackendvcf.la
 
 libebookbackendvcf_la_SOURCES =			\
Index: addressbook/idl/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/addressbook/idl/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- addressbook/idl/Makefile.am	4 Nov 2003 14:29:29 -0000	1.2
+++ addressbook/idl/Makefile.am	4 Jun 2005 22:25:07 -0000
@@ -1,3 +1,5 @@
+idldir = $(datadir)/idl/evolution-data-server-$(API_VERSION)
+
 idl_DATA =					\
 	Evolution-DataServer-Addressbook.idl
 
Index: art/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/art/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- art/Makefile.am	4 Jan 2005 18:47:48 -0000	1.1
+++ art/Makefile.am	4 Jun 2005 22:25:08 -0000
@@ -1,3 +1,5 @@
+imagesdir = $(datadir)/pixmaps/evolution-data-server-$(BASE_VERSION)
+
 images_DATA = \
 	category_birthday_16.png		\
 	category_business_16.png		\
Index: calendar/backends/contacts/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/backends/contacts/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- calendar/backends/contacts/Makefile.am	31 Jan 2005 22:48:53 -0000	1.6
+++ calendar/backends/contacts/Makefile.am	4 Jun 2005 22:25:08 -0000
@@ -11,7 +11,7 @@
 	-I$(top_srcdir)/addressbook			\
 	-I$(top_builddir)/addressbook			\
 	$(EVOLUTION_CALENDAR_CFLAGS)
-
+extensiondir = $(libdir)/evolution-data-server-$(API_VERSION)/extensions
 extension_LTLIBRARIES = libecalbackendcontacts.la
 
 libecalbackendcontacts_la_SOURCES =		\
Index: calendar/backends/file/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/backends/file/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- calendar/backends/file/Makefile.am	18 May 2005 07:29:01 -0000	1.7
+++ calendar/backends/file/Makefile.am	4 Jun 2005 22:25:08 -0000
@@ -10,6 +10,7 @@
 	-I$(top_builddir)/calendar/libical/src/libical	\
 	$(EVOLUTION_CALENDAR_CFLAGS)
 
+extensiondir = $(libdir)/evolution-data-server-$(API_VERSION)/extensions
 extension_LTLIBRARIES = libecalbackendfile.la
 
 libecalbackendfile_la_SOURCES =		\
Index: calendar/backends/groupwise/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/backends/groupwise/Makefile.am,v
retrieving revision 1.21
diff -u -r1.21 Makefile.am
--- calendar/backends/groupwise/Makefile.am	31 Jan 2005 22:48:53 -0000	1.21
+++ calendar/backends/groupwise/Makefile.am	4 Jun 2005 22:25:08 -0000
@@ -16,6 +16,7 @@
 	$(SOUP_CFLAGS)					\
 	$(DEBUG_CFLAGS)
 
+extensiondir = $(libdir)/evolution-data-server-$(API_VERSION)/extensions
 extension_LTLIBRARIES = libecalbackendgroupwise.la
 
 libecalbackendgroupwise_la_SOURCES =		\
Index: calendar/backends/http/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/backends/http/Makefile.am,v
retrieving revision 1.8
diff -u -r1.8 Makefile.am
--- calendar/backends/http/Makefile.am	31 Jan 2005 22:48:54 -0000	1.8
+++ calendar/backends/http/Makefile.am	4 Jun 2005 22:25:08 -0000
@@ -13,6 +13,7 @@
 	$(EVOLUTION_CALENDAR_CFLAGS)			\
 	$(SOUP_CFLAGS)
 
+extensiondir = $(libdir)/evolution-data-server-$(API_VERSION)/extensions
 extension_LTLIBRARIES = libecalbackendhttp.la
 
 libecalbackendhttp_la_SOURCES =		\
Index: calendar/backends/weather/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/backends/weather/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- calendar/backends/weather/Makefile.am	31 Jan 2005 22:48:54 -0000	1.3
+++ calendar/backends/weather/Makefile.am	4 Jun 2005 22:25:08 -0000
@@ -14,6 +14,7 @@
 	$(EVOLUTION_CALENDAR_CFLAGS)			\
 	$(SOUP_CFLAGS)
 
+extensiondir = $(libdir)/evolution-data-server-$(API_VERSION)/extensions
 extension_LTLIBRARIES = libecalbackendweather.la
 
 libecalbackendweather_la_SOURCES =	\
@@ -33,6 +34,7 @@
 libecalbackendweather_la_LDFLAGS =	\
 	-module -avoid-version
 
+weatherdatadir = $(privdatadir)/weather
 weatherdata_in_files = Locations.xml.in
 weatherdata_DATA = $(weatherdata_in_files:.xml.in=.xml)
 # FIXME - should probably do some sort of intltool merge here
Index: calendar/idl/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/calendar/idl/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- calendar/idl/Makefile.am	4 Nov 2003 14:11:09 -0000	1.2
+++ calendar/idl/Makefile.am	4 Jun 2005 22:25:08 -0000
@@ -1,3 +1,5 @@
+idldir = $(datadir)/idl/evolution-data-server-$(API_VERSION)
+
 idl_DATA = 					\
 	Evolution-DataServer-Calendar.idl
 
Index: camel/providers/groupwise/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/groupwise/Makefile.am,v
retrieving revision 1.13
diff -u -r1.13 Makefile.am
--- camel/providers/groupwise/Makefile.am	11 Jan 2005 07:49:58 -0000	1.13
+++ camel/providers/groupwise/Makefile.am	4 Jun 2005 22:25:12 -0000
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-
+camel_providerdir = $(libdir)/evolution-data-server-${API_VERSION}/camel-providers
 camel_provider_LTLIBRARIES = libcamelgroupwise.la
 camel_provider_DATA = libcamelgroupwise.urls
 
Index: camel/providers/imap/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/imap/Makefile.am,v
retrieving revision 1.31
diff -u -r1.31 Makefile.am
--- camel/providers/imap/Makefile.am	2 Dec 2004 08:03:30 -0000	1.31
+++ camel/providers/imap/Makefile.am	4 Jun 2005 22:25:12 -0000
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-
+camel_providerdir = $(libdir)/evolution-data-server-${API_VERSION}/camel-providers
 camel_provider_LTLIBRARIES = libcamelimap.la
 camel_provider_DATA = libcamelimap.urls
 
Index: camel/providers/imap4/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/imap4/Makefile.am,v
retrieving revision 1.10
diff -u -r1.10 Makefile.am
--- camel/providers/imap4/Makefile.am	14 Dec 2004 20:16:25 -0000	1.10
+++ camel/providers/imap4/Makefile.am	4 Jun 2005 22:25:12 -0000
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-
+camel_providerdir = $(libdir)/evolution-data-server-${API_VERSION}/camel-providers
 camel_provider_LTLIBRARIES = libcamelimap4.la
 camel_provider_DATA = libcamelimap4.urls
 
Index: camel/providers/imapp/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/imapp/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- camel/providers/imapp/Makefile.am	2 Dec 2004 08:03:30 -0000	1.3
+++ camel/providers/imapp/Makefile.am	4 Jun 2005 22:25:12 -0000
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-
+camel_providerdir = $(libdir)/evolution-data-server-${API_VERSION}/camel-providers
 camel_provider_LTLIBRARIES = libcamelimapp.la
 camel_provider_DATA = libcamelimapp.urls
 
Index: camel/providers/local/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/local/Makefile.am,v
retrieving revision 1.18
diff -u -r1.18 Makefile.am
--- camel/providers/local/Makefile.am	11 Apr 2005 12:21:29 -0000	1.18
+++ camel/providers/local/Makefile.am	4 Jun 2005 22:25:12 -0000
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-
+camel_providerdir = $(libdir)/evolution-data-server-${API_VERSION}/camel-providers
 camel_provider_LTLIBRARIES = libcamellocal.la
 camel_provider_DATA = libcamellocal.urls
 
Index: camel/providers/nntp/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/nntp/Makefile.am,v
retrieving revision 1.30
diff -u -r1.30 Makefile.am
--- camel/providers/nntp/Makefile.am	2 Dec 2004 08:03:30 -0000	1.30
+++ camel/providers/nntp/Makefile.am	4 Jun 2005 22:25:12 -0000
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-
+camel_providerdir = $(libdir)/evolution-data-server-${API_VERSION}/camel-providers
 camel_provider_LTLIBRARIES = libcamelnntp.la
 camel_provider_DATA = libcamelnntp.urls
 
Index: camel/providers/pop3/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/pop3/Makefile.am,v
retrieving revision 1.20
diff -u -r1.20 Makefile.am
--- camel/providers/pop3/Makefile.am	11 Apr 2005 12:21:29 -0000	1.20
+++ camel/providers/pop3/Makefile.am	4 Jun 2005 22:25:12 -0000
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-
+camel_providerdir = $(libdir)/evolution-data-server-${API_VERSION}/camel-providers
 camel_provider_LTLIBRARIES = libcamelpop3.la
 camel_provider_DATA = libcamelpop3.urls
 
Index: camel/providers/sendmail/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/sendmail/Makefile.am,v
retrieving revision 1.15
diff -u -r1.15 Makefile.am
--- camel/providers/sendmail/Makefile.am	2 Dec 2004 08:03:30 -0000	1.15
+++ camel/providers/sendmail/Makefile.am	4 Jun 2005 22:25:12 -0000
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-
+camel_providerdir = $(libdir)/evolution-data-server-$${API_VERSION}/camel-providers
 camel_provider_LTLIBRARIES = libcamelsendmail.la
 camel_provider_DATA = libcamelsendmail.urls
 
Index: camel/providers/smtp/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/smtp/Makefile.am,v
retrieving revision 1.21
diff -u -r1.21 Makefile.am
--- camel/providers/smtp/Makefile.am	11 Apr 2005 12:21:29 -0000	1.21
+++ camel/providers/smtp/Makefile.am	4 Jun 2005 22:25:13 -0000
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-
+camel_providerdir = $(libdir)/evolution-data-server-${API_VERSION}/camel-providers
 camel_provider_LTLIBRARIES = libcamelsmtp.la
 camel_provider_DATA = libcamelsmtp.urls
 
Index: libedataserverui/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserverui/Makefile.am,v
retrieving revision 1.12
diff -u -r1.12 Makefile.am
--- libedataserverui/Makefile.am	11 Apr 2005 12:21:32 -0000	1.12
+++ libedataserverui/Makefile.am	4 Jun 2005 22:25:20 -0000
@@ -88,6 +88,7 @@
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libedataserverui-$(API_VERSION).pc
 
+gladedir = $(privdatadir)/glade
 glade_DATA = e-categories-dialog.glade e-name-selector-dialog.glade
 
 EXTRA_DIST = 						\
Index: src/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/src/Makefile.am,v
retrieving revision 1.19
diff -u -r1.19 Makefile.am
--- src/Makefile.am	11 Apr 2005 12:21:33 -0000	1.19
+++ src/Makefile.am	4 Jun 2005 22:25:20 -0000
@@ -62,11 +62,14 @@
 
 SERVER_IN_FILE=GNOME_Evolution_DataServer.server.in.in
 
+serverdir = $(libdir)/bonobo/servers
 server_in_files = GNOME_Evolution_DataServer.server.in.in
 server_DATA = $(server_in_files:.server.in.in=_$(API_VERSION).server)
 @EVO_SUBST_SERVER_RULE@
 @EVO_NAME_SERVER_RULE@
 @INTLTOOL_SERVER_RULE@
+
+idldir = $(datadir)/idl/evolution-data-server-$(API_VERSION)
 
 idl_DATA = $(IDLS)

Attachment: eds-in-gnome-build.png
Description: PNG image

Follow-Ups:
- Re: [evolution-patches] Getting e-d-s working with gnome-build
  - From: Philip Van Hoof
- Re: [evolution-patches] Getting e-d-s working with gnome-build
  - From: Philip Van Hoof
- Re: [evolution-patches] Getting e-d-s working with gnome-build
  - From: David Malcolm

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]