diff -ru ClanLib-0.8.0.orig/configure.ac ClanLib-0.8.0/configure.ac --- ClanLib-0.8.0.orig/configure.ac 2006-09-20 23:55:39 +0400 +++ ClanLib-0.8.0/configure.ac 2006-09-21 10:34:26 +0400 @@ -422,7 +422,7 @@ CXXFLAGS="$CXXFLAGS -I\$(top_srcdir)/Sources" # Modules which will be build -ClanLib_Modules="Application" +#lanLib_Modules="Application" ClanLib_pkgconfig="clanApp.pc" # API header files for the Modules which will be installed @@ -431,7 +431,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) diff -ru ClanLib-0.8.0.orig/Sources/Application/Makefile.am ClanLib-0.8.0/Sources/Application/Makefile.am --- ClanLib-0.8.0.orig/Sources/Application/Makefile.am 2006-09-20 23:55:39 +0400 +++ ClanLib-0.8.0/Sources/Application/Makefile.am 2006-09-20 23:56:45 +0400 @@ -9,5 +9,6 @@ libclanApp_la_LDFLAGS = \ -release $(LT_RELEASE) \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) +libclanApp_la_LIBADD = $(top_builddir)/Sources/Core/libclanCore.la # EOF # diff -ru ClanLib-0.8.0.orig/Sources/Core/Makefile.am ClanLib-0.8.0/Sources/Core/Makefile.am --- ClanLib-0.8.0.orig/Sources/Core/Makefile.am 2006-09-20 23:55:39 +0400 +++ ClanLib-0.8.0/Sources/Core/Makefile.am 2006-09-21 00:26:54 +0400 @@ -125,7 +125,7 @@ endif # FIXME: Hardcoding these here might not be a good idea -libclanCore_la_LIBADD = @LIBPTHREAD@ +libclanCore_la_LIBADD = @LIBPTHREAD@ $(top_builddir)/Sources/Signals/libclanSignals.la -ldl libclanCore_la_LDFLAGS = \ -release $(LT_RELEASE) \ diff -ru ClanLib-0.8.0.orig/Sources/Display/Makefile.am ClanLib-0.8.0/Sources/Display/Makefile.am --- ClanLib-0.8.0.orig/Sources/Display/Makefile.am 2006-09-20 23:55:39 +0400 +++ ClanLib-0.8.0/Sources/Display/Makefile.am 2006-09-21 00:01:12 +0400 @@ -3,7 +3,10 @@ # FIXME: This needs to be @LIBS@ or @X11LIBS@ or something like that if WIN32 else -libclanDisplay_la_LIBADD = -L/usr/X11R6/lib/ -lX11 -lXmu -lGL -lGLU -lpng -ljpeg -lXxf86vm @X_LIBS@ +libclanDisplay_la_LIBADD = -L/usr/X11R6/lib/ -lX11 -lXmu -lGL -lGLU -lpng -ljpeg -lXxf86vm @X_LIBS@ \ + $(top_builddir)/Sources/Signals/libclanSignals.la \ + $(top_builddir)/Sources/Core/libclanCore.la + endif libclanDisplay_la_SOURCES = \ diff -ru ClanLib-0.8.0.orig/Sources/GL/Makefile.am ClanLib-0.8.0/Sources/GL/Makefile.am --- ClanLib-0.8.0.orig/Sources/GL/Makefile.am 2006-09-20 23:55:39 +0400 +++ ClanLib-0.8.0/Sources/GL/Makefile.am 2006-09-21 09:35:12 +0400 @@ -51,7 +51,10 @@ GLX/input_device_x11keyboard.h \ GLX/input_device_xinput.cpp \ GLX/input_device_xinput.h -libclanGL_la_LIBADD = -lXxf86vm -lXi -lGLU -lGL +libclanGL_la_LIBADD = -lXxf86vm -lXi -lGLU -lGL \ + $(top_builddir)/Sources/Core/libclanCore.la \ + $(top_builddir)/Sources/Signals/libclanSignals.la \ + $(top_builddir)/Sources/Display/libclanDisplay.la endif EXTRA_DIST = \ diff -ru ClanLib-0.8.0.orig/Sources/GUI/Makefile.am ClanLib-0.8.0/Sources/GUI/Makefile.am --- ClanLib-0.8.0.orig/Sources/GUI/Makefile.am 2006-09-20 23:55:39 +0400 +++ ClanLib-0.8.0/Sources/GUI/Makefile.am 2006-09-21 09:35:49 +0400 @@ -93,4 +93,9 @@ -release $(LT_RELEASE) \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) +libclanGUI_la_LIBADD = \ + $(top_builddir)/Sources/Core/libclanCore.la \ + $(top_builddir)/Sources/Display/libclanDisplay.la \ + $(top_builddir)/Sources/Signals/libclanSignals.la + # EOF # diff -ru ClanLib-0.8.0.orig/Sources/GUIStyleSilver/Makefile.am ClanLib-0.8.0/Sources/GUIStyleSilver/Makefile.am --- ClanLib-0.8.0.orig/Sources/GUIStyleSilver/Makefile.am 2006-09-20 23:55:40 +0400 +++ ClanLib-0.8.0/Sources/GUIStyleSilver/Makefile.am 2006-09-21 09:38:44 +0400 @@ -19,4 +19,9 @@ -release $(LT_RELEASE) \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) +libclanGUIStyleSilver_la_LIBADD = \ + $(top_builddir)/Sources/Signals/libclanSignals.la \ + $(top_builddir)/Sources/Core/libclanCore.la \ + $(top_builddir)/Sources/GUI/libclanGUI.la + # EOF # diff -ru ClanLib-0.8.0.orig/Sources/MikMod/Makefile.am ClanLib-0.8.0/Sources/MikMod/Makefile.am --- ClanLib-0.8.0.orig/Sources/MikMod/Makefile.am 2006-09-20 23:55:39 +0400 +++ ClanLib-0.8.0/Sources/MikMod/Makefile.am 2006-09-21 09:41:01 +0400 @@ -8,7 +8,8 @@ soundprovider_mikmod.cpp \ soundprovider_mikmod_session.cpp -libclanMikMod_la_LIBADD = -lmikmod +libclanMikMod_la_LIBADD = -lmikmod \ + $(top_builddir)/Sources/Sound/libclanSound.la libclanMikMod_la_LDFLAGS = \ -release $(LT_RELEASE) \ diff -ru ClanLib-0.8.0.orig/Sources/Network/Makefile.am ClanLib-0.8.0/Sources/Network/Makefile.am --- ClanLib-0.8.0.orig/Sources/Network/Makefile.am 2006-09-20 23:55:40 +0400 +++ ClanLib-0.8.0/Sources/Network/Makefile.am 2006-09-21 09:40:03 +0400 @@ -65,5 +65,8 @@ libclanNetwork_la_LDFLAGS = \ -release $(LT_RELEASE) \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) +libclanNetwork_la_LIBADD = \ + $(top_builddir)/Sources/Core/libclanCore.la \ + $(top_builddir)/Sources/Signals/libclanSignals.la # EOF # diff -ru ClanLib-0.8.0.orig/Sources/SDL/Makefile.am ClanLib-0.8.0/Sources/SDL/Makefile.am --- ClanLib-0.8.0.orig/Sources/SDL/Makefile.am 2006-09-20 23:55:39 +0400 +++ ClanLib-0.8.0/Sources/SDL/Makefile.am 2006-09-21 09:32:44 +0400 @@ -20,7 +20,10 @@ surface_sdl.h libclanSDL_la_CXXFLAGS = $(SDL_CFLAGS) -libclanSDL_la_LIBADD = $(SDL_LIBS) +libclanSDL_la_LIBADD = $(SDL_LIBS) \ + $(top_builddir)/Sources/Signals/libclanSignals.la \ + $(top_builddir)/Sources/Core/libclanCore.la \ + $(top_builddir)/Sources/Display/libclanDisplay.la libclanSDL_la_LDFLAGS = \ -release $(LT_RELEASE) \ --- ClanLib-0.8.1/Sources/Sound/Makefile.am.orig 2008-11-23 13:07:16 +0000 +++ ClanLib-0.8.1/Sources/Sound/Makefile.am 2008-11-23 13:09:28 +0000 @@ -48,5 +48,9 @@ libclanSound_la_LDFLAGS = \ -release $(LT_RELEASE) \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -lasound +libclanSound_la_LIBADD = \ + $(top_builddir)/Sources/Signals/libclanSignals.la \ + $(top_builddir)/Sources/Core/libclanCore.la + # EOF # diff -ru ClanLib-0.8.0.orig/Sources/Vorbis/Makefile.am ClanLib-0.8.0/Sources/Vorbis/Makefile.am --- ClanLib-0.8.0.orig/Sources/Vorbis/Makefile.am 2006-09-20 23:55:39 +0400 +++ ClanLib-0.8.0/Sources/Vorbis/Makefile.am 2006-09-21 09:41:27 +0400 @@ -5,7 +5,8 @@ soundprovider_vorbis.cpp \ soundprovider_vorbis_session.cpp -libclanVorbis_la_LIBADD = -logg -lvorbis +libclanVorbis_la_LIBADD = -logg -lvorbis \ + $(top_builddir)/Sources/Sound/libclanSound.la libclanVorbis_la_LDFLAGS = \ -release $(LT_RELEASE) \