# HG changeset patch
# User nenolod
# Date 1130177222 25200
# Node ID 31a41ed0ff71a090832781944d9d8a793d43e4ec
# Parent  f013913a30e5c213b5594b1f585d477e92505452
[svn] getting closer

diff -r f013913a30e5 -r 31a41ed0ff71 Input/aac/src/Makefile.am
--- a/Input/aac/src/Makefile.am	Mon Oct 24 11:00:33 2005 -0700
+++ b/Input/aac/src/Makefile.am	Mon Oct 24 11:07:02 2005 -0700
@@ -1,6 +1,9 @@
-libdir = `xmms-config --input-plugin-dir`
-lib_LTLIBRARIES = libmp4.la
-libmp4_la_CFLAGS = -I$(top_srcdir)/libmp4v2 -I$(top_srcdir)/include `xmms-config --cflags` -DHAVE_GLIB_H=1
-libmp4_la_LDFLAGS = -module -avoid-version `xmms-config --libs` -lpthread -lstdc++
-libmp4_la_LIBADD = $(top_builddir)/libfaad2/libfaad.la $(top_builddir)/libmp4v2/libmp4v2.la
-libmp4_la_SOURCES = libmp4.c mp4_utils.c aac_utils.c
+lib_LTLIBRARIES = libaac.la
+
+libdir = $(plugindir)/$(INPUT_PLUGIN_DIR)
+
+libaac_la_LDFLAGS = $(PLUGIN_LDFLAGS)
+
+libaac_la_SOURCES = aac_utils.c libmp4.c mp4_utils.c
+
+INCLUDES = $(GTK_CFLAGS) -I$(top_builddir)/intl -I$(top_srcdir) -I../libmp4v2 -I../libfaad
diff -r f013913a30e5 -r 31a41ed0ff71 configure
--- a/configure	Mon Oct 24 11:00:33 2005 -0700
+++ b/configure	Mon Oct 24 11:07:02 2005 -0700
@@ -28907,7 +28907,7 @@
 
 
 
-                                                                                                                                                                                                                                                                              ac_config_files="$ac_config_files Makefile audacious.1 audacious.spec audacious.pc audacious/audacious.desktop audacious/Makefile audacious/glade/Makefile audacious/images/Makefile libaudacious/Makefile Output/Makefile Output/OSS/Makefile Output/esd/Makefile Output/alsa/Makefile Input/Makefile Input/mpg123/Makefile Input/aac/Makefile Input/aac/libmp4v2/Makefile Input/aac/libfaad2/Makefile Input/vorbis/Makefile Input/cdaudio/Makefile Input/wav/Makefile Visualization/Makefile Visualization/blur_scope/Makefile po/Makefile.in intl/Makefile icons/Makefile skin/Makefile"
+                                                                                                                                                                                                                                                                                        ac_config_files="$ac_config_files Makefile audacious.1 audacious.spec audacious.pc audacious/audacious.desktop audacious/Makefile audacious/glade/Makefile audacious/images/Makefile libaudacious/Makefile Output/Makefile Output/OSS/Makefile Output/esd/Makefile Output/alsa/Makefile Input/Makefile Input/mpg123/Makefile Input/aac/Makefile Input/aac/libmp4v2/Makefile Input/aac/libfaad2/Makefile Input/aac/src/Makefile Input/vorbis/Makefile Input/cdaudio/Makefile Input/wav/Makefile Visualization/Makefile Visualization/blur_scope/Makefile po/Makefile.in intl/Makefile icons/Makefile skin/Makefile"
 
 
 cat >confcache <<\_ACEOF
@@ -29596,6 +29596,7 @@
   "Input/aac/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/aac/Makefile" ;;
   "Input/aac/libmp4v2/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/aac/libmp4v2/Makefile" ;;
   "Input/aac/libfaad2/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/aac/libfaad2/Makefile" ;;
+  "Input/aac/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/aac/src/Makefile" ;;
   "Input/vorbis/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/vorbis/Makefile" ;;
   "Input/cdaudio/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/cdaudio/Makefile" ;;
   "Input/wav/Makefile" ) CONFIG_FILES="$CONFIG_FILES Input/wav/Makefile" ;;
diff -r f013913a30e5 -r 31a41ed0ff71 configure.ac
--- a/configure.ac	Mon Oct 24 11:00:33 2005 -0700
+++ b/configure.ac	Mon Oct 24 11:07:02 2005 -0700
@@ -601,6 +601,7 @@
 	Input/aac/Makefile
 	Input/aac/libmp4v2/Makefile
 	Input/aac/libfaad2/Makefile
+	Input/aac/src/Makefile
         Input/vorbis/Makefile
         Input/cdaudio/Makefile
         Input/wav/Makefile