Configuration and build system cleanups.

app/Makefile.am

@@ -19,11 +19,11 @@ LIBS = -lpthread -ldl $(SUN_LIBS)
 
 COMMON_FLAGS = @DFLAGS@ -D_REENTRANT -DADDON_DIR=\"$(ADDON_DIR)\"
 
-INCLUDES = -I$(top_srcdir)/alsaplayer -I$(top_srcdir)/libalsaplayer
+AM_CPPFLAGS = -I../intl -I$(top_srcdir)/intl \
+		-I$(top_srcdir)/alsaplayer -I$(top_srcdir)/libalsaplayer
 
-AM_CPPFLAGS = -I../intl -I$(top_srcdir)/intl
-
-AM_CXXFLAGS = $(COMMON_FLAGS)
+AM_CFLAGS = $(COMMON_FLAGS) $(AM_CPPFLAGS)
+AM_CXXFLAGS = $(COMMON_FLAGS) $(AM_CPPFLAGS)
 
 bin_PROGRAMS = alsaplayer
 
@@ -41,7 +41,7 @@ alsaplayer_SOURCES = AlsaSubscriber.cpp \
 		ControlSocket.cpp \
 		prefs.c reader.cpp
 
-alsaplayer_LDADD = $(top_builddir)/libalsaplayer/libalsaplayer.la @LIBINTL@
+alsaplayer_LDADD = $(top_builddir)/libalsaplayer/libalsaplayer.la
 
 jackplayer:
 		ln -s alsaplayer jackplayer

configure.ac

@@ -9,7 +9,7 @@ AC_CANONICAL_TARGET([])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
 
-AM_INIT_AUTOMAKE($PACKAGE_NAME,$PACKAGE_VERSION)
+AM_INIT_AUTOMAKE
 AM_SILENT_RULES([yes])
 
 dnl Add parameters for aclocal
@@ -22,8 +22,7 @@ AC_PROG_CXX
 AC_PROG_INSTALL
 AC_GNU_SOURCE
 
-AM_GNU_GETTEXT_VERSION([0.18.1])
-AM_GNU_GETTEXT([external])
+IT_PROG_INTLTOOL(0.50.0)
 
 AC_PROG_LN_S
 dnl static libs make no sense for alsaplayer

input/cdda/Makefile.am

@@ -16,7 +16,7 @@ lib_LTLIBRARIES = $(cddaltlibs)
 
 AM_CFLAGS = @DFLAGS@ -D_REENTRANT
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)/libalsaplayer \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)/libalsaplayer \
 				-I$(top_srcdir)/alsaplayer
 
 libdir = $(ADDON_DIR)/input

input/flac/Makefile.am

@@ -22,7 +22,7 @@ EXTRA_DIST = FlacEngine.cpp FlacPlugin.cpp FlacStream.cpp FlacTag.cpp \
 
 lib_LTLIBRARIES = $(flac_inltlibs)
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)/libalsaplayer \
+AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)/libalsaplayer \
 			-I$(top_srcdir)/alsaplayer
 
 AM_CXXFLAGS = @DFLAGS@ -D_REENTRANT

input/mad/Makefile.am

@@ -28,7 +28,7 @@ libdir = $(ADDON_DIR)/input
 AM_CFLAGS = @DFLAGS@ $(COMMON_CFLAGS) -D_REENTRANT -I$(top_builddir) \
 		-I$(top_srcdir)/libalsaplayer -I$(top_srcdir)/alsaplayer
 
-INCLUDES = -I$(ROOT_DIR)/app $(extra_cflags)
+AM_CPPFLAGS = -I$(ROOT_DIR)/app $(extra_cflags)
 
 libmad_in_la_SOURCES = $(mad_insources)
 

scopes2/opengl_spectrum/Makefile.am

@@ -26,4 +26,5 @@ liboglspectrum_la_SOURCES = $(oglspectrumsources)
 
 AM_CFLAGS = -D_REENTRANT @DFLAGS@
 
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)/libalsaplayer -I$(top_srcdir)/alsaplayer
+AM_CPPFLAGS = -I$(top_builddir) \
+		-I$(top_srcdir)/libalsaplayer -I$(top_srcdir)/alsaplayer