aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2000-09-13 04:02:03 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2000-09-13 04:02:03 +0800
commitb3986d16fab471bd956752bef55bf80acf8c2965 (patch)
tree68a12eabfee3c3b8be5910e92953b491326c4545
parent7d835651bee63b8069586cf26454648d219eddc0 (diff)
downloadgsoc2013-evolution-b3986d16fab471bd956752bef55bf80acf8c2965.tar
gsoc2013-evolution-b3986d16fab471bd956752bef55bf80acf8c2965.tar.gz
gsoc2013-evolution-b3986d16fab471bd956752bef55bf80acf8c2965.tar.bz2
gsoc2013-evolution-b3986d16fab471bd956752bef55bf80acf8c2965.tar.lz
gsoc2013-evolution-b3986d16fab471bd956752bef55bf80acf8c2965.tar.xz
gsoc2013-evolution-b3986d16fab471bd956752bef55bf80acf8c2965.tar.zst
gsoc2013-evolution-b3986d16fab471bd956752bef55bf80acf8c2965.zip
Get rid of the `ui.xml' stuff that Michael committed, as it's breaking
distcheck. svn path=/trunk/; revision=5381
-rw-r--r--addressbook/ChangeLog4
-rw-r--r--addressbook/gui/component/Makefile.am5
-rw-r--r--calendar/ChangeLog2
-rw-r--r--calendar/gui/Makefile.am5
-rw-r--r--mail/ChangeLog4
-rw-r--r--mail/Makefile.am5
6 files changed, 12 insertions, 13 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 78233d029f..878f33962b 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,7 @@
+2000-09-12 Ettore Perazzoli <ettore@helixcode.com>
+
+ * gui/component/Makefile.am (EXTRA_DIST): Remove `ui.xml'.
+
2000-09-11 Christopher James Lahey <clahey@helixcode.com>
* contact-editor/e-contact-editor.c: Fixed a crash error.
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index 6837984d93..0e28fc57db 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -72,7 +72,7 @@ glade_DATA = ldap-server-dialog.glade ldap-server-dialog.glade.h alphabet.glade
EXTRA_DIST = \
$(glade_DATA) \
$(oaf_DATA) \
- alphabet.glade.h ui.xml
+ alphabet.glade.h
if ENABLE_PURIFY
PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
@@ -84,6 +84,3 @@ evolution-addressbook.pure: evolution-addressbook
$(PLINK) $(evolution_addressbook_LDFLAGS) $(evolution_addressbook_OBJECTS) $(evolution_addressbook_LDADD) $(LIBS)
endif
-
-uidir = $(datadir)/evolution/addressbook
-ui_DATA = ui.xml
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 5a58560b6c..e2fd1e037d 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,7 @@
2000-09-12 Ettore Perazzoli <ettore@helixcode.com>
+ * gui/Makefile.am: Remove `ui.xml' stuff.
+
* pcs/cal-backend.c: Dont' #include calobj.h anymore as it's gone.
2000-09-12 Federico Mena Quintero <federico@helixcode.com>
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 7de9313589..26de95f324 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -135,8 +135,3 @@ evolution-calendar.pure: evolution-calendar
$(PLINK) $(evolution_calendar_LDFLAGS) $(evolution_calendar_OBJECTS) $(evolution_calendar_LDADD) $(LIBS)
endif
-
-uidir = $(datadir)/evolution/calendar
-ui_DATA = ui.xml
-
-EXTRA_DIST = ui.xml
diff --git a/mail/ChangeLog b/mail/ChangeLog
index ccf356f681..737bc3260d 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,7 @@
+2000-09-12 Ettore Perazzoli <ettore@helixcode.com>
+
+ * Makefile.am: Remove `ui.xml' stuff.
+
2000-09-12 Dan Winship <danw@helixcode.com>
* mail-local-storage.c (mail_local_storage_startup): set
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 4769a52d3c..a1aee01a84 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -127,7 +127,7 @@ iconsdir = $(datadir)/images/evolution
$(EVOLUTION_MAIL_CORBA_GENERATED): Mail.idl
$(ORBIT_IDL) -I$(datadir)/idl -I`$(GNOME_CONFIG) --cflags idl` -I`$(GNOME_CONFIG) --datadir`/idl -I$(srcdir) $(srcdir)/Mail.idl
-EXTRA_DIST = Mail.idl $(glade_DATA) $(oaf_DATA) ui.xml
+EXTRA_DIST = Mail.idl $(glade_DATA) $(oaf_DATA)
if ENABLE_PURIFY
PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
@@ -139,6 +139,3 @@ evolution-mail.pure: evolution-mail
$(PLINK) $(evolution_mail_LDFLAGS) $(evolution_mail_OBJECTS) $(evolution_mail_LDADD) $(LIBS)
endif
-
-uidir = $(datadir)/evolution/mail
-ui_DATA = ui.xml