From 4a6e9123715fd5536d81c826ae4c9d3aacbc5b84 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Tue, 14 Jan 2003 18:26:21 +0000 Subject: Add $(schema_DATA). * gui/component/Makefile.am (EXTRA_DIST): Add $(schema_DATA). * Makefile.am: Do not dist the .server.in files; just dist the .server.in.in ones. (EXTRA_DIST): Add GNOME_Evolution_WombatLDAP.server.in.in and GNOME_Evolution_WombatNOLDAP.server.in.in svn path=/trunk/; revision=19451 --- addressbook/ChangeLog | 4 ++++ addressbook/gui/component/Makefile.am | 7 ++++--- addressbook/printing/Makefile.am | 1 + wombat/ChangeLog | 2 ++ wombat/Makefile.am | 6 +++++- 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 1b51c47c9d..116e1dd395 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,7 @@ +2003-01-14 Ettore Perazzoli + + * gui/component/Makefile.am (EXTRA_DIST): Add $(schema_DATA). + 2003-01-09 Chris Toshok * gui/component/addressbook.c (control_activate_cb): try to load diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am index 6bf1c57f3e..16eb925fe3 100644 --- a/addressbook/gui/component/Makefile.am +++ b/addressbook/gui/component/Makefile.am @@ -100,9 +100,10 @@ glade_DATA = ldap-config.glade iconsdir = $(datadir)/evolution/images -EXTRA_DIST = \ - $(glade_DATA) \ - $(server_DATA) \ +EXTRA_DIST = \ + $(glade_DATA) \ + $(schema_DATA) \ + $(server_DATA) \ $(server_in_files) if ENABLE_PURIFY diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am index f9e6010e0d..423dac4f6a 100644 --- a/addressbook/printing/Makefile.am +++ b/addressbook/printing/Makefile.am @@ -47,6 +47,7 @@ contact_print_test_LDADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/libversit/libversit.a \ $(top_builddir)/e-util/ename/libename.la \ + $(top_builddir)/camel/libcamel.la \ libecontactprint.a \ $(EVOLUTION_ADDRESSBOOK_LIBS) diff --git a/wombat/ChangeLog b/wombat/ChangeLog index 500348b1b7..e795a5eabd 100644 --- a/wombat/ChangeLog +++ b/wombat/ChangeLog @@ -2,6 +2,8 @@ * Makefile.am: Do not dist the .server.in files; just dist the .server.in.in ones. + (EXTRA_DIST): Add GNOME_Evolution_WombatLDAP.server.in.in and + GNOME_Evolution_WombatNOLDAP.server.in.in 2003-01-06 Dan Winship diff --git a/wombat/Makefile.am b/wombat/Makefile.am index 52cf73720d..f9c13cebe5 100644 --- a/wombat/Makefile.am +++ b/wombat/Makefile.am @@ -69,7 +69,11 @@ $(server_in_files:.server.in.in=.server.in): $(server_in_files) idl_DATA = Evolution-Wombat.idl -EXTRA_DIST = $(server_DATA) $(server_in_files) $(idl_DATA) +EXTRA_DIST = $(server_DATA) \ + $(server_in_files) \ + $(idl_DATA) \ + GNOME_Evolution_WombatLDAP.server.in.in \ + GNOME_Evolution_WombatNOLDAP.server.in.in if ENABLE_PURIFY PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -- cgit