diff --git a/cmd/launcher/Makefile.am b/cmd/launcher/Makefile.am
index deb8c719..6c23aa91 100644
--- a/cmd/launcher/Makefile.am
+++ b/cmd/launcher/Makefile.am
@@ -13,22 +13,55 @@
 ## Process this file with automake to produce Makefile.in
 NULL =
 
-EXTRA_DIST =				\
+MSWINDOWS_SOURCE_FILES =	\
 	CAdvancedOptions.cpp	\
-	CAdvancedOptions.h		\
 	CAutoStart.cpp			\
-	CAutoStart.h			\
 	CGlobalOptions.cpp		\
-	CGlobalOptions.h		\
 	LaunchUtil.cpp			\
-	LaunchUtil.h			\
 	launcher.cpp			\
-	launcher.dsp			\
-	launcher.rc				\
+	CAdvancedOptions.h		\
+	CAutoStart.h			\
+	CGlobalOptions.h		\
+	LaunchUtil.h			\
 	resource.h				\
-	synergy.ico				\
+	launcher.rc				\
 	$(NULL)
 
-MAINTAINERCLEANFILES =		\
-	Makefile.in				\
+EXTRA_DIST =					\
+	launcher.dsp				\
+	synergy.ico					\
+	$(MSWINDOWS_SOURCE_FILES)	\
+	$(NULL)
+
+MAINTAINERCLEANFILES =			\
+	Makefile.in					\
+	$(NULL)
+
+bin_PROGRAMS = synergy
+if MSWINDOWS
+synergy_SOURCES =				\
+	$(MSWINDOWS_SOURCE_FILES)	\
+	$(NULL)
+endif
+synergy_LDADD =									\
+	$(top_builddir)/lib/client/libserver.a		\
+	$(top_builddir)/lib/platform/libplatform.a	\
+	$(top_builddir)/lib/synergy/libsynergy.a	\
+	$(top_builddir)/lib/net/libnet.a			\
+	$(top_builddir)/lib/io/libio.a				\
+	$(top_builddir)/lib/mt/libmt.a				\
+	$(top_builddir)/lib/base/libbase.a			\
+	$(top_builddir)/lib/common/libcommon.a		\
+	$(top_builddir)/lib/arch/libarch.a			\
+	$(NULL)
+INCLUDES =								\
+	-I$(top_srcdir)/lib/common			\
+	-I$(top_srcdir)/lib/arch			\
+	-I$(top_srcdir)/lib/base 			\
+	-I$(top_srcdir)/lib/mt	 			\
+	-I$(top_srcdir)/lib/io	 			\
+	-I$(top_srcdir)/lib/net	 			\
+	-I$(top_srcdir)/lib/synergy			\
+	-I$(top_srcdir)/lib/platform 		\
+	-I$(top_srcdir)/lib/server 			\
 	$(NULL)
diff --git a/lib/platform/Makefile.am b/lib/platform/Makefile.am
index 74074267..3361b693 100644
--- a/lib/platform/Makefile.am
+++ b/lib/platform/Makefile.am
@@ -44,7 +44,6 @@ MSWINDOWS_SOURCE_FILES =					\
 	CMSWindowsScreen.cpp					\
 	CMSWindowsScreenSaver.cpp				\
 	CMSWindowsUtil.cpp						\
-	CSynergyHook.cpp						\
 	CMSWindowsClipboard.h					\
 	CMSWindowsClipboardAnyTextConverter.h	\
 	CMSWindowsClipboardTextConverter.h		\
@@ -55,6 +54,9 @@ MSWINDOWS_SOURCE_FILES =					\
 	CMSWindowsScreen.h						\
 	CMSWindowsScreenSaver.h					\
 	CMSWindowsUtil.h						\
+	$(NULL)
+MSWINDOWS_HOOK_SOURCE_FILES =				\
+	CSynergyHook.cpp						\
 	CSynergyHook.h							\
 	$(NULL)
 CARBON_SOURCE_FILES =						\
@@ -76,6 +78,7 @@ EXTRA_DIST =								\
 	synrgyhk.dsp							\
 	$(XWINDOWS_SOURCE_FILES)				\
 	$(MSWINDOWS_SOURCE_FILES)				\
+	$(MSWINDOWS_HOOK_SOURCE_FILES)			\
 	$(CARBON_SOURCE_FILES)					\
 	$(NULL)