--- Sources/App/Makefile.am.link	2012-06-20 06:41:22.000000000 +0000
+++ Sources/App/Makefile.am	2012-06-20 06:43:27.000000000 +0000
@@ -7,8 +7,9 @@
 endif
 
 libclan23App_la_LDFLAGS = \
-  -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
-  $(extra_LIBS_clanApp)
+  -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE)
+
+libclan23App_la_LIBADD = $(extra_LIBS_clanApp) $(top_builddir)/Sources/Core/libclan23Core.la
 
 libclan23App_la_CXXFLAGS=$(clanApp_CXXFLAGS) $(extra_CFLAGS_clanApp)
 # EOF #
--- Sources/CSSLayout/Makefile.am.link	2012-06-20 08:51:14.000000000 +0000
+++ Sources/CSSLayout/Makefile.am	2012-06-20 08:52:37.000000000 +0000
@@ -336,8 +336,9 @@
 	LayoutTree/css_layout_hit_test_result.h
 
 libclan23CSSLayout_la_LDFLAGS = \
-  -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
-  $(extra_LIBS_clanCSSLayout)
+  -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE)
+
+libclan23CSSLayout_la_LIBADD = $(extra_LIBS_clanCSSLayout) $(top_builddir)/Sources/Display/libclan23Display.la $(top_builddir)/Sources/Core/libclan23Core.la
 
 libclan23CSSLayout_la_CXXFLAGS=$(clanCSSLayout_CXXFLAGS) $(extra_CFLAGS_clanCSSLayout)
 # EOF #
--- Sources/Core/Makefile.am.link	2012-06-20 06:32:34.000000000 +0000
+++ Sources/Core/Makefile.am	2012-06-20 06:39:19.000000000 +0000
@@ -196,11 +196,10 @@
 endif
 
 # FIXME: Hardcoding these here might not be a good idea
-libclan23Core_la_LIBADD = @LIBPTHREAD@
+libclan23Core_la_LIBADD = $(extra_LIBS_clanCore) -lpthread
 
 libclan23Core_la_LDFLAGS = \
-  -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
-  $(extra_LIBS_clanCore)
+  -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE)
 
 libclan23Core_la_CXXFLAGS=$(clanCore_CXXFLAGS) $(extra_CFLAGS_clanCore)
 
--- Sources/Database/Makefile.am.link	2012-06-20 06:56:49.000000000 +0000
+++ Sources/Database/Makefile.am	2012-06-20 06:57:53.000000000 +0000
@@ -9,8 +9,9 @@
 db_transaction.cpp
 
 libclan23Database_la_LDFLAGS = \
-  -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
-  $(extra_LIBS_clanDatabase)
+  -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE)
+
+libclan23Database_la_LIBADD = $(extra_LIBS_clanDatabase) $(top_builddir)/Sources/Core/libclan23Core.la
 
 libclan23Database_la_CXXFLAGS=$(clanDatabase_CXXFLAGS) $(extra_CFLAGS_clanDatabase)
 
--- Sources/Display/Makefile.am.link	2012-06-20 06:46:32.000000000 +0000
+++ Sources/Display/Makefile.am	2012-06-20 06:52:46.000000000 +0000
@@ -2,7 +2,7 @@
 
 if WIN32
 else
-libclan23Display_la_LIBADD = -lpng -ljpeg
+libclan23Display_la_LIBADD = -lpng -ljpeg $(extra_LIBS_clanDisplay) $(top_builddir)/Sources/Core/libclan23Core.la -ldl
 endif
 libclan23Display_la_SOURCES = \
 	Font/font_vector.cpp \
@@ -206,8 +206,7 @@
 endif
 
 libclan23Display_la_LDFLAGS = \
-  -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
-  $(extra_LIBS_clanDisplay)
+  -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE)
 
 libclan23Display_la_CXXFLAGS=$(clanDisplay_CXXFLAGS) $(extra_CFLAGS_clanDisplay)
 # EOF #
--- Sources/GL/Makefile.am.link	2012-06-20 07:10:20.000000000 +0000
+++ Sources/GL/Makefile.am	2012-06-20 07:13:34.000000000 +0000
@@ -49,8 +49,9 @@
 	GLX/opengl_window_provider_glx.h
 endif
 libclan23GL_la_LDFLAGS = \
-  -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
-  $(extra_LIBS_clanGL)
+  -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE)
+
+libclan23GL_la_LIBADD = $(extra_LIBS_clanGL) $(top_builddir)/Sources/Display/libclan23Display.la $(top_builddir)/Sources/Core/libclan23Core.la -ldl -lX11
 
 libclan23GL_la_CXXFLAGS=$(clanGL_CXXFLAGS) $(extra_CFLAGS_clanGL)
 
--- Sources/GL1/Makefile.am.link	2012-06-20 07:19:48.000000000 +0000
+++ Sources/GL1/Makefile.am	2012-06-20 07:22:44.000000000 +0000
@@ -42,8 +42,9 @@
 	GLX/gl1_window_provider_glx.h
 endif
 libclan23GL1_la_LDFLAGS = \
-  -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
-  $(extra_LIBS_clanGL1)
+  -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE)
+
+libclan23GL1_la_LIBADD = $(extra_LIBS_clanGL1) $(top_builddir)/Sources/Display/libclan23Display.la $(top_builddir)/Sources/Core/libclan23Core.la -ldl -lX11
 
 libclan23GL1_la_CXXFLAGS=$(clanGL1_CXXFLAGS) $(extra_CFLAGS_clanGL1)
 
--- Sources/GUI/Makefile.am.link	2012-06-20 08:40:23.000000000 +0000
+++ Sources/GUI/Makefile.am	2012-06-20 08:55:03.000000000 +0000
@@ -121,8 +121,9 @@
 	gui_xml_loader_version_1_0.cpp
 
 libclan23GUI_la_LDFLAGS = \
-  -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
-  $(extra_LIBS_clanGUI)
+  -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE)
+
+libclan23GUI_la_LIBADD = $(extra_LIBS_clanGUI) $(top_builddir)/Sources/CSSLayout/libclan23CSSLayout.la $(top_builddir)/Sources/Display/libclan23Display.la $(top_builddir)/Sources/Core/libclan23Core.la
 
 libclan23GUI_la_CXXFLAGS=$(clanGUI_CXXFLAGS) $(extra_CFLAGS_clanGUI)
 
--- Sources/MikMod/Makefile.am.link	2012-06-20 09:02:11.000000000 +0000
+++ Sources/MikMod/Makefile.am	2012-06-20 09:07:57.000000000 +0000
@@ -8,11 +8,10 @@
  soundprovider_mikmod.cpp   \
  soundprovider_mikmod_session.cpp
 
-libclan23MikMod_la_LIBADD = -lmikmod
+libclan23MikMod_la_LIBADD = -lmikmod $(extra_LIBS_MikMod) $(top_builddir)/Sources/Sound/libclan23Sound.la $(top_builddir)/Sources/Core/libclan23Core.la
 
 libclan23MikMod_la_LDFLAGS = \
-  -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
-  $(extra_LIBS_MikMod)
+  -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE)
 
 libclan23Sound_la_CXXFLAGS=$(MikMod_CXXFLAGS) $(extra_CFLAGS_MikMod)
 
--- Sources/Network/Makefile.am.link	2012-06-20 09:01:14.000000000 +0000
+++ Sources/Network/Makefile.am	2012-06-20 09:01:42.000000000 +0000
@@ -43,8 +43,9 @@
 endif
 
 libclan23Network_la_LDFLAGS = \
-  -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
-  $(extra_LIBS_Network)
+  -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE)
+
+libclan23Network_la_LIBADD = $(extra_LIBS_Network) $(top_builddir)/Sources/Core/libclan23Core.la
 
 libclan23Sound_la_CXXFLAGS=$(Network_CXXFLAGS) $(extra_CFLAGS_Network)
 
--- Sources/RegExp/Makefile.am.link	2012-06-20 07:02:24.000000000 +0000
+++ Sources/RegExp/Makefile.am	2012-06-20 07:03:29.000000000 +0000
@@ -6,8 +6,9 @@
 regexp_match.cpp
 
 libclan23RegExp_la_LDFLAGS = \
-  -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
-  $(extra_LIBS_RegExp)
+  -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE)
+
+libclan23RegExp_la_LIBADD = $(extra_LIBS_RegExp) -lpcre $(top_builddir)/Sources/Core/libclan23Core.la
 
 libclan23Sound_la_CXXFLAGS=$(RegExp_CXXFLAGS) $(extra_CFLAGS_RegExp)
 
--- Sources/SWRender/Makefile.am.link	2012-06-20 08:56:35.000000000 +0000
+++ Sources/SWRender/Makefile.am	2012-06-20 08:58:48.000000000 +0000
@@ -81,8 +81,9 @@
 endif
 
 libclan23SWRender_la_LDFLAGS = \
-  -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
-  $(extra_LIBS_SWRender)
+  -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE)
+
+libclan23SWRender_la_LIBADD = $(extra_LIBS_SWRender) $(top_builddir)/Sources/Display/libclan23Display.la $(top_builddir)/Sources/Core/libclan23Core.la -lX11
 
 libclan23SWRender_la_CXXFLAGS=$(SWRender_CXXFLAGS) $(extra_CFLAGS_SWRender)
 
--- Sources/Sqlite/Makefile.am.link	2012-06-20 06:58:23.000000000 +0000
+++ Sources/Sqlite/Makefile.am	2012-06-20 07:01:59.000000000 +0000
@@ -8,11 +8,10 @@
 sqlite_reader_provider.cpp \
 sqlite_transaction_provider.cpp
 
-libclan23Sqlite_la_LIBADD = -lsqlite3
+libclan23Sqlite_la_LIBADD = -lsqlite3 $(extra_LIBS_Sqlite) $(top_builddir)/Sources/Database/libclan23Database.la $(top_builddir)/Sources/Core/libclan23Core.la
 
 libclan23Sqlite_la_LDFLAGS = \
-  -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
-  $(extra_LIBS_Sqlite)
+  -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE)
 
 libclan23Sound_la_CXXFLAGS=$(Sqlite_CXXFLAGS) $(extra_CFLAGS_Sqlite)
 
--- Sources/Vorbis/Makefile.am.link	2012-06-20 09:08:33.000000000 +0000
+++ Sources/Vorbis/Makefile.am	2012-06-20 09:09:29.000000000 +0000
@@ -5,11 +5,10 @@
 	soundprovider_vorbis.cpp \
 	soundprovider_vorbis_session.cpp
 
-libclan23Vorbis_la_LIBADD = -logg -lvorbis
+libclan23Vorbis_la_LIBADD = -logg -lvorbis $(extra_LIBS_Vorbis) $(top_builddir)/Sources/Sound/libclan23Sound.la $(top_builddir)/Sources/Core/libclan23Core.la
 
 libclan23Vorbis_la_LDFLAGS = \
-  -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
-  $(extra_LIBS_Vorbis)
+  -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE)
 
 libclan23Sound_la_CXXFLAGS=$(Vorbis_CXXFLAGS) $(extra_CFLAGS_Vorbis)
 
--- Sources/Sound/Makefile.am.link	2012-06-20 14:53:29.000000000 +0000
+++ Sources/Sound/Makefile.am	2012-06-20 14:54:43.000000000 +0000
@@ -56,8 +56,9 @@
 endif
 
 libclan23Sound_la_LDFLAGS = \
-  -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE) \
-  $(extra_LIBS_clanSound)
+  -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LDFLAGS_LT_RELEASE)
+
+libclan23Sound_la_LIBADD = $(extra_LIBS_clanSound) $(top_builddir)/Sources/Core/libclan23Core.la
 
 libclan23Sound_la_CXXFLAGS=$(clanSound_CXXFLAGS) $(extra_CFLAGS_clanSound)
 # EOF #
--- configure.ac.link	2012-03-22 11:22:31.000000000 +0000
+++ configure.ac	2012-06-20 16:17:48.000000000 +0000
@@ -646,16 +646,12 @@
 CXXFLAGS="$CXXFLAGS -I\$(top_srcdir)/Sources"
 
 dnl Modules which will be build
-ClanLib_Modules="App"
-ClanLib_pkgconfig="clanApp.pc"
-
-dnl API header files for the Modules which will be installed
-ClanLib_API_Modules="$ClanLib_API_Modules \$(clanApp_includes)"
+CLANLIB_ENABLE_MODULES(Core)
+CLANLIB_ENABLE_MODULES(App)
 
 dnl Default examples which will be build
 dnl (Currently Disabled)
 ClanLib_Examples=""
-CLANLIB_ENABLE_MODULES(Core)
 
 if test "$enable_clanDisplay" = "yes"; then
 	CLANLIB_ENABLE_MODULES(Display)
@@ -684,14 +680,14 @@
 	CLANLIB_ENABLE_MODULES(GL1)
 fi
 
+if test "$enable_clanCSSLayout" = "yes"; then
+        CLANLIB_ENABLE_MODULES(CSSLayout)
+fi
+		
 if test "$enable_clanGUI" = "yes"; then
 	CLANLIB_ENABLE_MODULES(GUI)
 fi
 
-if test "$enable_clanCSSLayout" = "yes"; then
-	CLANLIB_ENABLE_MODULES(CSSLayout)
-fi
-
 if test "$enable_clanSWRender" = "yes"; then
 	CLANLIB_ENABLE_MODULES(SWRender)
 fi
@@ -807,14 +803,12 @@
 AC_SUBST(ClanLib_Examples)
 
 AC_CONFIG_FILES([
-		Setup/pkgconfig/clanApp.pc
 		Setup/pkgconfig/Makefile
 		Makefile
 		Examples/Makefile
 		Examples/Makefile.conf
 		Setup/Makefile
 		Sources/API/Makefile
-		Sources/App/Makefile
 		Sources/Makefile
 		Tests/Makefile.conf
 		])