aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.am16
-rw-r--r--libical/configure.in26
3 files changed, 27 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog
index a14b924c39..b49823a1d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-06 Christopher James Lahey <clahey@helixcode.com>
+
+ * Makefile.am, libical/configure.in: Fixed some make distcheck
+ errors.
+
2000-07-05 Ettore Perazzoli <ettore@helixcode.com>
* configure.in (GNOME_VFS_CFLAGS): Define.
diff --git a/Makefile.am b/Makefile.am
index d3b340e965..a032ebadde 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,12 @@
changelogs = \
ChangeLog
+appicondir = $(datadir)/pixmaps
+appicon_DATA = evolution.png
+
+applicationdir = $(datadir)/gnome/apps/Applications
+application_DATA = evolution.desktop
+
EXTRA_DIST = \
AUTHORS \
$(changelogs) \
@@ -8,7 +14,9 @@ EXTRA_DIST = \
HACKING \
MAINTAINERS \
NEWS \
- evolution.spec.in
+ evolution.spec.in \
+ $(appicon_DATA) \
+ $(application_DATA)
SUBDIRS = \
intl \
@@ -33,11 +41,5 @@ SUBDIRS = \
po \
doc
-appicondir = $(datadir)/pixmaps
-appicon_DATA = evolution.png
-
-applicationdir = $(datadir)/gnome/apps/Applications
-application_DATA = evolution.desktop
-
dist-hook: evolution.spec
cp evolution.spec $(distdir)
diff --git a/libical/configure.in b/libical/configure.in
index 7c74674e96..18d9b3ef37 100644
--- a/libical/configure.in
+++ b/libical/configure.in
@@ -33,16 +33,16 @@ AC_STRUCT_TM
dnl Checks for library functions.
AC_CHECK_FUNCS(strdup)
-AC_OUTPUT(\
-src/libical/icalversion.h \
-config.h \
-src/libical/Makefile \
-src/libicalss/Makefile \
-src/test/Makefile \
-src/Makefile \
-design-data/Makefile \
-doc/Makefile \
-scripts/Makefile \
-test-data/Makefile \
-src/Makefile \
-Makefile )
+AC_OUTPUT([
+Makefile
+config.h
+design-data/Makefile
+doc/Makefile
+scripts/Makefile
+src/Makefile
+src/libical/Makefile
+src/libical/icalversion.h
+src/libicalss/Makefile
+src/test/Makefile
+test-data/Makefile
+] )