--- a/Makefile.am	Thu Nov 08 23:32:07 2012 +0200
+++ b/Makefile.am	Thu Nov 08 23:39:23 2012 +0200
@@ -77,23 +77,8 @@
 
 
 ###
-### Source targets
+### Glade-generated sources
 ###
-# Generated libraries
-lib_LTLIBRARIES = libxmmssid.la
-
-# Generals
-AM_CFLAGS = -W -Wall -D_REENTRANT @XMMS_CFLAGS@ @SIDPLAY1_CFLAGS@	\
-		@SIDPLAY2_CFLAGS@ @BUILDERS_CFLAGS@ @SIDPLAYFP_CFLAGS@	\
-		-DTHEMETUNE_FILE="\"$(pkgdatadir)/$(themetune)\""	\
-		-DLOCALEDIR="\"$(localedir)\""
-
-AM_CXXFLAGS = $(AM_CFLAGS)
-
-libxmmssid_la_LDFLAGS = -module -avoid-version @BUILDERS_LDFLAGS@
-libxmmssid_la_LIBADD  = @XMMS_LIBS@ @SIDPLAY1_LIBS@ @SIDPLAY2_LIBS@ @BUILDERS_LIBS@ @SIDPLAYFP_LIBS@
-
-# Glade-generated sources
 update-glade: xmms-sid.glade
 	glade -w $<
 	touch $@
@@ -101,6 +86,36 @@
 #src/xs_genui.c src/xs_genui.h src/xs_glade.c src/xs_glade.h src/xs_interface.c src/xs_interface.h: update-glade
 
 
+###
+### Source targets
+###
+# Generated libraries
+lib_LTLIBRARIES = libxmmssid.la
+noinst_LTLIBRARIES = libxs_sidplay1.la libxs_sidplay2.la libxs_sidplayfp.la
+
+# Generals
+AM_CFLAGS = -W -Wall -D_REENTRANT @XMMS_CFLAGS@ \
+		-DTHEMETUNE_FILE="\"$(pkgdatadir)/$(themetune)\""	\
+		-DLOCALEDIR="\"$(localedir)\""
+
+AM_CXXFLAGS = $(AM_CFLAGS)
+
+
+libxmmssid_la_LDFLAGS = -module -avoid-version @BUILDERS_LDFLAGS@
+libxmmssid_la_LIBADD  = \
+	libxs_sidplay1.la libxs_sidplay2.la libxs_sidplayfp.la \
+	@XMMS_LIBS@ @SIDPLAY1_LIBS@ @SIDPLAY2_LIBS@ @BUILDERS_LIBS@ @SIDPLAYFP_LIBS@
+
+# Backend interface sources
+libxs_sidplay1_la_SOURCES = src/xmms-sid.h src/xs_player.h src/xs_sidplay.h src/xs_sidplay1.cpp src/xs_sidplay1.h
+libxs_sidplay1_la_CFLAGS = @SIDPLAY1_CFLAGS@
+
+libxs_sidplay2_la_SOURCES = src/xmms-sid.h src/xs_player.h src/xs_sidplay.h src/xs_sidplay2.cpp src/xs_sidplay2.h
+libxs_sidplay2_la_CFLAGS = @SIDPLAY2_CFLAGS@ @BUILDERS_CFLAGS@
+
+libxs_sidplayfp_la_SOURCES = src/xmms-sid.h src/xs_player.h src/xs_sidplay.h src/xs_sidplayfp.cpp src/xs_sidplayfp.h
+libxs_sidplayfp_la_CFLAGS = @SIDPLAYFP_CFLAGS@
+
 # Plugin sources
 libxmmssid_la_SOURCES =	\
 	src/xs_init.c					\
@@ -115,10 +130,7 @@
 	src/xs_stil.c		src/xs_stil.h		\
 	src/xs_title.c		src/xs_title.h		\
 	src/xs_fileinfo.c	src/xs_fileinfo.h	\
-	src/xs_sidplay.h				\
-	src/xs_sidplay1.cpp	src/xs_sidplay1.h	\
-	src/xs_sidplay2.cpp	src/xs_sidplay2.h	\
-	src/xs_sidplayfp.cpp	src/xs_sidplayfp.h	\
 	src/xs_slsup.c		src/xs_slsup.h		\
 	src/xs_player.h		\
 	src/xmms-sid.c		src/xmms-sid.h
+