diff options
| -rw-r--r-- | libwombat/ChangeLog | 5 | ||||
| -rw-r--r-- | libwombat/Makefile.am | 12 | ||||
| -rw-r--r-- | wombat/ChangeLog | 7 | ||||
| -rw-r--r-- | wombat/Evolution-Wombat.idl (renamed from wombat/wombat.idl) | 0 | ||||
| -rw-r--r-- | wombat/Makefile.am | 5 |
5 files changed, 22 insertions, 7 deletions
diff --git a/libwombat/ChangeLog b/libwombat/ChangeLog index 0792438860..a8f9e98290 100644 --- a/libwombat/ChangeLog +++ b/libwombat/ChangeLog @@ -1,3 +1,8 @@ +2002-07-09 Peter Williams <peterw@ximian.com> + + * Makefile.am: Reference the renamed Evolution-Wombat.idl + instead of wombat.idl. + 2002-01-27 Ettore Perazzoli <ettore@ximian.com> * Makefile.am: Use WOMBAT_CFLAGS. diff --git a/libwombat/Makefile.am b/libwombat/Makefile.am index 5d532f9f59..877fada9bc 100644 --- a/libwombat/Makefile.am +++ b/libwombat/Makefile.am @@ -2,18 +2,18 @@ INCLUDES = $(WOMBAT_CFLAGS) # CORBA stuff -IDLS = $(top_srcdir)/wombat/wombat.idl +IDLS = $(top_srcdir)/wombat/Evolution-Wombat.idl IDL_GENERATED = \ - wombat.h \ - wombat-common.c \ - wombat-skels.c \ - wombat-stubs.c + Evolution-Wombat.h \ + Evolution-Wombat-common.c \ + Evolution-Wombat-skels.c \ + Evolution-Wombat-stubs.c $(IDLS): $(ORBIT_IDL) $(IDL_GENERATED): $(IDLS) $(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \ - $(top_srcdir)/wombat/wombat.idl + $(top_srcdir)/wombat/Evolution-Wombat.idl # Wombat library lib_LTLIBRARIES = libwombat.la diff --git a/wombat/ChangeLog b/wombat/ChangeLog index b74782835c..78f12cba44 100644 --- a/wombat/ChangeLog +++ b/wombat/ChangeLog @@ -1,3 +1,10 @@ +2002-07-08 Peter Williams <peterw@ximian.com> + + * wombat.idl: Renamed to Evolution-Wombat.idl, since + we're installing it now and should play nice namespacily. + + * Makefile.am: Rename wombat.idl and install it. + 2002-04-26 Jeffrey Stedfast <fejj@ximian.com> * Makefile.am: Removed dependency on libibex. diff --git a/wombat/wombat.idl b/wombat/Evolution-Wombat.idl index 2c9538bfce..2c9538bfce 100644 --- a/wombat/wombat.idl +++ b/wombat/Evolution-Wombat.idl diff --git a/wombat/Makefile.am b/wombat/Makefile.am index cf937e6eac..a362b56f63 100644 --- a/wombat/Makefile.am +++ b/wombat/Makefile.am @@ -55,8 +55,11 @@ oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) @XML_I18N_MERGE_OAF_RULE@ +idldir = $(datadir)/idl -EXTRA_DIST = $(oaf_DATA) $(oaf_in_files) wombat.idl \ +idl_DATA = Evolution-Wombat.idl + +EXTRA_DIST = $(oaf_DATA) $(oaf_in_files) \ GNOME_Evolution_WombatLDAP.oaf.in GNOME_Evolution_WombatNOLDAP.oaf.in if ENABLE_PURIFY |