rpms/evolution-connector/devel .cvsignore, 1.21, 1.22 evolution-connector.spec, 1.42, 1.43 regenerate-patch.sh, 1.10, 1.11 sources, 1.21, 1.22 ximian-connector-2.1.4-generated-autotool.patch, 1.9, 1.10

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Dec 8 02:57:49 UTC 2005


Author: dmalcolm

Update of /cvs/dist/rpms/evolution-connector/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24489

Modified Files:
	.cvsignore evolution-connector.spec regenerate-patch.sh 
	sources ximian-connector-2.1.4-generated-autotool.patch 
Log Message:
* Wed Dec  7 2005 David Malcolm <dmalcolm at redhat.com> - 2.5.2-1
- 2.5.2
- bump evo_major from 2.4 to 2.6
- bump evolution requirement from 2.4.1 to 2.5.2 to ensure we get an appropriate
  underlying version of evolution
- regenerate patch 200




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	5 Dec 2005 03:56:30 -0000	1.21
+++ .cvsignore	8 Dec 2005 02:57:46 -0000	1.22
@@ -1 +1 @@
-evolution-exchange-2.4.2.tar.bz2
+evolution-exchange-2.5.2.tar.bz2


Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- evolution-connector.spec	5 Dec 2005 03:56:30 -0000	1.42
+++ evolution-connector.spec	8 Dec 2005 02:57:46 -0000	1.43
@@ -1,12 +1,12 @@
-%define evolution_version 2.4.1
+%define evolution_version 2.5.2
 %define libsoup_version 2.2.6.1
 
 %define eds_major 1.2
-%define evo_major 2.4
+%define evo_major 2.6
 %define plibdir %(pkg-config evolution-shell-%{evo_major} --variable=privlibdir 2>/dev/null)
 
 Name: evolution-connector
-Version: 2.4.2
+Version: 2.5.2
 Release: 1
 License: GPL
 Group: Applications/Productivity
@@ -93,6 +93,13 @@
 %{_datadir}/evolution-exchange/%{evo_major}/ui/ximian-connector.xml
 
 %changelog
+* Wed Dec  7 2005 David Malcolm <dmalcolm at redhat.com> - 2.5.2-1
+- 2.5.2
+- bump evo_major from 2.4 to 2.6
+- bump evolution requirement from 2.4.1 to 2.5.2 to ensure we get an appropriate
+  underlying version of evolution
+- regenerate patch 200
+
 * Fri Dec  2 2005 David Malcolm <dmalcolm at redhat.com> - 2.4.2-1
 - 2.4.2
 - regenerate patch 200; forcing regeneration of intltool scripts to 


Index: regenerate-patch.sh
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/regenerate-patch.sh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- regenerate-patch.sh	5 Dec 2005 03:56:30 -0000	1.10
+++ regenerate-patch.sh	8 Dec 2005 02:57:46 -0000	1.11
@@ -1,5 +1,5 @@
 #!/bin/sh
-BASE_NAME=evolution-exchange-2.4.2
+BASE_NAME=evolution-exchange-2.5.2
 TARBALL_NAME=$BASE_NAME.tar.bz2
 
 #INPUT_PATCHES="ximian-connector-2.1.4-64bit-fix-acinclude.m4.patch ximian-connector-2.2.2-noinst-ltlibraries.patch ximian-connector-2.2.2-install-debug-utilities.patch"


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	5 Dec 2005 03:56:30 -0000	1.21
+++ sources	8 Dec 2005 02:57:46 -0000	1.22
@@ -1 +1 @@
-67802f9c0be1528edaa0612188588914  evolution-exchange-2.4.2.tar.bz2
+747ec6d5fd61424d3dbae9651f8dc500  evolution-exchange-2.5.2.tar.bz2

ximian-connector-2.1.4-generated-autotool.patch:
 evolution-exchange-2.5.2-patched/Makefile.in                                  |    2 
 evolution-exchange-2.5.2-patched/acinclude.m4                                 |   22 
 evolution-exchange-2.5.2-patched/aclocal.m4                                   |14924 +++++-----
 evolution-exchange-2.5.2-patched/addressbook/Makefile.in                      |    4 
 evolution-exchange-2.5.2-patched/autom4te.cache                               |only
 evolution-exchange-2.5.2-patched/calendar/Makefile.in                         |    4 
 evolution-exchange-2.5.2-patched/camel/Makefile.in                            |    4 
 evolution-exchange-2.5.2-patched/configure                                    |  793 
 evolution-exchange-2.5.2-patched/docs/Makefile.in                             |    2 
 evolution-exchange-2.5.2-patched/docs/ietf/Makefile.in                        |    2 
 evolution-exchange-2.5.2-patched/docs/reference/Makefile.in                   |    2 
 evolution-exchange-2.5.2-patched/intltool-merge.in                            |    2 
 evolution-exchange-2.5.2-patched/intltool-update.in                           |   23 
 evolution-exchange-2.5.2-patched/mail/Makefile.in                             |    4 
 evolution-exchange-2.5.2-patched/po/Makefile.in.in                            |   28 
 evolution-exchange-2.5.2-patched/shell/Makefile.in                            |    4 
 evolution-exchange-2.5.2-patched/storage/Makefile.in                          |    4 
 evolution-exchange-2.5.2-pristine/acinclude.m4.autotool-results               |only
 evolution-exchange-2.5.2-pristine/aclocal.m4.autotool-results                 |only
 evolution-exchange-2.5.2-pristine/aclocal.m4.rej                              |only
 evolution-exchange-2.5.2-pristine/addressbook/Makefile.in.autotool-results    |only
 evolution-exchange-2.5.2-pristine/addressbook/Makefile.in.rej                 |only
 evolution-exchange-2.5.2-pristine/calendar/Makefile.in.autotool-results       |only
 evolution-exchange-2.5.2-pristine/calendar/Makefile.in.rej                    |only
 evolution-exchange-2.5.2-pristine/camel/Makefile.in.autotool-results          |only
 evolution-exchange-2.5.2-pristine/camel/Makefile.in.rej                       |only
 evolution-exchange-2.5.2-pristine/configure.autotool-results                  |only
 evolution-exchange-2.5.2-pristine/configure.rej                               |only
 evolution-exchange-2.5.2-pristine/docs/Makefile.in.autotool-results           |only
 evolution-exchange-2.5.2-pristine/docs/Makefile.in.rej                        |only
 evolution-exchange-2.5.2-pristine/docs/ietf/Makefile.in.autotool-results      |only
 evolution-exchange-2.5.2-pristine/docs/ietf/Makefile.in.rej                   |only
 evolution-exchange-2.5.2-pristine/docs/reference/Makefile.in.autotool-results |only
 evolution-exchange-2.5.2-pristine/docs/reference/Makefile.in.rej              |only
 34 files changed, 8079 insertions(+), 7745 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.9 -r 1.10 ximian-connector-2.1.4-generated-autotool.patch
Index: ximian-connector-2.1.4-generated-autotool.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/ximian-connector-2.1.4-generated-autotool.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ximian-connector-2.1.4-generated-autotool.patch	5 Dec 2005 03:56:30 -0000	1.9
+++ ximian-connector-2.1.4-generated-autotool.patch	8 Dec 2005 02:57:46 -0000	1.10
@@ -1,6 +1,6 @@
-diff --recursive -up evolution-exchange-2.4.2-pristine/acinclude.m4 evolution-exchange-2.4.2-patched/acinclude.m4
---- evolution-exchange-2.4.2-pristine/acinclude.m4	2004-08-13 14:16:45.000000000 -0400
-+++ evolution-exchange-2.4.2-patched/acinclude.m4	2005-12-02 17:25:12.000000000 -0500
+diff --recursive -up evolution-exchange-2.5.2-pristine/acinclude.m4 evolution-exchange-2.5.2-patched/acinclude.m4
+--- evolution-exchange-2.5.2-pristine/acinclude.m4	2004-08-13 14:16:45.000000000 -0400
++++ evolution-exchange-2.5.2-patched/acinclude.m4	2005-12-07 21:34:56.000000000 -0500
 @@ -34,6 +34,18 @@ AC_DEFUN([EVO_LDAP_CHECK], [
  	AC_ARG_WITH(openldap,     [  --with-openldap=[no/yes/PREFIX]      Enable LDAP support in evolution])
  	AC_ARG_WITH(static-ldap,  [  --with-static-ldap=[no/yes]          Link LDAP support statically into evolution ])
@@ -54,47 +54,23 @@
  					else
  						LDAP_LIBS="-lldap $LDAP_LIBS"
  					fi],
-diff --recursive -up evolution-exchange-2.4.2-pristine/aclocal.m4 evolution-exchange-2.4.2-patched/aclocal.m4
---- evolution-exchange-2.4.2-pristine/aclocal.m4	2005-11-28 06:51:00.000000000 -0500
-+++ evolution-exchange-2.4.2-patched/aclocal.m4	2005-12-02 17:25:17.000000000 -0500
-@@ -1,7 +1,7 @@
--# generated automatically by aclocal 1.7.9 -*- Autoconf -*-
+Only in evolution-exchange-2.5.2-pristine: acinclude.m4.autotool-results
+diff --recursive -up evolution-exchange-2.5.2-pristine/aclocal.m4 evolution-exchange-2.5.2-patched/aclocal.m4
+--- evolution-exchange-2.5.2-pristine/aclocal.m4	2005-11-14 04:41:33.000000000 -0500
++++ evolution-exchange-2.5.2-patched/aclocal.m4	2005-12-07 21:35:01.000000000 -0500
+@@ -1,4 +1,4 @@
+-# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
 +# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
  
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
--# Free Software Foundation, Inc.
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005  Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -11,4074 +11,3791 @@
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ # 2005  Free Software Foundation, Inc.
+@@ -11,3903 +11,3789 @@
  # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  # PARTICULAR PURPOSE.
  
--# evolution/acinclude.m4
--# shared configure.in hacks between Evolution and Connector
--
--
--# EVO_PURIFY_SUPPORT
--# Add --enable-purify. If the user turns it on, subst PURIFY and set
--# the automake conditional ENABLE_PURIFY
--AC_DEFUN([EVO_PURIFY_SUPPORT], [
--	AC_ARG_ENABLE(purify, 
--	[  --enable-purify=[no/yes]      Enable support for building executables with Purify.],,enable_purify=no)
--	AC_PATH_PROG(PURIFY, purify, impure)
--	AC_ARG_WITH(purify-options, [  --with-purify-options=OPTIONS      Options passed to the purify command line (defaults to PURIFYOPTIONS variable).])
--	if test "x$with_purify_options" = "xno"; then
--		with_purify_options="-always-use-cache-dir=yes -cache-dir=/gnome/lib/purify"
--	fi
--	if test "x$PURIFYOPTIONS" = "x"; then
--		PURIFYOPTIONS=$with_purify_options
--	fi
--	AC_SUBST(PURIFY)
--	AM_CONDITIONAL(ENABLE_PURIFY, test "x$enable_purify" = "xyes" -a "x$PURIFY" != "ximpure")
--	PURIFY="$PURIFY $PURIFYOPTIONS"
--])
+-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 -
+-# serial 47 AC_PROG_LIBTOOL
 +dnl AM_PATH_ORBIT2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
 +dnl Test for ORBit2, and define ORBIT_CFLAGS and ORBIT_LIBS
 +dnl
@@ -109,31 +85,6 @@
 +AC_ARG_ENABLE(orbittest, [  --disable-orbittest       Do not try to compile and run a test ORBIT program],
 +		    , enable_orbittest=yes)
  
--# EVO_LDAP_CHECK(default)
--# Add --with-openldap and --with-static-ldap options. --with-openldap
--# defaults to the given value if not specified. If LDAP support is
--# configured, HAVE_LDAP will be defined and the automake conditional
--# ENABLE_LDAP will be set. LDAP_CFLAGS and LDAP_LIBS will be set
--# appropriately.
--AC_DEFUN([EVO_LDAP_CHECK], [
--	default="$1"
--
--	AC_ARG_WITH(openldap,     [  --with-openldap=[no/yes/PREFIX]      Enable LDAP support in evolution])
--	AC_ARG_WITH(static-ldap,  [  --with-static-ldap=[no/yes]          Link LDAP support statically into evolution ])
--	AC_CACHE_CHECK([for OpenLDAP], ac_cv_with_openldap, ac_cv_with_openldap="${with_openldap:=$default}")
--	case $ac_cv_with_openldap in
--	no|"")
--		with_openldap=no
--		;;
--	yes)
--		with_openldap=/usr
--		;;
--	*)
--		with_openldap=$ac_cv_with_openldap
--		LDAP_CFLAGS="-I$ac_cv_with_openldap/include"
--		LDAP_LDFLAGS="-L$ac_cv_with_openldap/lib"
--		;;
--	esac
 +  for module in . $4
 +  do
 +      case "$module" in
@@ -149,8 +100,14 @@
 +	orbit_config_args=server
 +  fi
  
--	if test "$with_openldap" != no; then
--		AC_DEFINE(HAVE_LDAP,1,[Define if you have LDAP support])
+-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+-# -----------------------------------------------------------
+-# If this macro is not defined by Autoconf, define it here.
+-m4_ifdef([AC_PROVIDE_IFELSE],
+-         [],
+-         [m4_define([AC_PROVIDE_IFELSE],
+-	         [m4_ifdef([AC_PROVIDE_$1],
+-		           [$2], [$3])])])
 +  if test x$orbit_config_exec_prefix != x ; then
 +     orbit_config_args="$orbit_config_args --exec-prefix=$orbit_config_exec_prefix"
 +     if test x${ORBIT_CONFIG+set} != xset ; then
@@ -164,29 +121,6 @@
 +     fi
 +  fi
  
--		case $with_static_ldap in
--		no|"")
--			with_static_ldap=no
--			;;
--		*)
--			with_static_ldap=yes
--			;;
--		esac
--
--		AC_CACHE_CHECK(if OpenLDAP is version 2.x, ac_cv_openldap_version2, [
--			CPPFLAGS_save="$CPPFLAGS"
--			CPPFLAGS="$CPPFLAGS $LDAP_CFLAGS"
--			AC_EGREP_CPP(yes, [
--				#include "ldap.h"
--				#if LDAP_VENDOR_VERSION > 20000
--				yes
--				#endif
--			], ac_cv_openldap_version2=yes, ac_cv_openldap_version2=no)
--			CPPFLAGS="$CPPFLAGS_save"
--		])
--		if test "$ac_cv_openldap_version2" = no; then
--			AC_MSG_ERROR(evolution requires OpenLDAP version >= 2)
--		fi
 +  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 +  AC_PATH_PROG(ORBIT_CONFIG, orbit2-config, no)
 +  min_orbit_version=ifelse([$1], , 2.3.0, $1)
@@ -219,47 +153,46 @@
 +#include <stdio.h>
 +#include <stdlib.h>
  
--		AC_CHECK_LIB(resolv, res_query, LDAP_LIBS="-lresolv")
--		AC_CHECK_LIB(socket, bind, LDAP_LIBS="$LDAP_LIBS -lsocket")
--		AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl")
--		AC_CHECK_LIB(lber, ber_get_tag, [
--			if test "$with_static_ldap" = "yes"; then
--				LDAP_LIBS="$with_openldap/lib/liblber.a $LDAP_LIBS"
--
--				# libldap might depend on OpenSSL... We need to pull
--				# in the dependency libs explicitly here since we're
--				# not using libtool for the configure test.
--				if test -f $with_openldap/lib/libldap.la; then
--					LDAP_LIBS="`. $with_openldap/lib/libldap.la; echo $dependency_libs` $LDAP_LIBS"
--				fi
--			else
--				LDAP_LIBS="-llber $LDAP_LIBS"
--			fi
--			AC_CHECK_LIB(ldap, ldap_open, [
--					if test $with_static_ldap = "yes"; then
--						LDAP_LIBS="$with_openldap/lib/libldap.a $LDAP_LIBS"
--					else
--						LDAP_LIBS="-lldap $LDAP_LIBS"
--					fi],
--				LDAP_LIBS="", $LDAP_LDFLAGS $LDAP_LIBS)
--			LDAP_LIBS="$LDAP_LDFLAGS $LDAP_LIBS"
--		], LDAP_LIBS="", $LDAP_LDFLAGS $LDAP_LIBS)
+-# AC_PROG_LIBTOOL
+-# ---------------
+-AC_DEFUN([AC_PROG_LIBTOOL],
+-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
+-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
+-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
+-  AC_PROVIDE_IFELSE([AC_PROG_CXX],
+-    [AC_LIBTOOL_CXX],
+-    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
+-  ])])
+-dnl And a similar setup for Fortran 77 support
+-  AC_PROVIDE_IFELSE([AC_PROG_F77],
+-    [AC_LIBTOOL_F77],
+-    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
+-])])
[...24324 lines suppressed...]
- install-imagesDATA: $(images_DATA)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(imagesdir)
-+	test -z "$(imagesdir)" || $(mkdir_p) "$(DESTDIR)$(imagesdir)"
- 	@list='$(images_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--	  f="`echo $$p | sed -e 's|^.*/||'`"; \
--	  echo " $(imagesDATA_INSTALL) $$d$$p $(DESTDIR)$(imagesdir)/$$f"; \
--	  $(imagesDATA_INSTALL) $$d$$p $(DESTDIR)$(imagesdir)/$$f; \
-+	  f=$(am__strip_dir) \
-+	  echo " $(imagesDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(imagesdir)/$$f'"; \
-+	  $(imagesDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(imagesdir)/$$f"; \
- 	done
- 
- uninstall-imagesDATA:
- 	@$(NORMAL_UNINSTALL)
- 	@list='$(images_DATA)'; for p in $$list; do \
--	  f="`echo $$p | sed -e 's|^.*/||'`"; \
--	  echo " rm -f $(DESTDIR)$(imagesdir)/$$f"; \
--	  rm -f $(DESTDIR)$(imagesdir)/$$f; \
-+	  f=$(am__strip_dir) \
-+	  echo " rm -f '$(DESTDIR)$(imagesdir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(imagesdir)/$$f"; \
- 	done
--serverDATA_INSTALL = $(INSTALL_DATA)
- install-serverDATA: $(server_DATA)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(serverdir)
-+	test -z "$(serverdir)" || $(mkdir_p) "$(DESTDIR)$(serverdir)"
- 	@list='$(server_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--	  f="`echo $$p | sed -e 's|^.*/||'`"; \
--	  echo " $(serverDATA_INSTALL) $$d$$p $(DESTDIR)$(serverdir)/$$f"; \
--	  $(serverDATA_INSTALL) $$d$$p $(DESTDIR)$(serverdir)/$$f; \
-+	  f=$(am__strip_dir) \
-+	  echo " $(serverDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(serverdir)/$$f'"; \
-+	  $(serverDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(serverdir)/$$f"; \
- 	done
- 
- uninstall-serverDATA:
- 	@$(NORMAL_UNINSTALL)
- 	@list='$(server_DATA)'; for p in $$list; do \
--	  f="`echo $$p | sed -e 's|^.*/||'`"; \
--	  echo " rm -f $(DESTDIR)$(serverdir)/$$f"; \
--	  rm -f $(DESTDIR)$(serverdir)/$$f; \
-+	  f=$(am__strip_dir) \
-+	  echo " rm -f '$(DESTDIR)$(serverdir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(serverdir)/$$f"; \
- 	done
--uiDATA_INSTALL = $(INSTALL_DATA)
- install-uiDATA: $(ui_DATA)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(uidir)
-+	test -z "$(uidir)" || $(mkdir_p) "$(DESTDIR)$(uidir)"
- 	@list='$(ui_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--	  f="`echo $$p | sed -e 's|^.*/||'`"; \
--	  echo " $(uiDATA_INSTALL) $$d$$p $(DESTDIR)$(uidir)/$$f"; \
--	  $(uiDATA_INSTALL) $$d$$p $(DESTDIR)$(uidir)/$$f; \
-+	  f=$(am__strip_dir) \
-+	  echo " $(uiDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(uidir)/$$f'"; \
-+	  $(uiDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(uidir)/$$f"; \
- 	done
- 
- uninstall-uiDATA:
- 	@$(NORMAL_UNINSTALL)
- 	@list='$(ui_DATA)'; for p in $$list; do \
--	  f="`echo $$p | sed -e 's|^.*/||'`"; \
--	  echo " rm -f $(DESTDIR)$(uidir)/$$f"; \
--	  rm -f $(DESTDIR)$(uidir)/$$f; \
-+	  f=$(am__strip_dir) \
-+	  echo " rm -f '$(DESTDIR)$(uidir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(uidir)/$$f"; \
- 	done
- 
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
-@@ -624,6 +622,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
- 	mkid -fID $$unique
-+tags: TAGS
- 
- TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
-@@ -635,10 +634,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEP
- 	  done | \
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$tags$$unique" \
--	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	     $$tags $$unique
--
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
- ctags: CTAGS
- CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
-@@ -661,10 +661,6 @@ GTAGS:
- 
- distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--
--top_distdir = ..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- distdir: $(DISTFILES)
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -678,7 +674,7 @@ distdir: $(DISTFILES)
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -696,9 +692,10 @@ distdir: $(DISTFILES)
- check-am: all-am
- check: check-am
- all-am: Makefile $(PROGRAMS) $(DATA)
--
- installdirs:
--	$(mkinstalldirs) $(DESTDIR)$(EVOLUTION_privlibexecdir) $(DESTDIR)$(gladedir) $(DESTDIR)$(imagesdir) $(DESTDIR)$(serverdir) $(DESTDIR)$(uidir)
-+	for dir in "$(DESTDIR)$(EVOLUTION_privlibexecdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(imagesdir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(uidir)"; do \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	done
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -718,7 +715,7 @@ mostlyclean-generic:
- clean-generic:
- 
- distclean-generic:
--	-rm -f $(CONFIG_CLEAN_FILES)
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
- 
- maintainer-clean-generic:
-@@ -739,12 +736,14 @@ dvi: dvi-am
- 
- dvi-am:
- 
-+html: html-am
-+
- info: info-am
- 
- info-am:
- 
--install-data-am: install-gladeDATA install-imagesDATA install-serverDATA \
--	install-uiDATA
-+install-data-am: install-gladeDATA install-imagesDATA \
-+	install-serverDATA install-uiDATA
- 
- install-exec-am: install-EVOLUTION_privlibexecPROGRAMS \
- 	install-exec-local
-@@ -778,18 +777,18 @@ uninstall-am: uninstall-EVOLUTION_privli
- 	uninstall-serverDATA uninstall-uiDATA
- 
- .PHONY: CTAGS GTAGS all all-am check check-am clean \
--	clean-EVOLUTION_privlibexecPROGRAMS clean-generic clean-libtool \
--	clean-noinstPROGRAMS ctags distclean distclean-compile \
--	distclean-generic distclean-libtool distclean-tags distdir dvi \
--	dvi-am info info-am install \
--	install-EVOLUTION_privlibexecPROGRAMS install-am install-data \
--	install-data-am install-exec install-exec-am install-exec-local \
--	install-gladeDATA install-imagesDATA install-info \
--	install-info-am install-man install-serverDATA install-strip \
--	install-uiDATA installcheck installcheck-am installdirs \
--	maintainer-clean maintainer-clean-generic mostlyclean \
--	mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
--	pdf-am ps ps-am tags uninstall \
-+	clean-EVOLUTION_privlibexecPROGRAMS clean-generic \
-+	clean-libtool clean-noinstPROGRAMS ctags distclean \
-+	distclean-compile distclean-generic distclean-libtool \
-+	distclean-tags distdir dvi dvi-am html html-am info info-am \
-+	install install-EVOLUTION_privlibexecPROGRAMS install-am \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-exec-local install-gladeDATA install-imagesDATA \
-+	install-info install-info-am install-man install-serverDATA \
-+	install-strip install-uiDATA installcheck installcheck-am \
-+	installdirs maintainer-clean maintainer-clean-generic \
-+	mostlyclean mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
- 	uninstall-EVOLUTION_privlibexecPROGRAMS uninstall-am \
- 	uninstall-gladeDATA uninstall-imagesDATA uninstall-info-am \
- 	uninstall-serverDATA uninstall-uiDATA




More information about the fedora-cvs-commits mailing list