[evolution-patches] build fix for contact-list-editor



we need to generate the select names header in addressbook/gui/contact-
list-editor, since gui/component/select-names hasn't been built yet by
the time we build in contact-list-editor/..

Chris
Index: gui/contact-list-editor/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/contact-list-editor/Makefile.am,v
retrieving revision 1.21
diff -u -r1.21 Makefile.am
--- gui/contact-list-editor/Makefile.am	6 Dec 2003 18:05:28 -0000	1.21
+++ gui/contact-list-editor/Makefile.am	14 Jul 2004 03:51:33 -0000
@@ -1,3 +1,13 @@
+IDL = Evolution-Addressbook-SelectNames.idl
+
+IDL_GENERATED_H = 					\
+	Evolution-Addressbook-SelectNames.h
+
+selectnamesdir = $(top_srcdir)/addressbook/gui/component/select-names
+
+$(IDL_GENERATED_H): $(selectnamesdir)/$(IDL)
+	$(ORBIT_IDL) --nostubs --noskels --nocommon $(IDL_INCLUDES) $(selectnamesdir)/$(IDL)
+
 INCLUDES =						\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/addressbook/			\
@@ -31,7 +41,7 @@
 glade_DATA  = contact-list-editor.glade
 etspec_DATA = e-contact-list-editor.etspec
 
-BUILT_SOURCES = $(MARSHAL_GENERATED)
+BUILT_SOURCES = $(MARSHAL_GENERATED) $(IDL_GENERATED_H)
 CLEANFILES = $(BUILT_SOURCES)
 
 EXTRA_DIST = $(glade_DATA)	\
Index: gui/contact-list-editor/e-contact-list-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/contact-list-editor/e-contact-list-editor.c,v
retrieving revision 1.61
diff -u -r1.61 e-contact-list-editor.c
--- gui/contact-list-editor/e-contact-list-editor.c	12 Jul 2004 18:23:43 -0000	1.61
+++ gui/contact-list-editor/e-contact-list-editor.c	14 Jul 2004 03:51:33 -0000
@@ -43,10 +43,10 @@
 #include "widgets/misc/e-image-chooser.h"
 #include "widgets/misc/e-source-option-menu.h"
 
-#include "addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.h"
 #include "addressbook/gui/component/addressbook.h"
 #include "addressbook/gui/widgets/eab-gui-util.h"
 #include "addressbook/util/eab-book-util.h"
+#include "Evolution-Addressbook-SelectNames.h"
 
 #include  "eab-editor.h"
 #include "e-contact-editor.h"
Index: gui/contact-list-editor/.cvsignore
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/contact-list-editor/.cvsignore,v
retrieving revision 1.3
diff -u -r1.3 .cvsignore
--- gui/contact-list-editor/.cvsignore	6 Nov 2002 08:22:36 -0000	1.3
+++ gui/contact-list-editor/.cvsignore	14 Jul 2004 03:51:33 -0000
@@ -1,3 +1,4 @@
+Evolution-Addressbook-SelectNames.h
 Makefile.in
 Makefile
 .deps


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