get "make distcheck" working again

Makefile.am

@@ -1,26 +1,38 @@
 ACLOCAL_AMFLAGS = -I m4
 
-if WITH_GTK
-  GTK_DIR = gtk po
-endif
 if HAVE_BEOS
   BEOS_DIR = beos
 endif
 if HAVE_DARWIN
   MAC_DIR = macosx
 endif
+if WITH_GTK
+  GTK_DIR = gtk po
+endif
 if HAVE_WX
   WX_DIR = wx
 endif
 
-SUBDIRS = third-party libtransmission daemon cli $(GTK_DIR) $(BEOS_DIR) $(MAC_DIR) $(WX_DIR)
+SUBDIRS = \
+  third-party \
+  libtransmission \
+  daemon cli \
+  $(BEOS_DIR) \
+  $(GTK_DIR) \
+  $(MAC_DIR) \
+  $(WX_DIR)
 
 EXTRA_DIST = \
- NEWS \
- AUTHORS \
- LICENSE \
- README \
- third-party \
- intltool-extract.in \
- intltool-merge.in \
- intltool-update.in 
+  NEWS \
+  AUTHORS \
+  LICENSE \
+  README \
+  intltool-extract.in \
+  intltool-merge.in \
+  intltool-update.in 
+
+DISTCLEANFILES = \
+  intltool-extract \
+  intltool-merge \
+  intltool-update 
+

configure.ac

@@ -202,7 +202,6 @@ AC_CONFIG_FILES([Makefile
                  cli/Makefile
                  daemon/Makefile
                  libtransmission/Makefile
-                 libtransmission/version.h
                  third-party/Makefile
                  macosx/Makefile
                  wx/Makefile

gtk/Makefile.am

@@ -67,3 +67,7 @@ icondir = $(datadir)/pixmaps
 EXTRA_DIST = \
     $(DESKTOP_IN_FILES) \
     transmission.png
+
+DISTCLEANFILES = \
+    transmission.desktop
+

libtransmission/Makefile.am

@@ -4,8 +4,6 @@ AM_CFLAGS = $(PTHREAD_CFLAGS)
 
 noinst_LIBRARIES = libtransmission.a
 
-EXTRA_DIST = version.h.in
-
 libtransmission_a_SOURCES = \
     basename.c \
     bencode.c \
@@ -75,4 +73,21 @@ noinst_HEADERS = \
     trevent.h \
     upnp.h \
     utils.h \
+    version.h \
     xml.h
+
+EXTRA_DIST = \
+	version.h.in
+
+do_subst = sed \
+	-e 's,[@]PEERID_PREFIX[@],$(PEERID_PREFIX),g' \
+	-e 's,[@]USERAGENT_PREFIX[@],$(USERAGENT_PREFIX),g' \
+	-e 's,[@]SVN_REVISION[@],$(SVN_REVISION),g' \
+	-e 's,[@]SHORT_VERSION_STRING[@],$(SHORT_VERSION_STRING),g' \
+	-e 's,[@]LONG_VERSION_STRING[@],$(LONG_VERSION_STRING),g' 
+
+version.h: version.h.in
+	$(do_subst) < $(srcdir)/version.h.in > version.h
+
+CLEANFILES = \
+	version.h

libtransmission/transmission.h

@@ -29,7 +29,7 @@
 extern "C" {
 #endif
 
-#include "version.h"
+#include <libtransmission/version.h>
 
 #include <inttypes.h>
 #ifndef PRId64

macosx/Makefile.am

@@ -12,8 +12,77 @@ EXTRA_DIST = \
     fr.lproj \
     it.lproj \
     ko.lproj \
-    ru.lproj \
-    nl.lproj
+    AboutWindowController.h \
+    AboutWindowController.m \
+    ActionMenuRatioToDisplayRatioTransformer.h \
+    ActionMenuRatioToDisplayRatioTransformer.m \
+    ActionMenuSpeedToDisplayLimitTransformer.h \
+    ActionMenuSpeedToDisplayLimitTransformer.m \
+    ActionPopUpButton.h \
+    ActionPopUpButton.m \
+    Badger.h \
+    Badger.m \
+    Controller.h \
+    Controller.m \
+    CreatorWindowController.h \
+    CreatorWindowController.m \
+    DragOverlayView.h \
+    DragOverlayView.m \
+    DragOverlayWindow.h \
+    DragOverlayWindow.m \
+    ExpandedPathToIconTransformer.h \
+    ExpandedPathToIconTransformer.m \
+    ExpandedPathToPathTransformer.h \
+    ExpandedPathToPathTransformer.m \
+    FileNameCell.h \
+    FileNameCell.m \
+    FileOutlineView.h \
+    FileOutlineView.m \
+    FilePriorityCell.h \
+    FilePriorityCell.m \
+    FilterBarButton.h \
+    FilterBarButton.m \
+    FilterBarView.h \
+    FilterBarView.m \
+    ImageBackgroundView.h \
+    ImageBackgroundView.m \
+    InfoTabButtonCell.h \
+    InfoTabButtonCell.m \
+    InfoWindowController.h \
+    InfoWindowController.m \
+    IPCController.h \
+    IPCController.m \
+    main.m \
+    MessageWindowController.h \
+    MessageWindowController.m \
+    NSBezierPathAdditions.h \
+    NSBezierPathAdditions.m \
+    NSMenuAdditions.h \
+    NSMenuAdditions.m \
+    NSStringAdditions.h \
+    NSStringAdditions.m \
+    PeerProgressIndicatorCell.h \
+    PeerProgressIndicatorCell.m \
+    PeerTableView.h \
+    PeerTableView.m \
+    PiecesView.h \
+    PiecesView.m \
+    PortChecker.h \
+    PortChecker.m \
+    PrefsController.h \
+    PrefsController.m \
+    PrefsWindow.h \
+    PrefsWindow.m \
+    SpeedLimitToTurtleIconTransformer.h \
+    SpeedLimitToTurtleIconTransformer.m \
+    StatusBarView.h \
+    StatusBarView.m \
+    TorrentCell.h \
+    TorrentCell.m \
+    Torrent.h \
+    Torrent.m \
+    TorrentTableView.h \
+    TorrentTableView.m
 
 # Use Xcode do make the actual build
 all:

third-party/Makefile.am

@@ -1,3 +1,6 @@
 SUBDIRS = libevent
 
+EXTRA_DIST = \
+    macosx-libevent-config.h
+
 install: