Use different tmp file names so these rules can be executed in parallel

* backend/ebook/Makefile.am (e-book-marshal.c, e-book-marshal.h):
Use different tmp file names so these rules can be executed in
parallel without interfering with each otehr.

* backend/pas/Makefile.am: Make the ORBit compilation work
properly with parallel makes (i.e. make sure it does not spawn
multiple orbit-idl processes on the same IDL file at the same
time).
* gui/component/select-names/Makefile.am: Likewise.
* backend/ebook/Makefile.am: Likewise.

svn path=/trunk/; revision=19834

4 files changed, 64 insertions, 24 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index e80a6e816e..84f7179b47 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,16 @@
+2003-02-06  Ettore Perazzoli  <ettore@ximian.com>
+
+	* backend/ebook/Makefile.am (e-book-marshal.c, e-book-marshal.h):
+	Use different tmp file names so these rules can be executed in
+	parallel without interfering with each otehr.
+
+	* backend/pas/Makefile.am: Make the ORBit compilation work
+	properly with parallel makes (i.e. make sure it does not spawn
+	multiple orbit-idl processes on the same IDL file at the same
+	time).
+	* gui/component/select-names/Makefile.am: Likewise.
+	* backend/ebook/Makefile.am: Likewise.
+
 2003-02-06  Dan Winship  <danw@ximian.com>
 
 	* gui/component/addressbook-config.c (main):
diff --git a/addressbook/backend/ebook/Makefile.am b/addressbook/backend/ebook/Makefile.am
index 772342041d..a1b39a6b8f 100644
--- a/addressbook/backend/ebook/Makefile.am
+++ b/addressbook/backend/ebook/Makefile.am
@@ -5,22 +5,41 @@ bin_PROGRAMS =	evolution-vcard-importer 	\
 		load-pine-addressbook		\
 		load-gnomecard-addressbook
 
-CORBA_SOURCE =				\
-	addressbook.h			\
-	addressbook-common.c		\
-	addressbook-stubs.c		\
-	addressbook-skels.c		\
-        Evolution-Composer.h            \
+# CORBA stuff
+
+CORBA_ADDRESSBOOK_SOURCE_H =			\
+	addressbook.h
+CORBA_ADDRESSBOOK_SOURCE_C =			\
+	addressbook-common.c			\
+	addressbook-stubs.c			\
+	addressbook-skels.c
+CORBA_ADDRESSBOOK_IDL = $(srcdir)/../idl/addressbook.idl
+
+$(CORBA_ADDRESSBOOK_SOURCE_H): $(CORBA_ADDRESSBOOK_IDL)
+	$(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) $(CORBA_ADDRESSBOOK_IDL)
+
+$(CORBA_ADDRESSBOOK_SOURCE_C): $(CORBA_ADDRESSBOOK_SOURCE_H)
+
+
+CORBA_COMPOSER_SOURCE_H	=		\
+        Evolution-Composer.h
+CORBA_COMPOSER_SOURCE_C = 		\
         Evolution-Composer-common.c     \
         Evolution-Composer-skels.c      \
         Evolution-Composer-stubs.c
+CORBA_COMPOSER_IDL = $(srcdir)/../../../composer/Evolution-Composer.idl
+
+CORBA_SOURCE_H = $(CORBA_COMPOSER_SOURCE_H) $(CORBA_ADDRESSBOOK_SOURCE_H)
+CORBA_SOURCE_C = $(CORBA_COMPOSER_SOURCE_C) $(CORBA_ADDRESSBOOK_SOURCE_C)
+CORBA_SOURCE = $(CORBA_SOURCE_H) $(CORBA_SOURCE_C)
+
+$(CORBA_COMPOSER_SOURCE_H): $(CORBA_COMPOSER_IDL)
+	$(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) $(CORBA_COMPOSER_IDL)
 
-idls =								\
-	$(srcdir)/../idl/addressbook.idl			\
-	$(srcdir)/../../../composer/Evolution-Composer.idl
+$(CORBA_COMPOSER_SOURCE_C): $(CORBA_COMPOSER_SOURCE_H)
 
-$(CORBA_SOURCE): $(idls)
-	$(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) $(idls)
+
+# The component 
 
 INCLUDES =						\
 	-DPREFIX=\"$(prefix)\"				\
@@ -42,6 +61,10 @@ INCLUDES =						\
 
 privlib_LTLIBRARIES = libebook.la libebook-static.la
 
+# Make sure the libraries are not built in parallel when using a parallel make;
+# libtool can't handle that.
+libebook_static_la_DEPENDENCIES = libebook.la
+
 libebook_la_SOURCES =					\
 	$(CORBA_SOURCE)					\
 	e-book-listener.c				\
@@ -84,14 +107,14 @@ libebook_static_la_LDFLAGS = -all-static
 # GLib marshalling cruft
 
 e-book-marshal.h: e-book-marshal.list
-	( @GLIB_GENMARSHAL@ --prefix=e_book_marshal e-book-marshal.list --header > e-book-marshal.tmp \
-	&& mv e-book-marshal.tmp e-book-marshal.h ) \
-	|| ( rm -f e-book-marshal.tmp && exit 1 )
+	( @GLIB_GENMARSHAL@ --prefix=e_book_marshal e-book-marshal.list --header > e-book-marshal.h.tmp \
+	&& mv e-book-marshal.h.tmp e-book-marshal.h ) \
+	|| ( rm -f e-book-marshal.h.tmp && exit 1 )
 
 e-book-marshal.c: e-book-marshal.h
-	( @GLIB_GENMARSHAL@ --prefix=e_book_marshal e-book-marshal.list --body > e-book-marshal.tmp \
-	&& mv e-book-marshal.tmp e-book-marshal.c ) \
-	|| ( rm -f e-book-marshal.tmp && exit 1 )
+	( @GLIB_GENMARSHAL@ --prefix=e_book_marshal e-book-marshal.list --body > e-book-marshal.c.tmp \
+	&& mv e-book-marshal.c.tmp e-book-marshal.c ) \
+	|| ( rm -f e-book-marshal.c.tmp && exit 1 )
 
 MARSHAL_GENERATED = e-book-marshal.c e-book-marshal.h
 
@@ -181,7 +204,7 @@ BUILT_SOURCES = $(CORBA_SOURCE) $(MARSHAL_GENERATED)
 CLEANFILES    = $(BUILT_SOURCES)
 
 dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
+	cd $(distdir); rm -f $(BUILT_SOURCES) $(CORBA_SOURCE_C)
 
 server_in_files = GNOME_Evolution_Addressbook_VCard_Importer.server.in \
 		  GNOME_Evolution_Addressbook_LDIF_Importer.server.in
diff --git a/addressbook/backend/pas/Makefile.am b/addressbook/backend/pas/Makefile.am
index 1180dc3f60..92115eae19 100644
--- a/addressbook/backend/pas/Makefile.am
+++ b/addressbook/backend/pas/Makefile.am
@@ -10,9 +10,12 @@ CORBA_SOURCE = $(CORBA_SOURCE_H) $(CORBA_SOURCE_C)
 idls =							\
 	$(srcdir)/../idl/addressbook.idl
 
-$(CORBA_SOURCE): $(idls)
+$(CORBA_SOURCE_H): $(idls)
 	$(ORBIT_IDL)  $(IDL_INCLUDES) -I $(srcdir) $(srcdir)/../idl/addressbook.idl
 
+$(CORBA_SOURCE_C): $(CORBA_SOURCE_H)
+
+
 INCLUDES =						\
 	$(DB3_CFLAGS)					\
 	$(LDAP_CFLAGS)					\
diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am
index 7c03ec9992..d9e9887a26 100644
--- a/addressbook/gui/component/select-names/Makefile.am
+++ b/addressbook/gui/component/select-names/Makefile.am
@@ -3,17 +3,18 @@
 idl_DATA = \
 	Evolution-Addressbook-SelectNames.idl
 
-IDL_GENERATED = \
-	Evolution-Addressbook-SelectNames.h		\
+IDL_GENERATED_H = 					\
+	Evolution-Addressbook-SelectNames.h
+IDL_GENERATED_C = 					\
 	Evolution-Addressbook-SelectNames-common.c	\
 	Evolution-Addressbook-SelectNames-skels.c	\
 	Evolution-Addressbook-SelectNames-stubs.c
+IDL_GENERATED = $(IDL_GENERATED_C) $(IDL_GENERATED_H)
 
-Evolution-Addressbook-SelectNames-impl.o: Evolution-Addressbook-SelectNames.h
-
-$(IDL_GENERATED): $(idl_DATA)
+$(IDL_GENERATED_H): $(idl_DATA)
 	$(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) \
 		$(srcdir)/Evolution-Addressbook-SelectNames.idl
+$(IDL_GENERATED_C): $(IDL_GENERATED_H)
 
 server_in_files = GNOME_Evolution_Addressbook_SelectNames.server.in.in