Index: clanlib-1.0~svn3827/Sources/Application/Makefile.am
===================================================================
--- clanlib-1.0~svn3827.orig/Sources/Application/Makefile.am	2009-09-23 13:17:19.000000000 -0400
+++ clanlib-1.0~svn3827/Sources/Application/Makefile.am	2009-09-23 13:17:51.000000000 -0400
@@ -6,6 +6,10 @@
 libclanApp_la_SOURCES = Unix/clanapp.cpp
 endif
 
+libclanApp_la_LIBADD = \
+  ../Signals/libclanSignals.la \
+  ../Core/libclanCore.la
+
 libclanApp_la_LDFLAGS = \
   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE)
 
Index: clanlib-1.0~svn3827/Sources/Core/Makefile.am
===================================================================
--- clanlib-1.0~svn3827.orig/Sources/Core/Makefile.am	2009-09-23 13:18:21.000000000 -0400
+++ clanlib-1.0~svn3827/Sources/Core/Makefile.am	2009-09-23 13:18:44.000000000 -0400
@@ -126,7 +126,9 @@
 endif
 
 # FIXME: Hardcoding these here might not be a good idea
-libclanCore_la_LIBADD = @LIBPTHREAD@
+libclanCore_la_LIBADD = \
+  ../Signals/libclanSignals.la \
+  @LIBPTHREAD@ -ldl
 
 libclanCore_la_LDFLAGS = \
   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE)
Index: clanlib-1.0~svn3827/Sources/Display/Makefile.am
===================================================================
--- clanlib-1.0~svn3827.orig/Sources/Display/Makefile.am	2009-09-23 13:19:18.000000000 -0400
+++ clanlib-1.0~svn3827/Sources/Display/Makefile.am	2009-09-23 13:21:03.000000000 -0400
@@ -2,8 +2,9 @@
 
 # FIXME: This needs to be @LIBS@ or @X11LIBS@ or something like that
 if WIN32
+xlibs = 
 else
-libclanDisplay_la_LIBADD = -L/usr/X11R6/lib/ -lX11 -lGL -lGLU -lpng -ljpeg -lXxf86vm @X_LIBS@
+xlibs = -L/usr/X11R6/lib/ -lX11 -lXmu -lGL -lGLU -lpng -ljpeg -lXxf86vm @X_LIBS@
 endif
 
 libclanDisplay_la_SOURCES = \
@@ -117,6 +118,11 @@
 Win32/input_device_win32mouse.h
 endif
 
+libclanDisplay_la_LIBADD = \
+  ../Signals/libclanSignals.la \
+  ../Core/libclanCore.la \
+  $(xlibs)
+
 libclanDisplay_la_LDFLAGS = \
   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE)
 
Index: clanlib-1.0~svn3827/Sources/GL/Makefile.am
===================================================================
--- clanlib-1.0~svn3827.orig/Sources/GL/Makefile.am	2009-09-23 13:21:29.000000000 -0400
+++ clanlib-1.0~svn3827/Sources/GL/Makefile.am	2009-09-23 13:22:38.000000000 -0400
@@ -34,6 +34,7 @@
 libclanGL_la_SOURCES += \
 WGL/display_window_opengl.h \
 WGL/display_window_opengl.cpp
+xlibs =
 else
 libclanGL_la_SOURCES += \
 GLX/display_window_opengl.h \
@@ -58,7 +59,7 @@
 GLX/input_device_x11keyboard.h \
 GLX/input_device_xinput.cpp \
 GLX/input_device_xinput.h
-libclanGL_la_LIBADD = -lXxf86vm -lXi -lGLU -lGL 
+xlibs = -lXxf86vm -lXi -lGLU -lGL
 endif
 
 EXTRA_DIST = \
@@ -66,6 +67,12 @@
  WGL/displaycard_opengl_win32.h   \
  WGL/setupgl_win32.cpp
 
+libclanGL_la_LIBADD = \
+  ../Display/libclanDisplay.la \
+  ../Signals/libclanSignals.la \
+  ../Core/libclanCore.la \
+  $(xlibs)
+
 libclanGL_la_LDFLAGS = \
   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE)
 
Index: clanlib-1.0~svn3827/Sources/GUI/Makefile.am
===================================================================
--- clanlib-1.0~svn3827.orig/Sources/GUI/Makefile.am	2009-09-23 13:25:27.000000000 -0400
+++ clanlib-1.0~svn3827/Sources/GUI/Makefile.am	2009-09-23 13:25:58.000000000 -0400
@@ -92,7 +92,10 @@
 deck_generic.h \
 deck_generic.cpp
 
-
+libclanGUI_la_LIBADD = \
+  ../Display/libclanDisplay.la \
+  ../Signals/libclanSignals.la \
+  ../Core/libclanCore.la
 
 libclanGUI_la_LDFLAGS = \
   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE)
Index: clanlib-1.0~svn3827/Sources/GUIStyleSilver/Makefile.am
===================================================================
--- clanlib-1.0~svn3827.orig/Sources/GUIStyleSilver/Makefile.am	2009-09-23 13:26:16.000000000 -0400
+++ clanlib-1.0~svn3827/Sources/GUIStyleSilver/Makefile.am	2009-09-23 13:26:39.000000000 -0400
@@ -13,7 +13,11 @@
 treeitem_silver.cpp	treeview_silver.cpp \
 treeitem_silver.h	treeview_silver.h
 
-
+libclanGUIStyleSilver_la_LIBADD = \
+  ../GUI/libclanGUI.la \
+  ../Display/libclanDisplay.la \
+  ../Signals/libclanSignals.la \
+  ../Core/libclanCore.la
 
 libclanGUIStyleSilver_la_LDFLAGS = \
   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE)
Index: clanlib-1.0~svn3827/Sources/MikMod/Makefile.am
===================================================================
--- clanlib-1.0~svn3827.orig/Sources/MikMod/Makefile.am	2009-09-23 13:27:01.000000000 -0400
+++ clanlib-1.0~svn3827/Sources/MikMod/Makefile.am	2009-09-23 13:27:25.000000000 -0400
@@ -8,7 +8,11 @@
  soundprovider_mikmod.cpp   \
  soundprovider_mikmod_session.cpp
 
-libclanMikMod_la_LIBADD = -lmikmod
+libclanMikMod_la_LIBADD = \
+  ../Sound/libclanSound.la \
+  ../Signals/libclanSignals.la \
+  ../Core/libclanCore.la \
+  -lmikmod
 
 libclanMikMod_la_LDFLAGS = \
   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE)
Index: clanlib-1.0~svn3827/Sources/Network/Makefile.am
===================================================================
--- clanlib-1.0~svn3827.orig/Sources/Network/Makefile.am	2009-09-23 13:27:49.000000000 -0400
+++ clanlib-1.0~svn3827/Sources/Network/Makefile.am	2009-09-23 13:28:12.000000000 -0400
@@ -62,6 +62,10 @@
 libclanNetwork_la_SOURCES += setupnetwork_unix.cpp
 endif
 
+libclanNetwork_la_LIBADD = \
+  ../Signals/libclanSignals.la \
+  ../Core/libclanCore.la
+
 libclanNetwork_la_LDFLAGS = \
   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE)
 
Index: clanlib-1.0~svn3827/Sources/SDL/Makefile.am
===================================================================
--- clanlib-1.0~svn3827.orig/Sources/SDL/Makefile.am	2009-09-23 13:28:33.000000000 -0400
+++ clanlib-1.0~svn3827/Sources/SDL/Makefile.am	2009-09-23 13:28:58.000000000 -0400
@@ -20,7 +20,12 @@
 surface_sdl.h
 
 libclanSDL_la_CXXFLAGS = $(SDL_CFLAGS)
-libclanSDL_la_LIBADD   = $(SDL_LIBS)
+
+libclanSDL_la_LIBADD = \
+  ../Display/libclanDisplay.la \
+  ../Signals/libclanSignals.la \
+  ../Core/libclanCore.la \
+  $(SDL_LIBS)
 
 libclanSDL_la_LDFLAGS = \
   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE)
Index: clanlib-1.0~svn3827/Sources/Sound/Makefile.am
===================================================================
--- clanlib-1.0~svn3827.orig/Sources/Sound/Makefile.am	2009-09-23 13:29:21.000000000 -0400
+++ clanlib-1.0~svn3827/Sources/Sound/Makefile.am	2009-09-23 13:29:45.000000000 -0400
@@ -48,6 +48,10 @@
 SoundProviders/Unix/soundprovider_recorder_oss.h
 endif
 
+libclanSound_la_LIBADD = \
+  ../Signals/libclanSignals.la \
+  ../Core/libclanCore.la
+
 libclanSound_la_LDFLAGS = \
   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
   $(SOUND_LDFLAGS)
Index: clanlib-1.0~svn3827/Sources/Vorbis/Makefile.am
===================================================================
--- clanlib-1.0~svn3827.orig/Sources/Vorbis/Makefile.am	2009-09-23 13:30:06.000000000 -0400
+++ clanlib-1.0~svn3827/Sources/Vorbis/Makefile.am	2009-09-23 13:30:34.000000000 -0400
@@ -5,7 +5,11 @@
 	soundprovider_vorbis.cpp \
 	soundprovider_vorbis_session.cpp
 
-libclanVorbis_la_LIBADD = -logg -lvorbis
+libclanVorbis_la_LIBADD = \
+  ../Sound/libclanSound.la \
+  ../Signals/libclanSignals.la \
+  ../Core/libclanCore.la \
+  -lvorbis -logg
 
 libclanVorbis_la_LDFLAGS = \
   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE)
Index: clanlib-1.0~svn3827/configure.ac
===================================================================
--- clanlib-1.0~svn3827.orig/configure.ac	2009-09-23 13:31:26.000000000 -0400
+++ clanlib-1.0~svn3827/configure.ac	2009-09-23 13:32:16.000000000 -0400
@@ -458,7 +458,7 @@
 CXXFLAGS="$CXXFLAGS -I\$(top_srcdir)/Sources"
 
 # Modules which will be build
-ClanLib_Modules="Application"
+ClanLib_Modules=""
 ClanLib_pkgconfig="clanApp.pc"
 
 # API header files for the Modules which will be installed
@@ -467,7 +467,8 @@
 # Default examples which will be build
 ClanLib_Examples="Directory Minimum Resources ResourcesCustom Signals ThreadSync XML Zip"
 
-CLANLIB_ENABLE_MODULES([Core Signals])
+CLANLIB_ENABLE_MODULES([Signals Core])
+ClanLib_Modules="$ClanLib_Modules Application"
 
 if test "$enable_clanDisplay" = "yes"; then
     CLANLIB_ENABLE_MODULES(Display)