From 927da631980f20b076109939190fa6c20b75bf8e Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Thu, 15 Jun 2000 15:11:42 +0000 Subject: merge the two separate noinst_PROGRAMS declarations into one so automake * cal-util/Makefile.am (noinst_PROGRAMS): merge the two separate noinst_PROGRAMS declarations into one so automake accepts it. (INCLUDES): include libical src dir so we don't depend on having ical.h already installed svn path=/trunk/; revision=3573 --- calendar/ChangeLog | 7 +++++++ calendar/cal-util/Makefile.am | 5 ++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 6ba8ac019e..8015dfeb43 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,10 @@ +2000-06-15 Dan Winship + + * cal-util/Makefile.am (noinst_PROGRAMS): merge the two separate + noinst_PROGRAMS declarations into one so automake accepts it. + (INCLUDES): include libical src dir so we don't depend on having + ical.h already installed + 2000-06-13 Federico Mena Quintero * gui/calendar-model.c (CalendarModelPrivate): Added the array of diff --git a/calendar/cal-util/Makefile.am b/calendar/cal-util/Makefile.am index 1bcab2b5ad..33c8a00c56 100644 --- a/calendar/cal-util/Makefile.am +++ b/calendar/cal-util/Makefile.am @@ -1,5 +1,5 @@ -noinst_PROGRAMS = test-recur +noinst_PROGRAMS = test-recur icalendar-test INCLUDES = \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ @@ -9,6 +9,7 @@ INCLUDES = \ -I. \ -I.. \ -I$(top_builddir) \ + -I$(top_srcdir)/libical/src/libical \ $(GNOME_INCLUDEDIR) lib_LTLIBRARIES = libcal-util.la @@ -31,8 +32,6 @@ libcal_utilinclude_HEADERS = \ calobj.h \ timeutil.h -noinst_PROGRAMS = icalendar-test - icalendar_test_SOURCES = \ icalendar-test.c \ icalendar.c \ -- cgit v1.2.3