diff -p -up guichan-0.8.2/Makefile.am.linkage guichan-0.8.2/Makefile.am
--- guichan-0.8.2/Makefile.am.linkage	2009-09-03 22:35:02.000000000 +0200
+++ guichan-0.8.2/Makefile.am	2010-01-04 04:21:32.000000000 +0100
@@ -1,6 +1,7 @@
 AUTOMAKE_OPTIONS = 1.4
 
-SUBDIRS = examples include src
+SUBDIRS = examples include src src/opengl src/allegro \
+	  src/sdl src/hge src/openlayer src/contrib
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = guichan-0.8.pc
diff -p -up guichan-0.8.2/src/Makefile.am.linkage guichan-0.8.2/src/Makefile.am
--- guichan-0.8.2/src/Makefile.am.linkage	2009-09-03 22:35:02.000000000 +0200
+++ guichan-0.8.2/src/Makefile.am	2010-01-04 04:12:43.000000000 +0100
@@ -1,4 +1,4 @@
-SUBDIRS = widgets @GUICHAN_EXTRADIRS@ hge openlayer contrib
+SUBDIRS = widgets
 
 INCLUDES = -I$(top_srcdir)/include
 
diff -p -up guichan-0.8.2/src/allegro/Makefile.am.linkage guichan-0.8.2/src/allegro/Makefile.am
--- guichan-0.8.2/src/allegro/Makefile.am.linkage	2009-09-03 22:35:02.000000000 +0200
+++ guichan-0.8.2/src/allegro/Makefile.am	2010-01-04 04:16:35.000000000 +0100
@@ -4,10 +4,12 @@ INCLUDES = -I$(top_srcdir)/include
 
 libguichan_allegro_la_LDFLAGS = -no-undefined -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
+libguichan_allegro_la_LIBADD = -lalleg ../libguichan.la
+
 libguichan_allegro_la_SOURCES =		\
 		allegro.cpp		\
 		allegrofont.cpp		\
 		allegrographics.cpp	\
 		allegroimage.cpp	\
 		allegroimageloader.cpp	\
-		allegroinput.cpp
\ No newline at end of file
+		allegroinput.cpp
diff -p -up guichan-0.8.2/src/opengl/Makefile.am.linkage guichan-0.8.2/src/opengl/Makefile.am
--- guichan-0.8.2/src/opengl/Makefile.am.linkage	2009-09-03 22:35:02.000000000 +0200
+++ guichan-0.8.2/src/opengl/Makefile.am	2010-01-04 04:12:43.000000000 +0100
@@ -4,6 +4,8 @@ INCLUDES = -I$(top_srcdir)/include
 
 libguichan_opengl_la_LDFLAGS = -no-undefined -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 
 
+libguichan_opengl_la_LIBADD = -lGL ../libguichan.la
+
 libguichan_opengl_la_SOURCES =	\
 	opengl.cpp		\
 	openglimage.cpp		\
diff -p -up guichan-0.8.2/src/sdl/Makefile.am.linkage guichan-0.8.2/src/sdl/Makefile.am
--- guichan-0.8.2/src/sdl/Makefile.am.linkage	2009-09-03 22:35:02.000000000 +0200
+++ guichan-0.8.2/src/sdl/Makefile.am	2010-01-04 04:18:54.000000000 +0100
@@ -6,6 +6,8 @@ INCLUDES = -I$(top_srcdir)/include
 
 libguichan_sdl_la_LDFLAGS = -no-undefined -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
+libguichan_sdl_la_LIBADD = -lSDL -lSDL_image ../libguichan.la
+
 libguichan_sdl_la_SOURCES =	\
 	sdl.cpp			\
 	sdlgraphics.cpp		\