31 files changed, 10 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index 4b012a868..7da2f8a21 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1117,6 +1117,7 @@ contrib/Makefile
 contrib/libdca/Makefile
 contrib/libmpcdec/Makefile
 contrib/libxdg-basedir/Makefile
+contrib/nosefart/Makefile
 include/Makefile
 include/xine.h
 lib/Makefile
@@ -1168,7 +1169,6 @@ src/libw32dll/qtx/qtxsdk/Makefile
 src/libxinevdec/Makefile
 src/libxineadec/Makefile
 src/libxineadec/gsm610/Makefile
-src/libxineadec/nosefart/Makefile
 src/libreal/Makefile
 src/post/Makefile
 src/post/planar/Makefile
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 6e019ba62..bb86eb480 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = libmpcdec libxdg-basedir libdca
+SUBDIRS = libmpcdec libxdg-basedir libdca nosefart
 
 srcdir = $(shell cd @srcdir@; pwd)
 
diff --git a/src/libxineadec/nosefart/Makefile.am b/contrib/nosefart/Makefile.am
index 83c04a28d..83c04a28d 100644
--- a/src/libxineadec/nosefart/Makefile.am
+++ b/contrib/nosefart/Makefile.am
diff --git a/src/libxineadec/nosefart/diff_to_nosefart_cvs.patch b/contrib/nosefart/diff_to_nosefart_cvs.patch
index 2b6202fb8..2b6202fb8 100644
--- a/src/libxineadec/nosefart/diff_to_nosefart_cvs.patch
+++ b/contrib/nosefart/diff_to_nosefart_cvs.patch
diff --git a/src/libxineadec/nosefart/dis6502.c b/contrib/nosefart/dis6502.c
index ff552d219..ff552d219 100644
--- a/src/libxineadec/nosefart/dis6502.c
+++ b/contrib/nosefart/dis6502.c
diff --git a/src/libxineadec/nosefart/dis6502.h b/contrib/nosefart/dis6502.h
index a02fd73ae..a02fd73ae 100644
--- a/src/libxineadec/nosefart/dis6502.h
+++ b/contrib/nosefart/dis6502.h
diff --git a/src/libxineadec/nosefart/fds_snd.c b/contrib/nosefart/fds_snd.c
index fe2e4d624..fe2e4d624 100644
--- a/src/libxineadec/nosefart/fds_snd.c
+++ b/contrib/nosefart/fds_snd.c
diff --git a/src/libxineadec/nosefart/fds_snd.h b/contrib/nosefart/fds_snd.h
index 9d20b5b2a..9d20b5b2a 100644
--- a/src/libxineadec/nosefart/fds_snd.h
+++ b/contrib/nosefart/fds_snd.h
diff --git a/src/libxineadec/nosefart/fmopl.c b/contrib/nosefart/fmopl.c
index 29c884096..29c884096 100644
--- a/src/libxineadec/nosefart/fmopl.c
+++ b/contrib/nosefart/fmopl.c
diff --git a/src/libxineadec/nosefart/fmopl.h b/contrib/nosefart/fmopl.h
index 92a2859d7..92a2859d7 100644
--- a/src/libxineadec/nosefart/fmopl.h
+++ b/contrib/nosefart/fmopl.h
diff --git a/src/libxineadec/nosefart/log.c b/contrib/nosefart/log.c
index 8935a596e..8935a596e 100644
--- a/src/libxineadec/nosefart/log.c
+++ b/contrib/nosefart/log.c
diff --git a/src/libxineadec/nosefart/log.h b/contrib/nosefart/log.h
index a12deff0a..a12deff0a 100644
--- a/src/libxineadec/nosefart/log.h
+++ b/contrib/nosefart/log.h
diff --git a/src/libxineadec/nosefart/memguard.c b/contrib/nosefart/memguard.c
index 35b3ef6ba..35b3ef6ba 100644
--- a/src/libxineadec/nosefart/memguard.c
+++ b/contrib/nosefart/memguard.c
diff --git a/src/libxineadec/nosefart/memguard.h b/contrib/nosefart/memguard.h
index d80d6fb7c..d80d6fb7c 100644
--- a/src/libxineadec/nosefart/memguard.h
+++ b/contrib/nosefart/memguard.h
diff --git a/src/libxineadec/nosefart/mmc5_snd.c b/contrib/nosefart/mmc5_snd.c
index 7269fa967..7269fa967 100644
--- a/src/libxineadec/nosefart/mmc5_snd.c
+++ b/contrib/nosefart/mmc5_snd.c
diff --git a/src/libxineadec/nosefart/mmc5_snd.h b/contrib/nosefart/mmc5_snd.h
index 256cc2285..256cc2285 100644
--- a/src/libxineadec/nosefart/mmc5_snd.h
+++ b/contrib/nosefart/mmc5_snd.h
diff --git a/src/libxineadec/nosefart/nes6502.c b/contrib/nosefart/nes6502.c
index f1ca80af4..f1ca80af4 100644
--- a/src/libxineadec/nosefart/nes6502.c
+++ b/contrib/nosefart/nes6502.c
diff --git a/src/libxineadec/nosefart/nes6502.h b/contrib/nosefart/nes6502.h
index 9b9be5811..9b9be5811 100644
--- a/src/libxineadec/nosefart/nes6502.h
+++ b/contrib/nosefart/nes6502.h
diff --git a/src/libxineadec/nosefart/nes_apu.c b/contrib/nosefart/nes_apu.c
index 4a2ed8f4d..4a2ed8f4d 100644
--- a/src/libxineadec/nosefart/nes_apu.c
+++ b/contrib/nosefart/nes_apu.c
diff --git a/src/libxineadec/nosefart/nes_apu.h b/contrib/nosefart/nes_apu.h
index 09b5842d9..09b5842d9 100644
--- a/src/libxineadec/nosefart/nes_apu.h
+++ b/contrib/nosefart/nes_apu.h
diff --git a/src/libxineadec/nosefart/nsf.c b/contrib/nosefart/nsf.c
index 6bbc96423..6bbc96423 100644
--- a/src/libxineadec/nosefart/nsf.c
+++ b/contrib/nosefart/nsf.c
diff --git a/src/libxineadec/nosefart/nsf.h b/contrib/nosefart/nsf.h
index 79ec1dbb6..79ec1dbb6 100644
--- a/src/libxineadec/nosefart/nsf.h
+++ b/contrib/nosefart/nsf.h
diff --git a/src/libxineadec/nosefart/osd.h b/contrib/nosefart/osd.h
index 38b9480c7..38b9480c7 100644
--- a/src/libxineadec/nosefart/osd.h
+++ b/contrib/nosefart/osd.h
diff --git a/src/libxineadec/nosefart/types.h b/contrib/nosefart/types.h
index 01f196035..01f196035 100644
--- a/src/libxineadec/nosefart/types.h
+++ b/contrib/nosefart/types.h
diff --git a/src/libxineadec/nosefart/version.h b/contrib/nosefart/version.h
index d7dcb2e5d..d7dcb2e5d 100644
--- a/src/libxineadec/nosefart/version.h
+++ b/contrib/nosefart/version.h
diff --git a/src/libxineadec/nosefart/vrc7_snd.c b/contrib/nosefart/vrc7_snd.c
index 42cff0103..42cff0103 100644
--- a/src/libxineadec/nosefart/vrc7_snd.c
+++ b/contrib/nosefart/vrc7_snd.c
diff --git a/src/libxineadec/nosefart/vrc7_snd.h b/contrib/nosefart/vrc7_snd.h
index fd3880b63..fd3880b63 100644
--- a/src/libxineadec/nosefart/vrc7_snd.h
+++ b/contrib/nosefart/vrc7_snd.h
diff --git a/src/libxineadec/nosefart/vrcvisnd.c b/contrib/nosefart/vrcvisnd.c
index b1f26fe52..b1f26fe52 100644
--- a/src/libxineadec/nosefart/vrcvisnd.c
+++ b/contrib/nosefart/vrcvisnd.c
diff --git a/src/libxineadec/nosefart/vrcvisnd.h b/contrib/nosefart/vrcvisnd.h
index 7666fec0c..7666fec0c 100644
--- a/src/libxineadec/nosefart/vrcvisnd.h
+++ b/contrib/nosefart/vrcvisnd.h
diff --git a/src/libxineadec/Makefile.am b/src/libxineadec/Makefile.am
index 474dda1a1..6ea2171ee 100644
--- a/src/libxineadec/Makefile.am
+++ b/src/libxineadec/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/misc/Makefile.common
 AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
 AM_LDFLAGS = $(xineplug_ldflags)
 
-SUBDIRS = gsm610 nosefart
+SUBDIRS = gsm610
 
 EXTRA_DIST = fooaudio.c
 
@@ -29,6 +29,9 @@ $(top_builddir)/contrib/libmpcdec/libmpcdec.la:
 $(top_builddir)/contrib/libdca/libdca.la:
 	$(MAKE) -C $(top_builddir)/contrib/libdca
 
+$(top_builddir)/contrib/nosefart/libnosefart.la:
+	$(MAKE) -C $(top_builddir)/contrib/nosefart
+
 xineplug_LTLIBRARIES = \
 	xineplug_decode_gsm610.la \
 	xineplug_decode_nsf.la \
@@ -42,9 +45,9 @@ xineplug_decode_gsm610_la_SOURCES = gsm610.c
 xineplug_decode_gsm610_la_LIBADD = $(XINE_LIB) gsm610/libgsm610.la
 
 xineplug_decode_nsf_la_SOURCES = nsf.c
-xineplug_decode_nsf_la_LIBADD = $(XINE_LIB) -lm nosefart/libnosefart.la
+xineplug_decode_nsf_la_LIBADD = $(XINE_LIB) $(top_builddir)/contrib/nosefart/libnosefart.la -lm
 xineplug_decode_nsf_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing
-xineplug_decode_nsf_la_CPPFLAGS = $(AM_CPPFLAGS) -DNSF_PLAYER
+xineplug_decode_nsf_la_CPPFLAGS = $(AM_CPPFLAGS) -DNSF_PLAYER -I$(top_srcdir)/contrib/nosefart
 
 xineplug_decode_lpcm_la_SOURCES = xine_lpcm_decoder.c
 xineplug_decode_lpcm_la_LIBADD = $(XINE_LIB)
diff --git a/src/libxineadec/nsf.c b/src/libxineadec/nsf.c
index e646ca873..4af6fe878 100644
--- a/src/libxineadec/nsf.c
+++ b/src/libxineadec/nsf.c
@@ -36,8 +36,8 @@
 #include "bswap.h"
 
 /* Nosefart includes */
-#include "nosefart/types.h"
-#include "nosefart/nsf.h"
+#include "types.h"
+#include "nsf.h"
 
 typedef struct {
   audio_decoder_class_t   decoder_class;