2006-04-05 [colin] 2.1.0cvs3

[claws.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 338190f112993e7a2b86f6a2b64f3a9986057a6f..579c04dbfb54601b0445220a2c0ec234c20b8915 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,17 +1,23 @@
-SUBDIRS = m4 po src tools config doc
+ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = dist-bzip2
+
+if PLATFORM_WIN32
+tools = 
+else
+tools = tools
+endif
+
+SUBDIRS = m4 po src $(tools) config doc manual
 
 EXTRA_DIST = \
-       ChangeLog.claws \
-       ChangeLog-gtk2.claws \
-       README.claws \
-       RELEASE_NOTES.claws \
+       ChangeLog \
+       ChangeLog.gtk1 \
+       RELEASE_NOTES \
        sylpheed-claws-128x128.png \
        sylpheed-claws-64x64.png \
        sylpheed-claws.pc.in \
        sylpheed-claws.desktop \
        sylpheed-claws.png \
-       sylpheed.spec \
-       sylpheed.spec.in \
        autogen.sh
 
 if SYLPHEED_GNOME2
@@ -39,9 +45,6 @@ BZIP2_ENV =
 release: distdir
        -chmod -R a+r $(distdir)
        GZIP=$(GZIP_ENV) $(AMTAR)$(TAR) chozf $(distdir).tar.gz $(distdir)
-       rm -f $(distdir)/sylpheed.spec
-       sed '/^Source:/s/\.tar\.gz$$/\.tar\.bz2/' sylpheed.spec \
-         > $(distdir)/sylpheed.spec
        BZIP2=$(BZIP2_ENV) $(AMTAR)$(TAR) --bzip2 -chof $(distdir).tar.bz2 $(distdir)
        -rm -rf $(distdir)