Reorganized source tree. Moved client.cpp into cmd/synergy as

synergy.cpp and server.cpp into cmd/synergyd as synergyd.cpp.
Moved and renamed related files.  Moved remaining source files
into lib/....  Modified and added makefiles as appropriate.
Result is that library files are under lib with each library
in its own directory and program files are under cmd with each
command in its own directory.

Makefile.am

@@ -4,13 +4,6 @@ DEPTH = .
 
 EXTRA_DIST =
 SUBDIRS =					\
-	base					\
+	lib						\
-	mt						\
+	cmd						\
-	io						\
-	http					\
-	net						\
-	synergy 				\
-	platform				\
-	client					\
-	server					\
 	$(NULL)

client/Makefile.am

@@ -1,38 +0,0 @@
-## Process this file with automake to produce Makefile.in
-NULL =
-DEPTH = ..
-
-bin_PROGRAMS = synergy
-synergy_SOURCES = 					\
-	CClient.cpp						\
-	CSecondaryScreen.cpp			\
-	CServerProxy.cpp				\
-	CXWindowsSecondaryScreen.cpp	\
-	client.cpp						\
-	CClient.h						\
-	CSecondaryScreen.h				\
-	CServerProxy.h					\
-	CXWindowsSecondaryScreen.h		\
-	$(NULL)
-synergy_LDADD =						\
-	$(DEPTH)/platform/libplatform.a	\
-	$(DEPTH)/synergy/libsynergy.a	\
-	$(DEPTH)/net/libnet.a			\
-	$(DEPTH)/io/libio.a				\
-	$(DEPTH)/mt/libmt.a				\
-	$(DEPTH)/base/libbase.a			\
-	$(X_LIBS)						\
-	$(X_PRE_LIBS)					\
-	-lXtst							\
-	-lXext							\
-	-lX11							\
-	$(X_EXTRA_LIBS)					\
-	$(NULL)
-INCLUDES =					\
-	-I$(DEPTH)/base 		\
-	-I$(DEPTH)/mt	 		\
-	-I$(DEPTH)/io	 		\
-	-I$(DEPTH)/net	 		\
-	-I$(DEPTH)/synergy		\
-	-I$(DEPTH)/platform 	\
-	$(NULL)

cmd/Makefile.am

@@ -0,0 +1,9 @@
+## Process this file with automake to produce Makefile.in
+NULL =
+DEPTH = ..
+
+EXTRA_DIST =
+SUBDIRS =					\
+	synergy					\
+	synergyd				\
+	$(NULL)

cmd/synergy/Makefile.am

@@ -0,0 +1,32 @@
+## Process this file with automake to produce Makefile.in
+NULL =
+DEPTH = ../..
+
+bin_PROGRAMS = synergy
+synergy_SOURCES = 						\
+	synergy.cpp							\
+	$(NULL)
+synergy_LDADD =							\
+	$(DEPTH)/lib/client/libclient.a		\
+	$(DEPTH)/lib/platform/libplatform.a	\
+	$(DEPTH)/lib/synergy/libsynergy.a	\
+	$(DEPTH)/lib/net/libnet.a			\
+	$(DEPTH)/lib/io/libio.a				\
+	$(DEPTH)/lib/mt/libmt.a				\
+	$(DEPTH)/lib/base/libbase.a			\
+	$(X_LIBS)							\
+	$(X_PRE_LIBS)						\
+	-lXtst								\
+	-lXext								\
+	-lX11								\
+	$(X_EXTRA_LIBS)						\
+	$(NULL)
+INCLUDES =								\
+	-I$(DEPTH)/lib/base 				\
+	-I$(DEPTH)/lib/mt	 				\
+	-I$(DEPTH)/lib/io	 				\
+	-I$(DEPTH)/lib/net	 				\
+	-I$(DEPTH)/lib/synergy				\
+	-I$(DEPTH)/lib/platform 			\
+	-I$(DEPTH)/lib/client 				\
+	$(NULL)

cmd/synergy/synergy.dsp

@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="client" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="synergy" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Application" 0x0101
 
-CFG=client - Win32 Debug
+CFG=synergy - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
-!MESSAGE NMAKE /f "client.mak".
+!MESSAGE NMAKE /f "synergy.mak".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "client.mak" CFG="client - Win32 Debug"
+!MESSAGE NMAKE /f "synergy.mak" CFG="synergy - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "synergy - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "client - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE "synergy - Win32 Debug" (based on "Win32 (x86) Application")
 !MESSAGE 
 
 # Begin Project
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "client - Win32 Release"
+!IF  "$(CFG)" == "synergy - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -38,12 +38,12 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../Release"
+# PROP Output_Dir "../../Release"
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W4 /GX /O2 /I "..\base" /I "..\io" /I "..\mt" /I "..\net" /I "..\synergy" /I "..\platform" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MT /W4 /GX /O2 /I "..\base" /I "..\io" /I "..\mt" /I "..\net" /I "..\synergy" /I "..\platform" /I "..\..\lib\base" /I "..\..\lib\io" /I "..\..\lib\mt" /I "..\..\lib\net" /I "..\..\lib\synergy" /I "..\..\lib\platform" /I "..\..\lib\client" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -54,9 +54,9 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 /out:"../Release/synergy.exe"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
 
-!ELSEIF  "$(CFG)" == "client - Win32 Debug"
+!ELSEIF  "$(CFG)" == "synergy - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -65,12 +65,12 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../Debug"
+# PROP Output_Dir "../../Debug"
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "..\base" /I "..\io" /I "..\mt" /I "..\net" /I "..\synergy" /I "..\platform" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /GZ /c
+# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "..\..\lib\base" /I "..\..\lib\io" /I "..\..\lib\mt" /I "..\..\lib\net" /I "..\..\lib\synergy" /I "..\..\lib\platform" /I "..\..\lib\client" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /GZ /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -81,40 +81,24 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /out:"../Debug/synergy.exe" /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
 
 !ENDIF 
 
 # Begin Target
 
-# Name "client - Win32 Release"
+# Name "synergy - Win32 Release"
-# Name "client - Win32 Debug"
+# Name "synergy - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=.\CClient.cpp
+SOURCE=.\synergy.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\client.cpp
+SOURCE=.\synergy.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\client.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\CMSWindowsSecondaryScreen.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CSecondaryScreen.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CServerProxy.cpp
 # End Source File
 # End Group
 # Begin Group "Header Files"
@@ -122,22 +106,6 @@ SOURCE=.\CServerProxy.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
-SOURCE=.\CClient.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CMSWindowsSecondaryScreen.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CSecondaryScreen.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CServerProxy.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\resource.h
 # End Source File
 # End Group

cmd/synergyd/Makefile.am

@@ -0,0 +1,34 @@
+## Process this file with automake to produce Makefile.in
+NULL =
+DEPTH = ../..
+
+bin_PROGRAMS = synergyd
+synergyd_SOURCES = 						\
+	synergyd.cpp						\
+	$(NULL)
+synergyd_LDADD =						\
+	$(DEPTH)/lib/server/libserver.a		\
+	$(DEPTH)/lib/platform/libplatform.a	\
+	$(DEPTH)/lib/synergy/libsynergy.a	\
+	$(DEPTH)/lib/net/libnet.a			\
+	$(DEPTH)/lib/http/libhttp.a			\
+	$(DEPTH)/lib/io/libio.a				\
+	$(DEPTH)/lib/mt/libmt.a				\
+	$(DEPTH)/lib/base/libbase.a			\
+	$(X_LIBS)							\
+	$(X_PRE_LIBS)						\
+	-lXtst								\
+	-lXext								\
+	-lX11								\
+	$(X_EXTRA_LIBS)						\
+	$(NULL)
+INCLUDES =								\
+	-I$(DEPTH)/lib/base 				\
+	-I$(DEPTH)/lib/mt	 				\
+	-I$(DEPTH)/lib/io	 				\
+	-I$(DEPTH)/lib/http 				\
+	-I$(DEPTH)/lib/net	 				\
+	-I$(DEPTH)/lib/synergy				\
+	-I$(DEPTH)/lib/platform 			\
+	-I$(DEPTH)/lib/server	 			\
+	$(NULL)

cmd/synergyd/synergyd.dsp

@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="server" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="synergyd" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Application" 0x0101
 
-CFG=server - Win32 Debug
+CFG=synergyd - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
-!MESSAGE NMAKE /f "server.mak".
+!MESSAGE NMAKE /f "synergyd.mak".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "server.mak" CFG="server - Win32 Debug"
+!MESSAGE NMAKE /f "synergyd.mak" CFG="synergyd - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "synergyd - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE "synergyd - Win32 Debug" (based on "Win32 (x86) Application")
 !MESSAGE 
 
 # Begin Project
@@ -29,7 +29,7 @@ CPP=cl.exe
 MTL=midl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "server - Win32 Release"
+!IF  "$(CFG)" == "synergyd - Win32 Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -38,12 +38,12 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir "../Release"
+# PROP Output_Dir "../../Release"
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W4 /GX /O2 /I "..\base" /I "..\mt" /I "..\io" /I "..\http" /I "..\net" /I "..\synergy" /I "..\platform" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MT /W4 /GX /O2 /I "..\..\lib\base" /I "..\..\lib\mt" /I "..\..\lib\io" /I "..\..\lib\http" /I "..\..\lib\net" /I "..\..\lib\synergy" /I "..\..\lib\platform" /I "..\..\lib\server" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -54,9 +54,9 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 /out:"../Release/synergyd.exe"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
 
-!ELSEIF  "$(CFG)" == "server - Win32 Debug"
+!ELSEIF  "$(CFG)" == "synergyd - Win32 Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -65,12 +65,12 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir "../Debug"
+# PROP Output_Dir "../../Debug"
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "..\base" /I "..\mt" /I "..\io" /I "..\http" /I "..\net" /I "..\synergy" /I "..\platform" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /GZ /c
+# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "..\..\lib\base" /I "..\..\lib\mt" /I "..\..\lib\io" /I "..\..\lib\http" /I "..\..\lib\net" /I "..\..\lib\synergy" /I "..\..\lib\platform" /I "..\..\lib\server" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /GZ /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -81,56 +81,24 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /out:"../Debug/synergyd.exe" /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
 
 !ENDIF 
 
 # Begin Target
 
-# Name "server - Win32 Release"
+# Name "synergyd - Win32 Release"
-# Name "server - Win32 Debug"
+# Name "synergyd - Win32 Debug"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=.\CClientProxy.cpp
+SOURCE=.\synergyd.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\CClientProxy1_0.cpp
+SOURCE=.\synergyd.rc
-# End Source File
-# Begin Source File
-
-SOURCE=.\CConfig.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CHTTPServer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CMSWindowsPrimaryScreen.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CPrimaryClient.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CPrimaryScreen.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\CServer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\server.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\server.rc
 # End Source File
 # End Group
 # Begin Group "Header Files"
@@ -138,38 +106,6 @@ SOURCE=.\server.rc
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
-SOURCE=.\CClientProxy.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CClientProxy1_0.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CConfig.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CHTTPServer.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CMSWindowsPrimaryScreen.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CPrimaryClient.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CPrimaryScreen.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\CServer.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\resource.h
 # End Source File
 # End Group

configure.in

@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(base/common.h)
+AC_INIT(lib/base/common.h)
 AM_CONFIG_HEADER(config.h)
 AC_CONFIG_AUX_DIR(config)
 AM_INIT_AUTOMAKE(synergy, 0.5)
@@ -60,14 +60,18 @@ CC="$PTHREAD_CC"
 
 AC_OUTPUT([
 Makefile
-base/Makefile
+lib/Makefile
-mt/Makefile
+lib/base/Makefile
-io/Makefile
+lib/mt/Makefile
-http/Makefile
+lib/io/Makefile
-net/Makefile
+lib/http/Makefile
-synergy/Makefile
+lib/net/Makefile
-platform/Makefile
+lib/synergy/Makefile
-client/Makefile
+lib/platform/Makefile
-server/Makefile
+lib/client/Makefile
+lib/server/Makefile
+cmd/Makefile
+cmd/synergy/Makefile
+cmd/synergyd/Makefile
 ])
 

io/Makefile.am

@@ -1,25 +0,0 @@
-## Process this file with automake to produce Makefile.in
-NULL =
-DEPTH = ..
-
-noinst_LIBRARIES = libio.a
-libio_a_SOURCES = 			\
-	CBufferedInputStream.cpp	\
-	CBufferedOutputStream.cpp	\
-	CInputStreamFilter.cpp	\
-	COutputStreamFilter.cpp	\
-	CStreamBuffer.cpp		\
-	XIO.cpp					\
-	CBufferedInputStream.h	\
-	CBufferedOutputStream.h	\
-	CInputStreamFilter.h	\
-	COutputStreamFilter.h	\
-	CStreamBuffer.h			\
-	IInputStream.h			\
-	IOutputStream.h			\
-	XIO.h					\
-	$(NULL)
-INCLUDES =					\
-	-I$(DEPTH)/base 		\
-	-I$(DEPTH)/mt	 		\
-	$(NULL)

lib/Makefile.am

@@ -0,0 +1,16 @@
+## Process this file with automake to produce Makefile.in
+NULL =
+DEPTH = ..
+
+EXTRA_DIST =
+SUBDIRS =					\
+	base					\
+	mt						\
+	io						\
+	http					\
+	net						\
+	synergy 				\
+	platform				\
+	client					\
+	server					\
+	$(NULL)

lib/base/CString.cpp

@@ -1,4 +1,5 @@
 #include "CString.h"
+#include "common.h"
 #include "stdvector.h"
 #include <cctype>
 #include <cstdio>

lib/base/Makefile.am

@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 NULL =
-DEPTH = ..
+DEPTH = ../..
 
 noinst_LIBRARIES = libbase.a
 libbase_a_SOURCES =			\

lib/client/Makefile.am

@@ -0,0 +1,23 @@
+## Process this file with automake to produce Makefile.in
+NULL =
+DEPTH = ../..
+
+noinst_LIBRARIES = libclient.a
+libclient_a_SOURCES = 				\
+	CClient.cpp						\
+	CSecondaryScreen.cpp			\
+	CServerProxy.cpp				\
+	CXWindowsSecondaryScreen.cpp	\
+	CClient.h						\
+	CSecondaryScreen.h				\
+	CServerProxy.h					\
+	CXWindowsSecondaryScreen.h		\
+	$(NULL)
+INCLUDES =							\
+	-I$(DEPTH)/lib/base 			\
+	-I$(DEPTH)/lib/mt	 			\
+	-I$(DEPTH)/lib/io	 			\
+	-I$(DEPTH)/lib/net	 			\
+	-I$(DEPTH)/lib/synergy			\
+	-I$(DEPTH)/lib/platform 		\
+	$(NULL)

lib/http/Makefile.am

@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 NULL =
-DEPTH = ..
+DEPTH = ../..
 
 noinst_LIBRARIES = libhttp.a
 libhttp_a_SOURCES = 		\
@@ -10,7 +10,7 @@ libhttp_a_SOURCES = 		\
 	XHTTP.h					\
 	$(NULL)
 INCLUDES =					\
-	-I$(DEPTH)/base 		\
+	-I$(DEPTH)/lib/base 	\
-	-I$(DEPTH)/mt	 		\
+	-I$(DEPTH)/lib/mt	 	\
-	-I$(DEPTH)/io	 		\
+	-I$(DEPTH)/lib/io	 	\
 	$(NULL)

lib/io/Makefile.am

@@ -0,0 +1,25 @@
+## Process this file with automake to produce Makefile.in
+NULL =
+DEPTH = ../..
+
+noinst_LIBRARIES = libio.a
+libio_a_SOURCES = 				\
+	CBufferedInputStream.cpp	\
+	CBufferedOutputStream.cpp	\
+	CInputStreamFilter.cpp		\
+	COutputStreamFilter.cpp		\
+	CStreamBuffer.cpp			\
+	XIO.cpp						\
+	CBufferedInputStream.h		\
+	CBufferedOutputStream.h		\
+	CInputStreamFilter.h		\
+	COutputStreamFilter.h		\
+	CStreamBuffer.h				\
+	IInputStream.h				\
+	IOutputStream.h				\
+	XIO.h						\
+	$(NULL)
+INCLUDES =						\
+	-I$(DEPTH)/lib/base 		\
+	-I$(DEPTH)/lib/mt	 		\
+	$(NULL)

lib/mt/Makefile.am

@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 NULL =
-DEPTH = ..
+DEPTH = ../..
 
 noinst_LIBRARIES = libmt.a
 libmt_a_SOURCES = 			\
@@ -19,5 +19,5 @@ libmt_a_SOURCES = 			\
 	XThread.h				\
 	$(NULL)
 INCLUDES =					\
-	-I$(DEPTH)/base 		\
+	-I$(DEPTH)/lib/base 	\
 	$(NULL)