diff -urN torcs-1.3.0/src/libs/client/Makefile torcs-1.3.0.new/src/libs/client/Makefile
--- torcs-1.3.0/src/libs/client/Makefile	2006-11-05 02:42:20.000000000 +0100
+++ torcs-1.3.0.new/src/libs/client/Makefile	2007-04-06 14:46:51.679970778 +0200
@@ -23,7 +23,7 @@
 SOURCES   = entry.cpp mainmenu.cpp splash.cpp exitmenu.cpp \
 	    optionmenu.cpp
 
-LIBS      =  -lplibssg -lplibsg -lplibul
+LIBS      = -L../confscreens -lconfscreens -L../raceengineclient -lraceengine -lplibssg -lplibsg -lplibul
 
 EXPDIR    = include
 
diff -urN torcs-1.3.0/src/libs/Makefile torcs-1.3.0.new/src/libs/Makefile
--- torcs-1.3.0/src/libs/Makefile	2006-11-05 02:42:22.000000000 +0100
+++ torcs-1.3.0.new/src/libs/Makefile	2007-04-06 14:34:19.279707833 +0200
@@ -23,7 +23,7 @@
 
 TOOLSUBDIRS	= txml
 
-SUBDIRS		= confscreens racescreens robottools txml tgf tgfclient client raceengineclient learning \
+SUBDIRS		= confscreens racescreens robottools txml tgf tgfclient raceengineclient client learning \
 			  portability math
 
 PKGSUBDIRS	= $(SUBDIRS)
diff -urN torcs-1.3.0/src/libs/raceengineclient/Makefile torcs-1.3.0.new/src/libs/raceengineclient/Makefile
--- torcs-1.3.0/src/libs/raceengineclient/Makefile	2006-11-05 02:42:20.000000000 +0100
+++ torcs-1.3.0.new/src/libs/raceengineclient/Makefile	2007-04-06 14:34:46.918465784 +0200
@@ -23,6 +23,8 @@
 SOURCES      = singleplayer.cpp raceinit.cpp racemain.cpp racemanmenu.cpp racestate.cpp racegl.cpp \
 	       raceengine.cpp raceresults.cpp
 
+LIBS         = -L../racescreens -lracescreens -L../robottools -lrobottools
+
 EXPDIR       = include
 
 EXPORTS      = singleplayer.h raceinit.h
diff -urN torcs-1.3.0/src/libs/tgf/Makefile torcs-1.3.0.new/src/libs/tgf/Makefile
--- torcs-1.3.0/src/libs/tgf/Makefile	2006-11-05 02:42:17.000000000 +0100
+++ torcs-1.3.0.new/src/libs/tgf/Makefile	2007-04-06 14:17:21.146055081 +0200
@@ -29,6 +29,7 @@
 		profiler.cpp \
 		hash.cpp
 
+LIBS	= -L../txml -ltxml
 
 EXPDIR  = include
 
diff -urN torcs-1.3.0/src/libs/tgfclient/Makefile torcs-1.3.0.new/src/libs/tgfclient/Makefile
--- torcs-1.3.0/src/libs/tgfclient/Makefile	2006-11-05 02:42:18.000000000 +0100
+++ torcs-1.3.0.new/src/libs/tgfclient/Makefile	2007-04-06 14:16:39.269737161 +0200
@@ -38,6 +38,7 @@
 		tgfclient.cpp \
 		glfeatures.cpp
 
+LIBS	= -lpng -lXrandr
 
 EXPDIR  = include