aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog8
-rw-r--r--shell/Makefile.am4
2 files changed, 11 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index ab486f53be..bf2b4193b0 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,11 @@
+2000-04-25 Dan Winship <danw@helixcode.com>
+
+ * Makefile.am: include -I$(datadir)/idl in orbit-idl arguments so
+ that you can have bonobo installed in the same prefix as
+ evolution, when that isn't the same prefix is gnome-libs, which a
+ lot of people seem to be doing.
+ (CLEANFILES): add EVOLUTION_CORBA_GENERATED
+
2000-04-24 Christopher James Lahey <clahey@helixcode.com>
* idl/folder.idl: Made some functions syncronous that didn't need
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 6a5d1cbf7a..5bdbe11e14 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -16,6 +16,8 @@ EVOLUTION_CORBA_GENERATED = \
Evolution-skels.c \
Evolution-stubs.c
+CLEANFILES = $(EVOLUTION_CORBA_GENERATED)
+
evolution_SOURCES = \
$(EVOLUTION_CORBA_GENERATED) \
main.c \
@@ -42,7 +44,7 @@ evolution_SOURCES = \
Evolution-impl.o: Evolution.h
$(EVOLUTION_CORBA_GENERATED): Evolution.idl evolution-service-repository.idl
- orbit-idl -I`$(GNOME_CONFIG) --datadir`/idl -I$(srcdir) $(srcdir)/Evolution.idl
+ $(ORBIT_IDL) -I$(datadir)/idl -I`$(GNOME_CONFIG) --datadir`/idl -I$(srcdir) $(srcdir)/Evolution.idl
evolution_LDADD = \
../widgets/shortcut-bar/libshortcut-bar.a \