From 73a6d43a66a828b09e2c1b5a483405e6e0b5fa6a Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Thu, 24 Aug 2000 20:12:06 +0000 Subject: Fix minor conflicts. svn path=/trunk/; revision=5017 --- libical/src/libicalss/Makefile.am | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) (limited to 'libical/src/libicalss/Makefile.am') diff --git a/libical/src/libicalss/Makefile.am b/libical/src/libicalss/Makefile.am index 01a7fa4d9c..e4431cb492 100644 --- a/libical/src/libicalss/Makefile.am +++ b/libical/src/libicalss/Makefile.am @@ -6,16 +6,27 @@ lib_LIBRARIES = libicalss.a libicalss_a_SOURCES =\ icalcalendar.c \ icalcalendar.h \ - icalcluster.c \ - icalcluster.h \ - icalstore.c \ - icalstore.h + icalset.h \ + icalset.c \ + icalfileset.c \ + icalfileset.h \ + icalfilesetimpl.h \ + icaldirset.c \ + icaldirset.h \ + icalcsdb.h \ + icalcstp.h \ + icalgauge.h \ + icalgauge.c include_HEADERS =\ icalcalendar.h \ - icalcluster.h \ - icalstore.h - + icalset.h + icalfileset.h \ + icalfilesetimpl.h \ + icaldirset.h \ + icalcsdb.h \ + icalcstp.h \ + icalgauge.h INCLUDES = \ -I ../libical/ \ -- cgit v1.2.3