[Commits] Makefile.am 1.8.2.16 1.8.2.17

[colin at claws-mail.org]

Update of /home/claws-mail/claws/src/plugins
In directory srv:/tmp/cvs-serv26552/src/plugins

Modified Files:
      Tag: gtk2
	Makefile.am 
Log Message:
2013-02-20 [colin]	3.9.0cvs87

	* src/plugins/Makefile.am
	* src/plugins/acpi_notifier/Makefile.am
	* src/plugins/address_keeper/Makefile.am
	* src/plugins/archive/Makefile.am
	* src/plugins/att_remover/Makefile.am
	* src/plugins/attachwarner/Makefile.am
	* src/plugins/bogofilter/Makefile.am
	* src/plugins/bsfilter/Makefile.am
	* src/plugins/clamd/Makefile.am
	* src/plugins/demo/Makefile.am
	* src/plugins/fancy/Makefile.am
	* src/plugins/fetchinfo/Makefile.am
	* src/plugins/gdata/Makefile.am
	* src/plugins/mailmbox/Makefile.am
	* src/plugins/newmail/Makefile.am
	* src/plugins/notification/Makefile.am
	* src/plugins/pdf_viewer/Makefile.am
	* src/plugins/perl/Makefile.am
	* src/plugins/pgpcore/Makefile.am
	* src/plugins/pgpinline/Makefile.am
	* src/plugins/pgpmime/Makefile.am
	* src/plugins/python/Makefile.am
	* src/plugins/rssyl/Makefile.am
	* src/plugins/smime/Makefile.am
	* src/plugins/spam_report/Makefile.am
	* src/plugins/spamassassin/Makefile.am
	* src/plugins/tnef_parse/Makefile.am
	* src/plugins/vcalendar/Makefile.am
		Change automake conditionals so that all plugins subdirectories
		are included, but nothing built in disabled plugins. Fixes make
		dist with some plugins --disabled.

Index: Makefile.am
===================================================================
RCS file: /home/claws-mail/claws/src/plugins/Makefile.am,v
retrieving revision 1.8.2.16
retrieving revision 1.8.2.17
diff -u -d -r1.8.2.16 -r1.8.2.17
--- Makefile.am	20 Feb 2013 09:04:43 -0000	1.8.2.16
+++ Makefile.am	20 Feb 2013 13:12:49 -0000	1.8.2.17
@@ -1,133 +1,28 @@
-if BUILD_ACPI_NOTIFIER_PLUGIN
-acpi_notifier_dir = acpi_notifier
-endif
-
-if BUILD_ADDRESS_KEEPER_PLUGIN
-address_keeper_dir = address_keeper
-endif
-
-if BUILD_ARCHIVE_PLUGIN
-archive_dir = archive
-endif
-
-if BUILD_ATTACHWARNER_PLUGIN
-attachwarner_dir = attachwarner
-endif
-
-if BUILD_ATT_REMOVER_PLUGIN
-att_remover_dir = att_remover
-endif
-
-if BUILD_BOGOFILTER_PLUGIN
-bogofilter_dir = bogofilter
-endif
-
-if BUILD_BSFILTER_PLUGIN
-bsfilter_dir = bsfilter
-endif
-
-if BUILD_CLAMD_PLUGIN
-clamd_dir = clamd
-endif
-
-if BUILD_DEMO_PLUGIN
-demo_dir = demo
-endif
-
-if BUILD_FANCY_PLUGIN
-fancy_dir = fancy
-endif
-
-if BUILD_FETCHINFO_PLUGIN
-fetchinfo_dir = fetchinfo
-endif
-
-if BUILD_GDATA_PLUGIN
-gdata_dir = gdata
-endif
-
-if BUILD_MAILMBOX_PLUGIN
-mailmbox_dir = mailmbox
-endif
-
-if BUILD_NEWMAIL_PLUGIN
-newmail_dir = newmail
-endif
-
-if BUILD_NOTIFICATION_PLUGIN
-notification_dir = notification
-endif
-
-if BUILD_PDF_VIEWER_PLUGIN
-pdf_viewer_dir = pdf_viewer
-endif
-
-if BUILD_PERL_PLUGIN
-perl_dir = perl
-endif
-
-if BUILD_PYTHON_PLUGIN
-python_dir = python
-endif
-
-if BUILD_PGPCORE_PLUGIN
-pgpcore_dir = pgpcore
-if BUILD_PGPMIME_PLUGIN
-pgpmime_dir = pgpmime
-endif
-if BUILD_PGPINLINE_PLUGIN
-pgpinline_dir = pgpinline
-endif
-if BUILD_SMIME_PLUGIN
-smime_dir = smime
-endif
-endif
-
-if BUILD_RSSYL_PLUGIN
-rssyl_dir = rssyl
-endif
-
-if BUILD_SPAMASSASSIN_PLUGIN
-spamassassin_dir = spamassassin
-endif
-
-if BUILD_SPAM_REPORT_PLUGIN
-spam_report_dir = spam_report
-endif
-
-if BUILD_TNEF_PARSE_PLUGIN
-tnef_parse_dir = tnef_parse
-endif
-
-if BUILD_VCALENDAR_PLUGIN
-vcalendar_dir = vcalendar
-endif
-
 SUBDIRS = \
-	$(acpi_notifier_dir) \
-	$(address_keeper_dir) \
-	$(archive_dir) \
-	$(att_remover_dir) \
-	$(attachwarner_dir) \
-	$(bogofilter_dir) \
-	$(bsfilter_dir) \
-	$(clamd_dir) \
-	$(demo_dir) \
-	$(fancy_dir) \
-	$(fetchinfo_dir) \
-	$(gdata_dir) \
-	$(mailmbox_dir) \
-	$(newmail_dir) \
-	$(notification_dir) \
-	$(pdf_viewer_dir) \
-	$(perl_dir) \
-	$(python_dir) \
-	$(pgpcore_dir) \
-	$(pgpmime_dir) \
-	$(pgpinline_dir) \
-	$(rssyl_dir) \
-	$(smime_dir) \
-	$(spamassassin_dir) \
-	$(spam_report_dir) \
-	$(tnef_parse_dir) \
-	$(vcalendar_dir)
+	acpi_notifier \
+	address_keeper \
+	archive \
+	att_remover \
+	attachwarner \
+	bogofilter \
+	bsfilter \
+	clamd \
+	demo \
+	fancy \
+	fetchinfo \
+	gdata \
+	mailmbox \
+	newmail \
+	notification \
+	pdf_viewer \
+	perl \
+	python \
+	pgpcore \
+	pgpmime \
+	pgpinline \
+	rssyl \
+	smime \
+	spamassassin \
+	spam_report \
+	tnef_parse \
+	vcalendar