aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2000-04-26 03:54:44 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2000-04-26 03:54:44 +0800
commitb3674f3251710338c488a29f1da6ea7e842c92a1 (patch)
tree04657bf81ac3c9db6b3551acf54a155d043b027b
parentae6031ecceb5dc02d5dafad6b31378021f358338 (diff)
downloadgsoc2013-evolution-b3674f3251710338c488a29f1da6ea7e842c92a1.tar
gsoc2013-evolution-b3674f3251710338c488a29f1da6ea7e842c92a1.tar.gz
gsoc2013-evolution-b3674f3251710338c488a29f1da6ea7e842c92a1.tar.bz2
gsoc2013-evolution-b3674f3251710338c488a29f1da6ea7e842c92a1.tar.lz
gsoc2013-evolution-b3674f3251710338c488a29f1da6ea7e842c92a1.tar.xz
gsoc2013-evolution-b3674f3251710338c488a29f1da6ea7e842c92a1.tar.zst
gsoc2013-evolution-b3674f3251710338c488a29f1da6ea7e842c92a1.zip
The Joy of Broken Makefiles Part #3.
svn path=/trunk/; revision=2614
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/cal-client/Makefile.am4
-rw-r--r--calendar/pcs/Makefile.am4
3 files changed, 11 insertions, 4 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 64bed82926..fa2c24dc3b 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2000-04-25 Ettore Perazzoli <ettore@helixcode.com>
+
+ * cal-client/Makefile.am: Add `$(datadir)/idl'.
+
+ * pcs/Makefile.am (idl_flags): Add `$(datadir)/idl'.
+ (INCLUDES): Use `$(BONOBO_GNOME_CFLAGS)'.
+
2000-04-25 Seth Alves <alves@hungry.com>
* gui/gnome-cal.c (gnome_calendar_destroy): hook for widget
diff --git a/calendar/cal-client/Makefile.am b/calendar/cal-client/Makefile.am
index 1457ca9e7a..f7077ed88f 100644
--- a/calendar/cal-client/Makefile.am
+++ b/calendar/cal-client/Makefile.am
@@ -11,7 +11,7 @@ CORBA_GENERATED = \
idls = \
$(srcdir)/../idl/evolution-calendar.idl
-idl_flags = `$(GNOME_CONFIG) --cflags idl`
+idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl
$(CORBA_GENERATED): $(idls)
$(ORBIT_IDL) $(idl_flags) $(srcdir)/../idl/evolution-calendar.idl
@@ -25,7 +25,7 @@ INCLUDES = \
-I.. \
-I$(top_builddir) \
-I$(includedir) \
- $(GNOME_INCLUDEDIR)
+ $(BONOBO_GNOME_CFLAGS)
lib_LTLIBRARIES = libcal-client.la
diff --git a/calendar/pcs/Makefile.am b/calendar/pcs/Makefile.am
index 11aba079cb..b9ea5fecd0 100644
--- a/calendar/pcs/Makefile.am
+++ b/calendar/pcs/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/calendar \
-I$(top_srcdir)/libical/src/libical \
- $(GNOME_INCLUDEDIR) \
+ $(BONOBO_GNOME_CFLAGS) \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
CORBA_GENERATED = \
@@ -15,7 +15,7 @@ CORBA_GENERATED = \
idls = \
$(srcdir)/../idl/evolution-calendar.idl
-idl_flags = `$(GNOME_CONFIG) --cflags idl`
+idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl
$(CORBA_GENERATED): $(idls)
$(ORBIT_IDL) $(idl_flags) $(srcdir)/../idl/evolution-calendar.idl