aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNickolay V. Shmyrev <nshmyrev@yandex.ru>2007-06-06 23:23:49 +0800
committerNickolay V. Shmyrev <nshmyrev@src.gnome.org>2007-06-06 23:23:49 +0800
commita63ea87a21a77e951a55b09c8b7dce9becf82177 (patch)
tree19cb0d2d2b91baef775471bc56692d2bd651c9dc
parentc43e87ecbaca9612672971e13b2b6836fad1db5f (diff)
downloadgsoc2013-evolution-a63ea87a21a77e951a55b09c8b7dce9becf82177.tar
gsoc2013-evolution-a63ea87a21a77e951a55b09c8b7dce9becf82177.tar.gz
gsoc2013-evolution-a63ea87a21a77e951a55b09c8b7dce9becf82177.tar.bz2
gsoc2013-evolution-a63ea87a21a77e951a55b09c8b7dce9becf82177.tar.lz
gsoc2013-evolution-a63ea87a21a77e951a55b09c8b7dce9becf82177.tar.xz
gsoc2013-evolution-a63ea87a21a77e951a55b09c8b7dce9becf82177.tar.zst
gsoc2013-evolution-a63ea87a21a77e951a55b09c8b7dce9becf82177.zip
Reverted automake 1.6 breakage. Fixes bug 444747. Patch by Patch by Daniel
2007-06-06 Nickolay V. Shmyrev <nshmyrev@yandex.ru> * Makefile.am: Reverted automake 1.6 breakage. Fixes bug 444747. Patch by Patch by Daniel Gryniewicz <dang@nemesis.fprintf.net>. svn path=/trunk/; revision=33661
-rw-r--r--addressbook/ChangeLog7
-rw-r--r--addressbook/Makefile.am6
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/Makefile.am10
4 files changed, 22 insertions, 8 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 5d05f411c4..04778a1829 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,10 @@
+2007-06-06 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
+
+ * Makefile.am:
+
+ Reverted automake 1.6 breakage. Fixes bug 444747.
+ Patch by Patch by Daniel Gryniewicz <dang@nemesis.fprintf.net>.
+
2007-06-03 Srinivasa Ragavan <sragavan@novell.com>
** Fix for bug #386503 from Matthew Barnes
diff --git a/addressbook/Makefile.am b/addressbook/Makefile.am
index 2ad82313ae..4ee593ecc6 100644
--- a/addressbook/Makefile.am
+++ b/addressbook/Makefile.am
@@ -1,10 +1,10 @@
-SUBDIRS = util printing importers gui tools
-
if ENABLE_PILOT_CONDUITS
-SUBDIRS += conduit
+CONDUIT_SUBDIR = conduit
endif
+SUBDIRS = util printing importers gui tools $(CONDUIT_SUBDIR)
+
error_DATA = addressbook.error
errordir = $(privdatadir)/errors
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 81e6778494..bdb74d98f9 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2007-06-06 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
+
+ * Makefile.am:
+
+ Reverted automake 1.6 breakage. Fixes bug 444747.
+ Patch by Patch by Daniel Gryniewicz <dang@nemesis.fprintf.net>.
+
2007-06-04 Chenthill Palanisamy <pchenthill@novell.com>
* gui/Makefile.am: Added the filter flags and the new files.
diff --git a/calendar/Makefile.am b/calendar/Makefile.am
index f08e48d566..f9a54aff06 100644
--- a/calendar/Makefile.am
+++ b/calendar/Makefile.am
@@ -1,13 +1,13 @@
-
-SUBDIRS = idl common importers gui
-
if ENABLE_PILOT_CONDUITS
-SUBDIRS += conduits
+CONDUIT_DIR = conduits
+else
+CONDUIT_DIR =
endif
+SUBDIRS = idl common importers gui $(CONDUIT_DIR)
+
error_DATA = calendar.error
errordir = $(privdatadir)/errors
-
@EVO_PLUGIN_RULE@
EXTRA_DIST = \