1 files changed, 8 insertions(+), 4 deletions(-)

M plugins/xmms/src/Makefile.am

@@ 1,9 1,13 @@
-libdir = `xmms-config --input-plugin-dir`
+libdir = `$(XMMS_CONFIG) --input-plugin-dir`
 lib_LTLIBRARIES = libmp4.la
 
-INCLUDES = -I../../../common/mp4v2 -DHAVE_GLIB_H=1 -I../../../
+libmp4_la_CFLAGS = `$(XMMS_CONFIG) --cflags` -Wall \
+       `$(GTK_CONFIG) --cflags` -DHAVE_GLIB_H=1 \
+       -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4v2
 
-libmp4_la_CFLAGS = `xmms-config --cflags` -Wall -I$(top_srcdir)/include
+libmp4_la_LIBADD = $(top_builddir)/libfaad/libfaad.la \
+       $(top_builddir)/common/mp4v2/libmp4v2.la
 
-libmp4_la_LDFLAGS = -module -avoid-version `xmms-config --libs` -lfaad -lpthread -lstdc++ -lmp4v2
+libmp4_la_LDFLAGS = -module -avoid-version `$(XMMS_CONFIG) --libs` \
+       `$(GTK_CONFIG) --libs` -lpthread -lstdc++
 libmp4_la_SOURCES = libmp4.c mp4_utils.c aac_utils.c