[mb-devel] Patch for VPATH build of TunePimp

Nigel Graham nigel at maven-group.org
Fri Aug 31 21:33:37 UTC 2007


When I was playing with making a Universal build of tunepimp I wanted to 
do a vpath build.
But this feature doesn't work with the current build files.

So I have made this small patch that shouldn't affect normal builds but 
fix the vpath feature.

Regards
 - Nigel
-------------- next part --------------
Index: plugins/mp3/Makefile.am
===================================================================
--- plugins/mp3/Makefile.am	(revision 9416)
+++ plugins/mp3/Makefile.am	(working copy)
@@ -34,11 +34,11 @@
 noinst_HEADERS = mp3decode.h id3_meta.h mp3info.h id3_2_3_meta.h mp3.h
 
 all:
-	mkdir -p $(top_srcdir)/examples/plugins
-	rm -f $(top_srcdir)/examples/plugins/mp3.tpp
-	ln -s ../../plugins/mp3/.libs/mp3.so $(top_srcdir)/examples/plugins/mp3.tpp
+	mkdir -p $(top_builddir)/examples/plugins
+	rm -f $(top_builddir)/examples/plugins/mp3.tpp
+	ln -s ../../plugins/mp3/.libs/mp3.so $(top_builddir)/examples/plugins/mp3.tpp
 
 install-exec-am:
 
 clean distclean:
-	rm -f $(top_srcdir)/examples/plugins/mp3.tpp
+	rm -f $(top_builddir)/examples/plugins/mp3.tpp
Index: plugins/mpc/Makefile.am
===================================================================
--- plugins/mpc/Makefile.am	(revision 9416)
+++ plugins/mpc/Makefile.am	(working copy)
@@ -39,11 +39,11 @@
 endif
 
 all:
-	mkdir -p $(top_srcdir)/examples/plugins
-	rm -f $(top_srcdir)/examples/plugins/mpc.tpp
-	ln -s ../../plugins/mpc/.libs/mpc.so $(top_srcdir)/examples/plugins/mpc.tpp
+	mkdir -p $(top_builddir)/examples/plugins
+	rm -f $(top_builddir)/examples/plugins/mpc.tpp
+	ln -s ../../plugins/mpc/.libs/mpc.so $(top_builddir)/examples/plugins/mpc.tpp
 
 install-exec-am:
 
 clean distclean:
-	rm -f $(top_srcdir)/examples/plugins/mpc.tpp
+	rm -f $(top_builddir)/examples/plugins/mpc.tpp
Index: plugins/mp4/Makefile.am
===================================================================
--- plugins/mp4/Makefile.am	(revision 9416)
+++ plugins/mp4/Makefile.am	(working copy)
@@ -30,11 +30,11 @@
 mp4_la_LIBADD = ../../lib/utf8/libutf8.la ../../lib/libpluginsupport.la -lmp4v2 -lmusicbrainz
 
 all:
-	mkdir -p $(top_srcdir)/examples/plugins
-	rm -f $(top_srcdir)/examples/plugins/mp4.tpp
-	ln -s ../../plugins/mp4/.libs/mp4.so $(top_srcdir)/examples/plugins/mp4.tpp
+	mkdir -p $(top_builddir)/examples/plugins
+	rm -f $(top_builddir)/examples/plugins/mp4.tpp
+	ln -s ../../plugins/mp4/.libs/mp4.so $(top_builddir)/examples/plugins/mp4.tpp
 
 install-exec-am:
 
 clean distclean:
-	rm -f $(top_srcdir)/examples/plugins/mp4.tpp
+	rm -f $(top_builddir)/examples/plugins/mp4.tpp
Index: plugins/speex/Makefile.am
===================================================================
--- plugins/speex/Makefile.am	(revision 9416)
+++ plugins/speex/Makefile.am	(working copy)
@@ -31,11 +31,11 @@
 speex_la_LIBADD = ../../lib/utf8/libutf8.la ../../lib/libpluginsupport.la $(TAGLIB_LIBS) -lmusicbrainz
 
 all:
-	mkdir -p $(top_srcdir)/examples/plugins
-	rm -f $(top_srcdir)/examples/plugins/speex.tpp
-	ln -s ../../plugins/speex/.libs/speex.so $(top_srcdir)/examples/plugins/speex.tpp
+	mkdir -p $(top_builddir)/examples/plugins
+	rm -f $(top_builddir)/examples/plugins/speex.tpp
+	ln -s ../../plugins/speex/.libs/speex.so $(top_builddir)/examples/plugins/speex.tpp
 
 install-exec-am:
 
 clean distclean:
-	rm -f $(top_srcdir)/examples/plugins/speex.tpp
+	rm -f $(top_builddir)/examples/plugins/speex.tpp
Index: plugins/vorbis/Makefile.am
===================================================================
--- plugins/vorbis/Makefile.am	(revision 9416)
+++ plugins/vorbis/Makefile.am	(working copy)
@@ -33,11 +33,11 @@
 noinst_HEADERS = vcedit.h vorbis_meta.h
 
 all:
-	mkdir -p $(top_srcdir)/examples/plugins
-	rm -f $(top_srcdir)/examples/plugins/vorbis.tpp
-	ln -s ../../plugins/vorbis/.libs/vorbis.so $(top_srcdir)/examples/plugins/vorbis.tpp
+	mkdir -p $(top_builddir)/examples/plugins
+	rm -f $(top_builddir)/examples/plugins/vorbis.tpp
+	ln -s ../../plugins/vorbis/.libs/vorbis.so $(top_builddir)/examples/plugins/vorbis.tpp
 
 install-exec-am:
 
 clean distclean:
-	rm -f $(top_srcdir)/examples/plugins/vorbis.tpp
+	rm -f $(top_builddir)/examples/plugins/vorbis.tpp
Index: plugins/wma/Makefile.am
===================================================================
--- plugins/wma/Makefile.am	(revision 9416)
+++ plugins/wma/Makefile.am	(working copy)
@@ -32,11 +32,11 @@
 wma_la_LIBADD = ../../lib/utf8/libutf8.la ../../lib/libpluginsupport.la $(TAGLIB_LIBS) -lmusicbrainz
 
 all:
-	mkdir -p $(top_srcdir)/examples/plugins
-	rm -f $(top_srcdir)/examples/plugins/wma.tpp
-	ln -s ../../plugins/wma/.libs/wma.so $(top_srcdir)/examples/plugins/wma.tpp
+	mkdir -p $(top_builddir)/examples/plugins
+	rm -f $(top_builddir)/examples/plugins/wma.tpp
+	ln -s ../../plugins/wma/.libs/wma.so $(top_builddir)/examples/plugins/wma.tpp
 
 install-exec-am:
 
 clean distclean:
-	rm -f $(top_srcdir)/examples/plugins/wma.tpp
+	rm -f $(top_builddir)/examples/plugins/wma.tpp
Index: plugins/flac/Makefile.am
===================================================================
--- plugins/flac/Makefile.am	(revision 9416)
+++ plugins/flac/Makefile.am	(working copy)
@@ -30,11 +30,11 @@
 flac_la_LIBADD = ../../lib/utf8/libutf8.la ../../lib/libpluginsupport.la -lFLAC -lmusicbrainz
 
 all:
-	mkdir -p $(top_srcdir)/examples/plugins
-	rm -f $(top_srcdir)/examples/plugins/flac.tpp
-	ln -s ../../plugins/flac/.libs/flac.so $(top_srcdir)/examples/plugins/flac.tpp
+	mkdir -p $(top_builddir)/examples/plugins
+	rm -f $(top_builddir)/examples/plugins/flac.tpp
+	ln -s ../../plugins/flac/.libs/flac.so $(top_builddir)/examples/plugins/flac.tpp
 
 install-exec-am:
 
 clean distclean:
-	rm -f $(top_srcdir)/examples/plugins/flac.tpp
+	rm -f $(top_builddir)/examples/plugins/flac.tpp
Index: plugins/tta/Makefile.am
===================================================================
--- plugins/tta/Makefile.am	(revision 9416)
+++ plugins/tta/Makefile.am	(working copy)
@@ -31,11 +31,11 @@
 tta_la_LIBADD = ../../lib/utf8/libutf8.la ../../lib/libpluginsupport.la $(TAGLIB_LIBS) -lmusicbrainz
 
 all:
-	mkdir -p $(top_srcdir)/examples/plugins
-	rm -f $(top_srcdir)/examples/plugins/tta.tpp
-	ln -s ../../plugins/tta/.libs/tta.so $(top_srcdir)/examples/plugins/tta.tpp
+	mkdir -p $(top_builddir)/examples/plugins
+	rm -f $(top_builddir)/examples/plugins/tta.tpp
+	ln -s ../../plugins/tta/.libs/tta.so $(top_builddir)/examples/plugins/tta.tpp
 
 install-exec-am:
 
 clean distclean:
-	rm -f $(top_srcdir)/examples/plugins/tta.tpp
+	rm -f $(top_builddir)/examples/plugins/tta.tpp
Index: plugins/wv/Makefile.am
===================================================================
--- plugins/wv/Makefile.am	(revision 9416)
+++ plugins/wv/Makefile.am	(working copy)
@@ -31,11 +31,11 @@
 wv_la_LIBADD = ../../lib/utf8/libutf8.la ../../lib/libpluginsupport.la $(TAGLIB_LIBS) -lmusicbrainz
 
 all:
-	mkdir -p $(top_srcdir)/examples/plugins
-	rm -f $(top_srcdir)/examples/plugins/wv.tpp
-	ln -s ../../plugins/wv/.libs/wv.so $(top_srcdir)/examples/plugins/wv.tpp
+	mkdir -p $(top_builddir)/examples/plugins
+	rm -f $(top_builddir)/examples/plugins/wv.tpp
+	ln -s ../../plugins/wv/.libs/wv.so $(top_builddir)/examples/plugins/wv.tpp
 
 install-exec-am:
 
 clean distclean:
-	rm -f $(top_srcdir)/examples/plugins/wv.tpp
+	rm -f $(top_builddir)/examples/plugins/wv.tpp
Index: plugins/wav/Makefile.am
===================================================================
--- plugins/wav/Makefile.am	(revision 9416)
+++ plugins/wav/Makefile.am	(working copy)
@@ -30,11 +30,11 @@
 wav_la_LIBADD = ../../lib/utf8/libutf8.la ../../lib/libpluginsupport.la -lmusicbrainz
 
 all:
-	mkdir -p $(top_srcdir)/examples/plugins
-	rm -f $(top_srcdir)/examples/plugins/wav.tpp
-	ln -s ../../plugins/wav/.libs/wav.so $(top_srcdir)/examples/plugins/wav.tpp
+	mkdir -p $(top_builddir)/examples/plugins
+	rm -f $(top_builddir)/examples/plugins/wav.tpp
+	ln -s ../../plugins/wav/.libs/wav.so $(top_builddir)/examples/plugins/wav.tpp
 
 install-exec-am:
 
 clean distclean:
-	rm -f $(top_srcdir)/examples/plugins/wav.tpp
+	rm -f $(top_builddir)/examples/plugins/wav.tpp
Index: lib/Makefile.am
===================================================================
--- lib/Makefile.am	(revision 9416)
+++ lib/Makefile.am	(working copy)
@@ -24,7 +24,7 @@
 
 SUBDIRS = utf8 threads
 
-INCLUDES = -I$(top_srcdir)/include/tunepimp-0.5 -Ithreads/posix
+INCLUDES = -I$(top_srcdir)/include/tunepimp-0.5 -I$(top_srcdir)/lib/threads/posix
 lib_LTLIBRARIES = libtunepimp.la
 
 libtunepimp_la_SOURCES = tunepimp.cpp filecache.cpp analyzer.cpp dirsearch.cpp metadata.cpp astrcmp.c track.cpp write.cpp c_wrapper.cpp watchdog.cpp plugins.cpp readmeta.cpp fileio.cpp protocol.cpp
-------------- next part --------------
A non-text attachment was scrubbed...
Name: nigel.vcf
Type: text/x-vcard
Size: 163 bytes
Desc: not available
Url : http://lists.musicbrainz.org/pipermail/musicbrainz-devel/attachments/20070831/e9409c68/nigel.vcf


More information about the MusicBrainz-devel mailing list