--- a/src/Makefile.am	Tue Jun 03 11:03:04 2003 +0000
+++ b/src/Makefile.am	Tue Jun 03 11:07:00 2003 +0000
@@ -1,23 +1,23 @@
 # Generated libraries
-lib_LTLIBRARIES = libsid.la
+lib_LTLIBRARIES = libxmmssid.la
 
 # Generals
-
-CFLAGS   = -O2 -W -Wall -I$(top_builddir) -I$(top_srcdir) -I$(includedir) -D_REENTRANT @GTK_CFLAGS@ @SIDPLAY_CFLAGS@ -lstdc++
+CFLAGS   = -D_REENTRANT @GTK_CFLAGS@ @SIDPLAY_CFLAGS@
 CXXFLAGS = $(CFLAGS)
-LIBS     = -lsidplay
 
-libsid_la_LDFLAGS = -module -avoid-version
-libsid_la_LIBADD  = @GTK_LIBS@ @PTHREAD_LIBS@
+libxmmssid_la_LDFLAGS = -module -avoid-version
+libxmmssid_la_LIBADD  = @GTK_LIBS@ @PTHREAD_LIBS@ @SIDPLAY_LIBS@ -lstdc++
 
 # Plugin sources
-libsid_la_SOURCES =	\
-	xmms-sid.cc	\
+libxmmssid_la_SOURCES =	\
+	xmms-sid.cpp	xmms-sid.h	\
 	xs_init.c	\
-	xs_config.c	\
-	xs_fileinfo.cc	\
-	xs_stil.c	\
-	xs_about.c	\
-	xmms-sid.h	\
-	xmms-sid-logo.xpm
-
+	xs_title.cpp	\
+	xs_support.c	xs_support.h	\
+	xs_config.c	xs_config.h	\
+	xs_md5.c	xs_md5.h	\
+	xs_length.c	xs_length.h	\
+	xs_stil.c	xs_stil.h	\
+	xs_genui.c	xs_genui.h	\
+	xs_glade.c	xs_glade.h	\
+	xs_interface.c	xs_interface.h