aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/gui/Makefile.am53
-rw-r--r--calendar/gui/alarm-notify/Makefile.am11
-rw-r--r--calendar/gui/dialogs/Makefile.am9
4 files changed, 61 insertions, 19 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 961ce9cb02..ea0df608cc 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2003-02-10 Ettore Perazzoli <ettore@ximian.com>
+
+ * gui/Makefile.am: Make the CORBA IDL compilation work with
+ parallel makes.
+ * gui/dialogs/Makefile.am: Likewise.
+ * gui/alarm-notify/Makefile.am: Likewise.
+
2003-02-07 Rodney Dawes <dobey@ximian.com>
* gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in:
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index b3f9041c9e..5836bb69ae 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -5,29 +5,56 @@ IDLS = \
$(top_srcdir)/calendar/idl/evolution-calendar.idl \
$(top_srcdir)/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl
-IDL_GENERATED = \
- Evolution-Composer.h \
+# Message composer IDL files
+
+COMPOSER_IDL_GENERATED_H = \
+ Evolution-Composer.h
+COMPOSER_IDL_GENERATED_C = \
Evolution-Composer-common.c \
Evolution-Composer-skels.c \
- Evolution-Composer-stubs.c \
- Evolution-Addressbook-SelectNames.h \
+ Evolution-Composer-stubs.c
+COMPOSER_IDL_GENERATED = $(COMPOSER_IDL_GENERATED_C) $(COMPOSER_IDL_GENERATED_H)
+
+$(COMPOSER_IDL_GENERATED_H): $(IDLS)
+ $(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) \
+ $(srcdir)/../../composer/Evolution-Composer.idl
+$(COMPOSER_IDL_GENERATED_C): $(COMPOSER_IDL_GENERATED_H)
+
+
+# SelectNames IDL files
+
+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 \
- evolution-calendar.h \
+ Evolution-Addressbook-SelectNames-stubs.c
+SELECT_NAMES_IDL_GENERATED = $(SELECT_NAMES_IDL_GENERATED_C) $(SELECT_NAMES_IDL_GENERATED_H)
+
+$(SELECT_NAMES_IDL_GENERATED_H): $(IDLS)
+ $(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) \
+ $(top_srcdir)/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl
+$(SELECT_NAMES_IDL_GENERATED_C): $(SELECT_NAMES_IDL_GENERATED_H)
+
+
+# Calendar IDL files
+
+CALENDAR_IDL_GENERATED_H = \
+ evolution-calendar.h
+CALENDAR_IDL_GENERATED_C = \
evolution-calendar-common.c \
evolution-calendar-skels.c \
evolution-calendar-stubs.c
+CALENDAR_IDL_GENERATED = $(CALENDAR_IDL_GENERATED_C) $(CALENDAR_IDL_GENERATED_H)
-$(IDL_GENERATED): $(IDLS)
- $(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) \
- $(srcdir)/../../composer/Evolution-Composer.idl
+$(CALENDAR_IDL_GENERATED_H): $(IDLS)
$(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) \
$(top_srcdir)/calendar/idl/evolution-calendar.idl
- $(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) \
- $(top_srcdir)/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl
+$(CALENDAR_IDL_GENERATED_C): $(CALENDAR_IDL_GENERATED_H)
+
+
+IDL_GENERATED = $(COMPOSER_IDL_GENERATED) $(SELECT_NAMES_IDL_GENERATED) $(CALENDAR_IDL_GENERATED)
-BUILT_SOURCES = $(IDL_GENERATED)
SUBDIRS = alarm-notify dialogs
@@ -187,8 +214,10 @@ EXTRA_DIST = \
$(etspec_DATA) \
$(server_in_files)
+BUILT_SOURCES = $(IDL_GENERATED)
CLEANFILES = $(BUILT_SOURCES)
+
install-data-local:
$(mkinstalldirs) $(Conduitsdir)
diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am
index 42ec4d847d..d772d88030 100644
--- a/calendar/gui/alarm-notify/Makefile.am
+++ b/calendar/gui/alarm-notify/Makefile.am
@@ -1,15 +1,18 @@
-CORBA_GENERATED = \
- evolution-calendar.h \
+CORBA_GENERATED_H = \
+ evolution-calendar.h
+CORBA_GENERATED_C = \
evolution-calendar-common.c \
evolution-calendar-skels.c \
evolution-calendar-stubs.c
+CORBA_GENERATED = $(CORBA_GENERATED_C) $(CORBA_GENERATED_H)
idls = $(top_srcdir)/calendar/idl/evolution-calendar.idl
-
idl_flags = $(IDL_INCLUDES)
-$(CORBA_GENERATED): $(idls)
+$(CORBA_GENERATED_H): $(idls)
$(ORBIT_IDL) $(idl_flags) $(top_srcdir)/calendar/idl/evolution-calendar.idl
+$(CORBA_GENERATED_C): $(CORBA_GENERATED_H)
+
privlibexec_PROGRAMS = evolution-alarm-notify
diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am
index 97f67831cf..a4ffff5f17 100644
--- a/calendar/gui/dialogs/Makefile.am
+++ b/calendar/gui/dialogs/Makefile.am
@@ -1,14 +1,17 @@
IDLS = $(top_srcdir)/addressbook/gui/component/select-names/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)
-$(IDL_GENERATED): $(IDLS)
+$(IDL_GENERATED_H): $(IDLS)
$(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) \
$(top_srcdir)/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl
+$(IDL_GENERATED_C): $(IDL_GENERATED_H)
BUILT_SOURCES = $(IDL_GENERATED)