aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNot Zed <NotZed@Ximian.com>2003-06-11 12:04:19 +0800
committerMichael Zucci <zucchi@src.gnome.org>2003-06-11 12:04:19 +0800
commit18dc245182af01b512e641fb35495b05ad9a760a (patch)
tree00a51c12ae233921256eeab61adc03036b75641f
parent12f37471147fae02253c241c6e5c475015e9221a (diff)
downloadgsoc2013-evolution-18dc245182af01b512e641fb35495b05ad9a760a.tar.gz
gsoc2013-evolution-18dc245182af01b512e641fb35495b05ad9a760a.tar.zst
gsoc2013-evolution-18dc245182af01b512e641fb35495b05ad9a760a.zip
** For #42691.
2003-06-05 Not Zed <NotZed@Ximian.com> ** For #42691. * gui/component/select-names/Makefile.am (%.server.in): implicit rule for .in file. (BUILT_SOURCES): added server_DATA. * gui/component/Makefile.am (%.server.in): use implicit rule for .in file. (BUILT_SOURCES): added, just server_DATA. (CLEANFILES): added * backend/ebook/Makefile.am (BUILT_SOURCES): add server_DATA. svn path=/trunk/; revision=21400
-rw-r--r--addressbook/ChangeLog22
-rw-r--r--addressbook/backend/ebook/Makefile.am2
-rw-r--r--addressbook/gui/component/Makefile.am6
-rw-r--r--addressbook/gui/component/select-names/Makefile.am4
4 files changed, 27 insertions, 7 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 71819be9df..742c091c93 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,4 +1,22 @@
+2003-06-05 Not Zed <NotZed@Ximian.com>
+
+ ** For #42691.
+
+ * gui/component/select-names/Makefile.am (%.server.in): implicit
+ rule for .in file.
+ (BUILT_SOURCES): added server_DATA.
+
+ * gui/component/Makefile.am (%.server.in): use implicit rule for
+ .in file.
+ (BUILT_SOURCES): added, just server_DATA.
+ (CLEANFILES): added
+
+ * backend/ebook/Makefile.am (BUILT_SOURCES): add server_DATA.
+
2003-06-04 Rodrigo Moya <rodrigo@ximian.com>
- * backend/ebook/ebook.c (e_book_do_response_open): adapted to
- changes in EComponentListener API.
+ * backend/ebook/ebook.c (e_book_do_response_open): adapted to
+ changes in EComponentListener API.
+
+** See ChangeLog.pre-1-4 for older changes
+
diff --git a/addressbook/backend/ebook/Makefile.am b/addressbook/backend/ebook/Makefile.am
index cd43562db0..d79cd7abdc 100644
--- a/addressbook/backend/ebook/Makefile.am
+++ b/addressbook/backend/ebook/Makefile.am
@@ -167,7 +167,7 @@ load_gnomecard_addressbook_LDADD = \
$(EVOLUTION_ADDRESSBOOK_LIBS)
-BUILT_SOURCES = $(CORBA_SOURCE) $(MARSHAL_GENERATED)
+BUILT_SOURCES = $(CORBA_SOURCE) $(MARSHAL_GENERATED) $(server_DATA)
CLEANFILES = $(BUILT_SOURCES)
dist-hook:
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index 36dd543700..e13f8d853b 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -78,15 +78,17 @@ install-data-local:
fi
server_in_files = GNOME_Evolution_Addressbook.server.in.in
-
server_DATA = $(server_in_files:.server.in.in=.server)
-$(server_in_files:.server.in.in=.server.in): $(server_in_files)
+%.server.in: %.server.in.in
sed -e "s|\@COMPONENTDIR\@|$(componentdir)|" $< > $@
@INTLTOOL_SERVER_RULE@
glade_DATA = ldap-config.glade
+BUILT_SOURCES = $(server_DATA)
+CLEANFILES = $(BUILT_SOURCES)
+
EXTRA_DIST = \
$(glade_DATA) \
$(schema_DATA) \
diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am
index 8c65110fb1..72a09715ca 100644
--- a/addressbook/gui/component/select-names/Makefile.am
+++ b/addressbook/gui/component/select-names/Makefile.am
@@ -19,7 +19,7 @@ $(IDL_GENERATED_C): $(IDL_GENERATED_H)
server_in_files = GNOME_Evolution_Addressbook_SelectNames.server.in.in
server_DATA = $(server_in_files:.server.in.in=.server)
-$(server_in_files:.server.in.in=.server.in): $(server_in_files)
+%.server.in: %.server.in.in
sed -e "s|\@COMPONENTDIR\@|$(componentdir)|" $< > $@
@INTLTOOL_SERVER_RULE@
@@ -108,7 +108,7 @@ EXTRA_DIST = \
$(etspec_DATA) \
e-select-names-marshal.list
-BUILT_SOURCES = $(IDL_GENERATED) $(MARSHAL_GENERATED)
+BUILT_SOURCES = $(IDL_GENERATED) $(MARSHAL_GENERATED) $(server_DATA)
CLEANFILES = $(BUILT_SOURCES)
dist-hook: