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

rpms/evolution-connector/devel .cvsignore, 1.14, 1.15 evolution-connector.spec, 1.28, 1.29 regenerate-patch.sh, 1.6, 1.7 sources, 1.14, 1.15 ximian-connector-2.1.4-generated-autotool.patch, 1.5, 1.6



Author: dmalcolm

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

Modified Files:
	.cvsignore evolution-connector.spec regenerate-patch.sh 
	sources ximian-connector-2.1.4-generated-autotool.patch 
Log Message:
* Mon Jul 25 2005 David Malcolm <dmalcolm redhat com> - 2.3.5-1
- 2.3.5
- Changed various references to source tarball name from ximian-connector to
  evolution-exchange and updated the URL
- Remove Patch101 and Patch102 from autotool source patches and regenerate 
  resulting post-autotool patch




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	3 May 2005 03:03:12 -0000	1.14
+++ .cvsignore	26 Jul 2005 23:23:17 -0000	1.15
@@ -1 +1 @@
-ximian-connector-2.2.2.tar.bz2
+evolution-exchange-2.3.5.tar.bz2


Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- evolution-connector.spec	18 May 2005 15:46:56 -0000	1.28
+++ evolution-connector.spec	26 Jul 2005 23:23:17 -0000	1.29
@@ -9,18 +9,18 @@
 %define plibdir %(pkg-config evolution-shell-%{evo_major} --variable=privlibdir 2>/dev/null)
 
 Name: evolution-connector
-Version: 2.2.2
-Release: 5
+Version: 2.3.5
+Release: 1
 License: GPL
 Group: Applications/Productivity
-URL:  http://ftp.gnome.org/pub/gnome/sources/ximian-connector/2.1/
+URL:  http://ftp.gnome.org/pub/gnome/sources/evolution-exchange/2.3/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Source: ximian-connector-%{version}.tar.bz2
+Source: evolution-exchange-%{version}.tar.bz2
 
 # Patches we apply to the autotool files:
 Patch100: ximian-connector-2.1.4-64bit-fix-acinclude.m4.patch
-Patch101: ximian-connector-2.2.2-noinst-ltlibraries.patch
-Patch102: ximian-connector-2.2.2-install-debug-utilities.patch
+#Patch101: ximian-connector-2.2.2-noinst-ltlibraries.patch
+#Patch102: ximian-connector-2.2.2-install-debug-utilities.patch
 
 # Patch generated against a pristine source tree after applying the
 # above patches and then rerunning the autotools.  This patch will contain
@@ -50,7 +50,7 @@
 
 %prep
 
-%setup -q -n ximian-connector-%{version}
+%setup -q -n evolution-exchange-%{version}
 
 # As discussed above, the "source patches" go into the SRPM, but only the resulting patch is applied:
 %patch200 -p1 -b .autotool-results
@@ -74,12 +74,12 @@
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server-%{eds_major}/camel-providers/*.a
-%find_lang ximian-connector-%{evo_major}
+%find_lang evolution-exchange-%{evo_major}
 
 %clean
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
-%files -f ximian-connector-%{evo_major}.lang
+%files -f evolution-exchange-%{evo_major}.lang
 %defattr(-,root,root)
 %doc AUTHORS COPYING INSTALL NEWS docs/active-directory
 %doc docs/autoconfig docs/debug docs/forms
@@ -105,6 +105,13 @@
 %{_datadir}/ximian-connector/%{evo_major}/ui/ximian-connector.xml
 
 %changelog
+* Mon Jul 25 2005 David Malcolm <dmalcolm redhat com> - 2.3.5-1
+- 2.3.5
+- Changed various references to source tarball name from ximian-connector to
+  evolution-exchange and updated the URL
+- Remove Patch101 and Patch102 from autotool source patches and regenerate 
+  resulting post-autotool patch
+
 * Wed May 18 2005 David Malcolm <dmalcolm redhat com> - 2.2.2-5
 - add Aaron Gaudio's patch to fix PDA syncronization (#139393)
 


Index: regenerate-patch.sh
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/regenerate-patch.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- regenerate-patch.sh	17 May 2005 21:20:48 -0000	1.6
+++ regenerate-patch.sh	26 Jul 2005 23:23:17 -0000	1.7
@@ -1,8 +1,9 @@
 #!/bin/sh
-BASE_NAME=ximian-connector-2.2.2
+BASE_NAME=evolution-exchange-2.3.5
 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"
+#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"
+INPUT_PATCHES="ximian-connector-2.1.4-64bit-fix-acinclude.m4.patch"
 OUTPUT_PATCH=ximian-connector-2.1.4-generated-autotool.patch
 
 # Ensure we have the tarball:


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	3 May 2005 03:03:12 -0000	1.14
+++ sources	26 Jul 2005 23:23:17 -0000	1.15
@@ -1 +1 @@
-2cee47bdf6030d30a5ac82e5028b58ed  ximian-connector-2.2.2.tar.bz2
+c482766dd37172d59bca602fd1d02a2d  evolution-exchange-2.3.5.tar.bz2

ximian-connector-2.1.4-generated-autotool.patch:
 evolution-exchange-2.3.5-patched/Makefile.in                                          |  474 
 evolution-exchange-2.3.5-patched/acinclude.m4                                         |   22 
 evolution-exchange-2.3.5-patched/aclocal.m4                                           |14743 +++++-----
 evolution-exchange-2.3.5-patched/addressbook/Makefile.in                              |  367 
 evolution-exchange-2.3.5-patched/autom4te.cache                                       |only
 evolution-exchange-2.3.5-patched/calendar/Makefile.in                                 |  371 
 evolution-exchange-2.3.5-patched/camel/Makefile.in                                    |  428 
 evolution-exchange-2.3.5-patched/configure                                            | 1915 -
 evolution-exchange-2.3.5-patched/docs/Makefile.in                                     |  340 
 evolution-exchange-2.3.5-patched/docs/ietf/Makefile.in                                |  236 
 evolution-exchange-2.3.5-patched/docs/reference/Makefile.in                           |  271 
 evolution-exchange-2.3.5-patched/mail/Makefile.in                                     |  363 
 evolution-exchange-2.3.5-patched/shell/Makefile.in                                    |  447 
 evolution-exchange-2.3.5-patched/storage/Makefile.in                                  |  559 
 evolution-exchange-2.3.5-pristine/Makefile                                            |only
 evolution-exchange-2.3.5-pristine/acinclude.m4.autotool-results                       |only
 evolution-exchange-2.3.5-pristine/aclocal.m4.autotool-results                         |only
 evolution-exchange-2.3.5-pristine/addressbook/.deps                                   |only
 evolution-exchange-2.3.5-pristine/addressbook/Makefile                                |only
 evolution-exchange-2.3.5-pristine/addressbook/Makefile.in.autotool-results            |only
 evolution-exchange-2.3.5-pristine/calendar/.deps                                      |only
 evolution-exchange-2.3.5-pristine/calendar/Makefile                                   |only
 evolution-exchange-2.3.5-pristine/calendar/Makefile.in.autotool-results               |only
 evolution-exchange-2.3.5-pristine/calendar/e-cal-backend-exchange.c.fix-sync-callback |only
 evolution-exchange-2.3.5-pristine/camel/.deps                                         |only
 evolution-exchange-2.3.5-pristine/camel/.libs                                         |only
 evolution-exchange-2.3.5-pristine/camel/Makefile                                      |only
 evolution-exchange-2.3.5-pristine/camel/Makefile.am.autotool-results                  |only
 evolution-exchange-2.3.5-pristine/camel/camel-exchange-folder.lo                      |only
 evolution-exchange-2.3.5-pristine/camel/camel-exchange-folder.o                       |only
 evolution-exchange-2.3.5-pristine/camel/camel-exchange-journal.lo                     |only
 evolution-exchange-2.3.5-pristine/camel/camel-exchange-journal.o                      |only
 evolution-exchange-2.3.5-pristine/camel/camel-exchange-provider.lo                    |only
 evolution-exchange-2.3.5-pristine/camel/camel-exchange-provider.o                     |only
 evolution-exchange-2.3.5-pristine/camel/camel-exchange-search.lo                      |only
 evolution-exchange-2.3.5-pristine/camel/camel-exchange-search.o                       |only
 evolution-exchange-2.3.5-pristine/camel/camel-exchange-store.lo                       |only
 evolution-exchange-2.3.5-pristine/camel/camel-exchange-store.o                        |only
 evolution-exchange-2.3.5-pristine/camel/camel-exchange-summary.lo                     |only
 evolution-exchange-2.3.5-pristine/camel/camel-exchange-summary.o                      |only
 evolution-exchange-2.3.5-pristine/camel/camel-exchange-transport.lo                   |only
 evolution-exchange-2.3.5-pristine/camel/camel-exchange-transport.o                    |only
 evolution-exchange-2.3.5-pristine/camel/camel-stub-marshal.lo                         |only
 evolution-exchange-2.3.5-pristine/camel/camel-stub-marshal.o                          |only
 evolution-exchange-2.3.5-pristine/camel/camel-stub.lo                                 |only
 evolution-exchange-2.3.5-pristine/camel/camel-stub.o                                  |only
 evolution-exchange-2.3.5-pristine/config.h                                            |only
 evolution-exchange-2.3.5-pristine/config.log                                          |only
 evolution-exchange-2.3.5-pristine/config.status                                       |only
 evolution-exchange-2.3.5-pristine/configure.autotool-results                          |only
 evolution-exchange-2.3.5-pristine/docs/Makefile                                       |only
 evolution-exchange-2.3.5-pristine/docs/ietf/Makefile                                  |only
 evolution-exchange-2.3.5-pristine/docs/reference/Makefile                             |only
 evolution-exchange-2.3.5-pristine/intltool-extract                                    |only
 evolution-exchange-2.3.5-pristine/intltool-merge                                      |only
 evolution-exchange-2.3.5-pristine/intltool-update                                     |only
 evolution-exchange-2.3.5-pristine/libtool                                             |only
 evolution-exchange-2.3.5-pristine/mail/.deps                                          |only
 evolution-exchange-2.3.5-pristine/mail/Makefile                                       |only
 evolution-exchange-2.3.5-pristine/po/Makefile                                         |only
 evolution-exchange-2.3.5-pristine/po/Makefile.in                                      |only
 evolution-exchange-2.3.5-pristine/po/POTFILES                                         |only
 evolution-exchange-2.3.5-pristine/shell/.deps                                         |only
 evolution-exchange-2.3.5-pristine/shell/Makefile                                      |only
 evolution-exchange-2.3.5-pristine/stamp-h1                                            |only
 evolution-exchange-2.3.5-pristine/storage/.deps                                       |only
 evolution-exchange-2.3.5-pristine/storage/Makefile                                    |only
 67 files changed, 11197 insertions(+), 9339 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.5 -r 1.6 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ximian-connector-2.1.4-generated-autotool.patch	17 May 2005 21:20:48 -0000	1.5
+++ ximian-connector-2.1.4-generated-autotool.patch	26 Jul 2005 23:23:17 -0000	1.6
@@ -1,6 +1,6 @@
-diff --recursive -up ximian-connector-2.2.2-pristine/acinclude.m4 ximian-connector-2.2.2-patched/acinclude.m4
---- ximian-connector-2.2.2-pristine/acinclude.m4	2004-08-13 14:16:45.000000000 -0400
-+++ ximian-connector-2.2.2-patched/acinclude.m4	2005-05-17 16:59:29.000000000 -0400
+diff --recursive -up evolution-exchange-2.3.5-pristine/acinclude.m4 evolution-exchange-2.3.5-patched/acinclude.m4
+--- evolution-exchange-2.3.5-pristine/acinclude.m4	2004-08-13 14:16:45.000000000 -0400
++++ evolution-exchange-2.3.5-patched/acinclude.m4	2005-07-26 19:10:50.000000000 -0400
 @@ -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,10 +54,10 @@
  					else
  						LDAP_LIBS="-lldap $LDAP_LIBS"
  					fi],
-Only in ximian-connector-2.2.2-pristine: acinclude.m4.autotool-results
-diff --recursive -up ximian-connector-2.2.2-pristine/aclocal.m4 ximian-connector-2.2.2-patched/aclocal.m4
---- ximian-connector-2.2.2-pristine/aclocal.m4	2005-04-06 09:16:16.000000000 -0400
-+++ ximian-connector-2.2.2-patched/aclocal.m4	2005-05-17 16:59:35.000000000 -0400
+Only in evolution-exchange-2.3.5-pristine: acinclude.m4.autotool-results
+diff --recursive -up evolution-exchange-2.3.5-pristine/aclocal.m4 evolution-exchange-2.3.5-patched/aclocal.m4
+--- evolution-exchange-2.3.5-pristine/aclocal.m4	2005-07-11 08:34:14.000000000 -0400
++++ evolution-exchange-2.3.5-patched/aclocal.m4	2005-07-26 19:10:56.000000000 -0400
 @@ -1,7 +1,7 @@
 -# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
 +# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
@@ -69,7 +69,7 @@
  # 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,3703 +11,3760 @@
+@@ -11,3909 +11,3818 @@
  # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  # PARTICULAR PURPOSE.
  
@@ -459,36 +459,38 @@
 -  AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
 -  AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
 -])
+-
+-# AM_CONDITIONAL                                              -*- Autoconf -*-
 +  AC_ARG_WITH(gconf-source, 
 +  [  --with-gconf-source=sourceaddress      Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",)
  
--# AM_CONDITIONAL                                              -*- Autoconf -*-
+-# Copyright 1997, 2000, 2001 Free Software Foundation, Inc.
 +  AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
 +  AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
  
--# Copyright 1997, 2000, 2001 Free Software Foundation, Inc.
-+  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-+    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-+  fi
- 
 -# This program is free software; you can redistribute it and/or modify
 -# it under the terms of the GNU General Public License as published by
 -# the Free Software Foundation; either version 2, or (at your option)
 -# any later version.
-+  AC_ARG_WITH(gconf-schema-file-dir, 
-+  [  --with-gconf-schema-file-dir=dir        Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",)
++  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
++    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
++  fi
  
 -# This program is distributed in the hope that it will be useful,
 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 -# GNU General Public License for more details.
-+  AC_SUBST(GCONF_SCHEMA_FILE_DIR)
-+  AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
++  AC_ARG_WITH(gconf-schema-file-dir, 
++  [  --with-gconf-schema-file-dir=dir        Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",)
  
 -# You should have received a copy of the GNU General Public License
 -# along with this program; if not, write to the Free Software
 -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 -# 02111-1307, USA.
++  AC_SUBST(GCONF_SCHEMA_FILE_DIR)
++  AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
+ 
+-# serial 5
 +  AC_ARG_ENABLE(schemas-install,
 +     [  --disable-schemas-install	Disable the schemas installation],
 +     [case "${enableval}" in
@@ -499,12 +501,10 @@
 +     AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, test x$schemas_install = xtrue)
 +])
  
--# serial 5
+-AC_PREREQ(2.52)
 +# Configure paths for GLIB
 +# Owen Taylor     1997-2001
  
--AC_PREREQ(2.52)
--
 -# AM_CONDITIONAL(NAME, SHELL-CONDITION)
 -# -------------------------------------
 -# Define a conditional.
@@ -947,7 +947,14 @@
 +dnl definitions in terms of our private definitions.
 +dnl
  
--cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+-# Only perform the check for file, if the check method requires it
+-case $deplibs_check_method in
+-file_magic*)
+-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+-    AC_PATH_MAGIC
+-  fi
+-  ;;
+-esac
 +# GLIB_LC_MESSAGES
 +#--------------------
 +glib_DEFUN([GLIB_LC_MESSAGES],
@@ -962,12 +969,9 @@
 +    fi
 +  fi])
  
--# Only perform the check for file, if the check method requires it
--case $deplibs_check_method in
--file_magic*)
--  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
--    AC_PATH_MAGIC
--  fi
+-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
+-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+-enable_win32_dll=yes, enable_win32_dll=no)
 +# GLIB_PATH_PROG_WITH_TEST
 +#----------------------------
 +dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
@@ -980,12 +984,7 @@
 +[case "[$]$1" in
 +  /*)
 +  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-   ;;
--esac
--
--AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
--AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
--enable_win32_dll=yes, enable_win32_dll=no)
++  ;;
 +  *)
 +  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
 +  for ac_dir in ifelse([$5], , $PATH, [$5]); do
@@ -1056,7 +1055,7 @@
 +        [AC_TRY_LINK([
 +#include <libintl.h>
 +],
-+         [return (int) ngettext ("","", 1)],
++         [return !ngettext ("","", 1)],
 +	  gt_cv_func_ngettext_libc=yes,
 +          gt_cv_func_ngettext_libc=no)
 +        ])
@@ -1066,7 +1065,7 @@
 +        	[AC_TRY_LINK([
 +#include <libintl.h>
 +],
-+	          [return (int) dgettext ("","")],
++	          [return !dgettext ("","")],
 +		  gt_cv_func_dgettext_libc=yes,
 +	          gt_cv_func_dgettext_libc=no)
 +        	])
@@ -1289,7 +1288,7 @@
  
 -# The HP-UX ksh and POSIX shell print the target directory to stdout
 -# if CDPATH is set.
--(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
 +# AM_GLIB_GNU_GETTEXT
 +# -------------------
 +# Do checks necessary for use of gettext. If a suitable implementation 
@@ -1320,6 +1319,17 @@
 -    fi
 -  done
 -fi
+-
+-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+-   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+-   test "X$echo_testing_string" = "X$echo_test_string"; then
+-  :
+-else
+-  # The Solaris, AIX, and Digital Unix default echo programs unquote
+-  # backslashes.  This makes it impossible to quote backslashes using
+-  #   echo "$something" | sed 's/\\/\\\\/g'
+-  #
+-  # So, first we look for a working echo in the user's PATH.
 +   if test "$gt_cv_have_gettext" = "yes"; then
 +     if test "x$ALL_LINGUAS" = "x"; then
 +       LINGUAS=
@@ -1351,71 +1361,6 @@
 +       AC_MSG_RESULT($LINGUAS)
 +     fi
  
[...22570 lines suppressed...]
+ 	@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 =
@@ -27329,7 +25722,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -297,6 +360,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+@@ -576,6 +633,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -27337,7 +25730,7 @@
  
  TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -308,8 +372,24 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEP
+@@ -587,8 +645,24 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEP
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -27364,7 +25757,7 @@
  	     $$tags $$unique
  
  GTAGS:
-@@ -318,19 +398,21 @@ GTAGS:
+@@ -597,19 +671,21 @@ GTAGS:
  	  && gtags -i $(GTAGS_ARGS) $$here
  
  distclean-tags:
@@ -27393,17 +25786,21 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -348,9 +430,7 @@ distdir: $(DISTFILES)
+@@ -627,10 +703,10 @@ distdir: $(DISTFILES)
  check-am: all-am
  check: check-am
- all-am: Makefile $(LTLIBRARIES)
+ 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
-@@ -362,7 +442,7 @@ install-am: all-am
+@@ -642,7 +718,7 @@ install-am: all-am
  installcheck: installcheck-am
  install-strip:
  	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
@@ -27412,17 +25809,17 @@
  	  `test -z '$(STRIP)' || \
  	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
  mostlyclean-generic:
-@@ -370,7 +450,7 @@ mostlyclean-generic:
+@@ -650,7 +726,7 @@ mostlyclean-generic:
  clean-generic:
  
  distclean-generic:
 -	-rm -f Makefile $(CONFIG_CLEAN_FILES)
 +	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
  
  maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -381,14 +461,17 @@ clean-am: clean-generic clean-libtool cl
- 	mostlyclean-am
+@@ -662,20 +738,23 @@ clean-am: clean-EVOLUTION_privlibexecPRO
+ 	clean-libtool clean-noinstPROGRAMS mostlyclean-am
  
  distclean: distclean-am
 -
@@ -27442,7 +25839,15 @@
  info: info-am
  
  info-am:
-@@ -404,7 +487,8 @@ install-man:
+ 
+-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
+@@ -687,7 +766,8 @@ install-man:
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
@@ -27452,7 +25857,7 @@
  maintainer-clean-am: distclean-am maintainer-clean-generic
  
  mostlyclean: mostlyclean-am
-@@ -412,18 +496,26 @@ mostlyclean: mostlyclean-am
+@@ -695,25 +775,34 @@ mostlyclean: mostlyclean-am
  mostlyclean-am: mostlyclean-compile mostlyclean-generic \
  	mostlyclean-libtool
  
@@ -27464,29 +25869,41 @@
 +
 +ps-am:
 +
- uninstall-am: uninstall-info-am
+ uninstall-am: uninstall-EVOLUTION_privlibexecPROGRAMS \
+ 	uninstall-gladeDATA uninstall-imagesDATA uninstall-info-am \
+ 	uninstall-serverDATA uninstall-uiDATA
  
--.PHONY: GTAGS all all-am check check-am clean clean-generic \
--	clean-libtool clean-noinstLTLIBRARIES distclean \
--	distclean-compile distclean-depend distclean-generic \
--	distclean-libtool distclean-tags distdir dvi dvi-am info \
--	info-am install install-am install-data install-data-am \
--	install-exec install-exec-am install-info install-info-am \
--	install-man install-strip installcheck installcheck-am \
--	installdirs maintainer-clean maintainer-clean-generic \
--	mostlyclean mostlyclean-compile mostlyclean-generic \
--	mostlyclean-libtool tags uninstall uninstall-am \
-+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-+	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+-.PHONY: GTAGS all all-am check check-am clean \
+-	clean-EVOLUTION_privlibexecPROGRAMS clean-generic clean-libtool \
+-	clean-noinstPROGRAMS distclean distclean-compile \
+-	distclean-depend 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 \
+-	tags uninstall uninstall-EVOLUTION_privlibexecPROGRAMS \
+-	uninstall-am uninstall-gladeDATA uninstall-imagesDATA \
+-	uninstall-info-am 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 html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
-+	install-exec-am install-info install-info-am install-man \
-+	install-strip 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-am \
- 	uninstall-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
  
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
-Only in ximian-connector-2.2.2-pristine/xntlm: Makefile.in.autotool-results
+ 
+ install-exec-local: ximian-connector-setup


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