Index: Makefile.am
===================================================================
--- Makefile.am	(revision 665232)
+++ Makefile.am	(working copy)
@@ -24,11 +24,15 @@
 IPODEXPORTDIR = ipodexport
 endif
 
-SUBDIRS = common printwizard calendar mpegencoder cdarchiving simpleviewerexport \
+if compile_CALENDAR
+CALENDARDIR = calendar
+endif
+
+SUBDIRS = common printwizard mpegencoder cdarchiving simpleviewerexport \
 	      sendimages batchprocessimages wallpaper findimages galleryexport flickrexport \
 	      jpeglossless timeadjust gpssync metadataedit imageviewer \
 	      $(SLIDESHOWDIR) $(KAMERAKLIENTDIR) $(ACQUIREIMAGESDIR) $(RAWCONVERTERDIR) \
-	      $(HTMLEXPORTDIR) $(IPODEXPORTDIR) 
+	      $(HTMLEXPORTDIR) $(IPODEXPORTDIR) $(CALENDARDIR)
 
 rcdir = $(kde_datadir)/kipi
 rc_DATA = tips
