From fa1d9f97dfd8ba2a6ba97dbb23d681441b794d74 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Sat, 16 Sep 2000 15:00:38 +0000 Subject: *Sigh.* Fix the massive, extreme breakage introduced by shuffling around a few addressbook-related files without updating the Makefiles. I hope at least it builds now. *Sigh.* svn path=/trunk/; revision=5473 --- addressbook/gui/component/Makefile.am | 8 +++----- addressbook/gui/component/addressbook.c | 1 + addressbook/gui/component/select-names/Makefile.am | 1 + addressbook/gui/component/select-names/e-select-names.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am index b3b644b561..12f63005e7 100644 --- a/addressbook/gui/component/Makefile.am +++ b/addressbook/gui/component/Makefile.am @@ -15,6 +15,7 @@ INCLUDES = \ -I$(top_srcdir)/widgets/e-table \ -I$(top_srcdir)/widgets/misc \ -I$(top_srcdir)/addressbook/gui/minicard \ + -I$(top_srcdir)/addressbook/gui/widgets \ -I$(top_srcdir)/addressbook/contact-editor \ -I$(top_srcdir)/addressbook/backend \ -I$(top_builddir)/addressbook/backend \ @@ -34,8 +35,6 @@ evolution_addressbook_SOURCES = \ addressbook-factory.c \ addressbook.c \ addressbook.h \ - e-addressbook-model.c \ - e-addressbook-model.h \ e-cardlist-model.c \ e-cardlist-model.h \ e-ldap-server-dialog.c \ @@ -68,12 +67,11 @@ oafdir = $(datadir)/oaf oaf_DATA = addressbook.oafinfo gladedir = $(datadir)/evolution/glade -glade_DATA = ldap-server-dialog.glade ldap-server-dialog.glade.h alphabet.glade +glade_DATA = ldap-server-dialog.glade ldap-server-dialog.glade.h EXTRA_DIST = \ $(glade_DATA) \ - $(oaf_DATA) \ - alphabet.glade.h + $(oaf_DATA) if ENABLE_PURIFY PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index 9ee83d110f..658da4c04c 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -31,6 +31,7 @@ #include #include #include + #include "e-contact-editor.h" #include "e-contact-save-as.h" #include "e-ldap-server-dialog.h" diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am index 2a11a8fa3e..6116b36b06 100644 --- a/addressbook/gui/component/select-names/Makefile.am +++ b/addressbook/gui/component/select-names/Makefile.am @@ -34,6 +34,7 @@ INCLUDES = \ -I$(top_srcdir)/widgets/e-text \ -I$(top_srcdir)/widgets/e-table \ -I$(top_srcdir)/addressbook/gui/minicard \ + -I$(top_srcdir)/addressbook/gui/widgets \ -I$(top_srcdir)/addressbook/contact-editor \ -I$(top_srcdir)/addressbook/backend \ -I$(top_builddir)/addressbook/backend \ diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c index 2303f13ad1..7f422082e8 100644 --- a/addressbook/gui/component/select-names/e-select-names.c +++ b/addressbook/gui/component/select-names/e-select-names.c @@ -24,7 +24,7 @@ #include "e-select-names.h" #include #include -#include +#include #include #include #include "e-select-names-table-model.h" -- cgit v1.2.3