aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2003-02-20 02:13:52 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2003-02-20 02:13:52 +0800
commitdfe6ecc829d4170b1523465b68fa5f1a2c7108dc (patch)
tree5f33cb8b73baefe8d38c88ee6738d4e80db919a6
parentda47a92f83c97aba001150736c375be3111e5b8b (diff)
downloadgsoc2013-evolution-dfe6ecc829d4170b1523465b68fa5f1a2c7108dc.tar
gsoc2013-evolution-dfe6ecc829d4170b1523465b68fa5f1a2c7108dc.tar.gz
gsoc2013-evolution-dfe6ecc829d4170b1523465b68fa5f1a2c7108dc.tar.bz2
gsoc2013-evolution-dfe6ecc829d4170b1523465b68fa5f1a2c7108dc.tar.lz
gsoc2013-evolution-dfe6ecc829d4170b1523465b68fa5f1a2c7108dc.tar.xz
gsoc2013-evolution-dfe6ecc829d4170b1523465b68fa5f1a2c7108dc.tar.zst
gsoc2013-evolution-dfe6ecc829d4170b1523465b68fa5f1a2c7108dc.zip
Split $(CORBA_GENERATED_H) rule from the $(CORBA_GENERATED_C) rule to that
* pcs/Makefile.am: Split $(CORBA_GENERATED_H) rule from the $(CORBA_GENERATED_C) rule to that it autogens properly when using parallel makes. * cal-client/Makefile.am: Likewise. * gui/gnome-cal.c (gnome_calendar_setup_view_menus): Fix path to the calendar's GAL Views directory. [Pointed out by Grzegorz Goawski.] svn path=/trunk/; revision=19947
-rw-r--r--calendar/ChangeLog11
-rw-r--r--calendar/cal-client/Makefile.am14
-rw-r--r--calendar/gui/gnome-cal.c4
-rw-r--r--calendar/pcs/Makefile.am4
4 files changed, 23 insertions, 10 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 24b529d3df..827cd63501 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,14 @@
+2003-02-19 Ettore Perazzoli <ettore@ximian.com>
+
+ * pcs/Makefile.am: Split $(CORBA_GENERATED_H) rule from the
+ $(CORBA_GENERATED_C) rule to that it autogens properly when using
+ parallel makes.
+ * cal-client/Makefile.am: Likewise.
+
+ * gui/gnome-cal.c (gnome_calendar_setup_view_menus): Fix path to
+ the calendar's GAL Views directory. [Pointed out by Grzegorz
+ Goawski.]
+
2003-02-11 Hans Petter Jansson <hpj@ximian.com>
Enable printing for calendar and tasks.
diff --git a/calendar/cal-client/Makefile.am b/calendar/cal-client/Makefile.am
index a36bb7ded8..b7ffe15af7 100644
--- a/calendar/cal-client/Makefile.am
+++ b/calendar/cal-client/Makefile.am
@@ -2,23 +2,23 @@
# libcal-client
#
-CORBA_SOURCES_GENERATED = \
+CORBA_GENERATED_C = \
evolution-calendar-common.c \
evolution-calendar-skels.c \
evolution-calendar-stubs.c
-
-CORBA_HEADERS_GENERATED = \
+CORBA_GENERATED_H = \
evolution-calendar.h
-CORBA_GENERATED = $(CORBA_SOURCES_GENERATED) $(CORBA_HEADERS_GENERATED)
+CORBA_GENERATED = $(CORBA_GENERATED_C) $(CORBA_GENERATED_H)
idls = \
$(srcdir)/../idl/evolution-calendar.idl
idl_flags = $(IDL_INCLUDES)
-$(CORBA_GENERATED): $(idls)
+$(CORBA_GENERATED_H): $(idls)
$(ORBIT_IDL) $(idl_flags) $(srcdir)/../idl/evolution-calendar.idl
+$(CORBA_GENERATED_C): $(CORBA_GENERATED_H)
INCLUDES = \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
@@ -39,7 +39,7 @@ privlib_LTLIBRARIES = libcal-client.la
libcal_clientincludedir = $(privincludedir)/cal-client
libcal_client_la_SOURCES = \
- $(CORBA_SOURCES_GENERATED) \
+ $(CORBA_GENERATED_C) \
cal-client-multi.c \
cal-client-types.c \
cal-client.c \
@@ -50,7 +50,7 @@ libcal_client_la_SOURCES = \
query-listener.h
libcal_clientinclude_HEADERS = \
- $(CORBA_HEADERS_GENERATED) \
+ $(CORBA_GENERATED_H) \
cal-client-multi.h \
cal-client-types.h \
cal-client.h \
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 33b5fc8849..5c272c5f74 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -1340,9 +1340,9 @@ gnome_calendar_setup_view_menus (GnomeCalendar *gcal, BonoboUIComponent *uic)
gal_view_collection_set_title (collection, _("Calendar"));
- path = gnome_util_prepend_user_home ("/evolution/views/calendar/");
+ path = gnome_util_prepend_user_home ("/evolution/views/calendar/");
gal_view_collection_set_storage_directories (collection,
- EVOLUTION_GALVIEWSDIR "/evolution/views/calendar/",
+ EVOLUTION_GALVIEWSDIR "/calendar/",
path);
g_free (path);
diff --git a/calendar/pcs/Makefile.am b/calendar/pcs/Makefile.am
index a892fcb71f..aca5f34bad 100644
--- a/calendar/pcs/Makefile.am
+++ b/calendar/pcs/Makefile.am
@@ -24,9 +24,11 @@ idls = \
idl_flags = -I $(srcdir) $(IDL_INCLUDES)
-$(CORBA_GENERATED): $(idls)
+$(CORBA_GENERATED_H): $(idls)
$(ORBIT_IDL) $(idl_flags) $(srcdir)/../idl/evolution-calendar.idl
+$(CORBA_GENERATED_C): $(CORBA_GENERATED_H)
+
pcsincludedir = $(privincludedir)/pcs
privlib_LIBRARIES = libpcs.a