aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2003-01-29 02:09:09 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2003-01-29 02:09:09 +0800
commitef0b77769db54f4c9165be337579775e6e3c6660 (patch)
tree0079934c11795d7a65ca8881cd1fb405ec3439fd
parent8d5640e6ce6555768e28e207f0d165c93300cc80 (diff)
downloadgsoc2013-evolution-ef0b77769db54f4c9165be337579775e6e3c6660.tar
gsoc2013-evolution-ef0b77769db54f4c9165be337579775e6e3c6660.tar.gz
gsoc2013-evolution-ef0b77769db54f4c9165be337579775e6e3c6660.tar.bz2
gsoc2013-evolution-ef0b77769db54f4c9165be337579775e6e3c6660.tar.lz
gsoc2013-evolution-ef0b77769db54f4c9165be337579775e6e3c6660.tar.xz
gsoc2013-evolution-ef0b77769db54f4c9165be337579775e6e3c6660.tar.zst
gsoc2013-evolution-ef0b77769db54f4c9165be337579775e6e3c6660.zip
Use a little trick for the IDL compilation so that
it works with parallel makes. svn path=/trunk/; revision=19670
-rw-r--r--shell/ChangeLog5
-rw-r--r--shell/Makefile.am30
2 files changed, 28 insertions, 7 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 644423621e..ba2e9eadf7 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,10 @@
2003-01-28 Ettore Perazzoli <ettore@ximian.com>
+ * Makefile.am: Use a little trick for the IDL compilation so that
+ it works with parallel makes.
+
+2003-01-28 Ettore Perazzoli <ettore@ximian.com>
+
* e-shell.c (e_shell_construct): Use
bonobo_activation_server_register() instead of
bonobo_activation_register_active_server() again, since we want to
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 4a28535f37..89b4fe51ef 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -41,31 +41,47 @@ IDLS = \
Evolution-common.idl \
Evolution.idl
-IDL_GENERATED = \
- Evolution.h \
+IDL_GENERATED_H = \
+ Evolution.h
+
+IDL_GENERATED_C = \
Evolution-common.c \
Evolution-skels.c \
Evolution-stubs.c
+IDL_GENERATED = $(IDL_GENERATED_H) $(IDL_GENERATED_C)
+
Evolution-impl.o: Evolution.h
-$(IDL_GENERATED): $(IDLS)
+$(IDL_GENERATED_H): $(IDLS)
$(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) $(srcdir)/Evolution.idl
+$(IDL_GENERATED_C): $(IDL_GENERATED_H)
+ @true
+
+
# SelectNames CORBA stuff
SELECT_NAMES_IDL = \
$(top_srcdir)/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl
-SELECT_NAMES_IDL_GENERATED = \
- Evolution-Addressbook-SelectNames.h \
+SELECT_NAMES_IDL_GENERATED_H = \
+ Evolution-Addressbook-SelectNames.h
+
+SELECT_NAMES_IDL_GENERATED_C = \
Evolution-Addressbook-SelectNames-common.c \
Evolution-Addressbook-SelectNames-skels.c \
Evolution-Addressbook-SelectNames-stubs.c
-$(SELECT_NAMES_IDL_GENERATED): $(SELECT_NAMES_IDL)
+SELECT_NAMES_IDL_GENERATED = $(SELECT_NAMES_IDL_GENERATED_C) $(SELECT_NAMES_IDL_GENERATED_H)
+
+$(SELECT_NAMES_IDL_GENERATED_H): $(SELECT_NAMES_IDL)
$(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) $(SELECT_NAMES_IDL)
+$(SELECT_NAMES_IDL_GENERATED_C): $(SELECT_NAMES_IDL_GENERATED_H)
+ @true
+
+
# IDL install
idl_DATA = $(IDLS)
@@ -325,7 +341,7 @@ evolution.pure: evolution
endif
CLEANFILES = $(IDL_GENERATED) $(SELECT_NAMES_IDL_GENERATED)
-BUILT_SOURCES = $(IDL_GENERATED) $(SELECT_NAMES_IDL_GENERATED) $(MARSHAL_GENERATED)
+BUILT_SOURCES = $(IDL_GENERATED_H) $(SELECT_NAMES_IDL_GENERATED_H) $(MARSHAL_GENERATED)
dist-hook:
cd $(distdir); rm -f $(BUILT_SOURCES)