diff Makefile.am @ 677:0e879fb48b48

Use the improved m4 macros; Some additional configure cleanups done; Added preliminary detection for the new COMI interface used in libSIDPlay2 CVS; Added VERY preliminary detection for Antti Lankila's libSIDPlay2+reSID patches. NOTICE! Neither of these are actually yet supported.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 10 May 2008 01:22:02 +0300
parents d1b32e981e73
children 6b7fa8232d87
line wrap: on
line diff
--- a/Makefile.am	Sat May 10 01:19:49 2008 +0300
+++ b/Makefile.am	Sat May 10 01:22:02 2008 +0300
@@ -68,15 +68,15 @@
 lib_LTLIBRARIES = libxmmssid.la
 
 # Generals
-AM_CFLAGS = -W -Wall -D_REENTRANT @XMMS_CFLAGS@ @SIDPLAY1_INCLUDES@	\
-		@SIDPLAY2_INCLUDES@ @BUILDERS_INCLUDES@			\
+AM_CFLAGS = -W -Wall -D_REENTRANT @XMMS_CFLAGS@ @SIDPLAY1_CFLAGS@	\
+		@SIDPLAY2_CFLAGS@ @BUILDERS_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_LDADD@ @SIDPLAY2_LDADD@ @RESID_LDADD@ @HARDSID_LDADD@
+libxmmssid_la_LIBADD  = @XMMS_LIBS@ @SIDPLAY1_LIBS@ @SIDPLAY2_LIBS@ @BUILDERS_LIBS@
 
 # Glade-generated sources
 update-glade: xmms-sid.glade