From: <suc...@us...> - 2006-06-06 19:36:56
|
Revision: 52 Author: sucknblow Date: 2006-06-06 10:43:27 -0700 (Tue, 06 Jun 2006) ViewCVS: http://svn.sourceforge.net/pmplib/?rev=52&view=rev Log Message: ----------- Add 'pmp' prefix to shared libraries that install to /usr/lib (except to libpmp.so itself) - reducing chances of conflicts with other packages. Modified Paths: -------------- trunk/debian/easypmp.install trunk/frontend/easypmp/cui/Makefile.am trunk/lib/filepath/Makefile.am trunk/lib/gmi/Makefile.am trunk/lib/playlist/Makefile.am trunk/lib/pmp/Makefile.am trunk/lib/pmp_iriverplus2/Makefile.am trunk/lib/pmp_irivnavi/Makefile.am trunk/lib/pmp_portalplayer1/Makefile.am trunk/lib/ucs2/Makefile.am Modified: trunk/debian/easypmp.install =================================================================== --- trunk/debian/easypmp.install 2006-06-06 00:35:56 UTC (rev 51) +++ trunk/debian/easypmp.install 2006-06-06 17:43:27 UTC (rev 52) @@ -1,8 +1,4 @@ -debian/tmp/usr/lib/libucs2.so.* -debian/tmp/usr/lib/libfilepath.so.* -debian/tmp/usr/lib/libgmi.so.* -debian/tmp/usr/lib/libplaylist.so.* -debian/tmp/usr/lib/libpmp.so.* +debian/tmp/usr/lib/libpmp*.so.* debian/tmp/usr/lib/pmplib/*.so debian/tmp/usr/lib/pmplib/*.la debian/tmp/usr/bin/easypmp Modified: trunk/frontend/easypmp/cui/Makefile.am =================================================================== --- trunk/frontend/easypmp/cui/Makefile.am 2006-06-06 00:35:56 UTC (rev 51) +++ trunk/frontend/easypmp/cui/Makefile.am 2006-06-06 17:43:27 UTC (rev 52) @@ -26,8 +26,8 @@ easypmp_CFLAGS = -DPMP_JSPL_DIR="\"$(prefix)/share/@PACKAGE@/jspl\"" easypmp_LDADD = \ - $(top_builddir)/lib/ucs2/libucs2.la \ - $(top_builddir)/lib/filepath/libfilepath.la \ - $(top_builddir)/lib/gmi/libgmi.la \ - $(top_builddir)/lib/playlist/libplaylist.la \ + $(top_builddir)/lib/ucs2/libpmpucs2.la \ + $(top_builddir)/lib/filepath/libpmpfilepath.la \ + $(top_builddir)/lib/gmi/libpmpgmi.la \ + $(top_builddir)/lib/playlist/libpmpplaylist.la \ $(top_builddir)/lib/pmp/libpmp.la Modified: trunk/lib/filepath/Makefile.am =================================================================== --- trunk/lib/filepath/Makefile.am 2006-06-06 00:35:56 UTC (rev 51) +++ trunk/lib/filepath/Makefile.am 2006-06-06 17:43:27 UTC (rev 52) @@ -1,14 +1,14 @@ # $Id$ -lib_LTLIBRARIES = libfilepath.la +lib_LTLIBRARIES = libpmpfilepath.la -libfilepath_la_SOURCES = \ +libpmpfilepath_la_SOURCES = \ ../../include/filepath.h \ filepath_posix.c \ rel2abs.c -libfilepath_la_LDFLAGS = \ - $(top_builddir)/lib/ucs2/libucs2.la \ +libpmpfilepath_la_LDFLAGS = \ + $(top_builddir)/lib/ucs2/libpmpucs2.la \ -no-undefined AM_CFLAGS = @CFLAGS@ Modified: trunk/lib/gmi/Makefile.am =================================================================== --- trunk/lib/gmi/Makefile.am 2006-06-06 00:35:56 UTC (rev 51) +++ trunk/lib/gmi/Makefile.am 2006-06-06 17:43:27 UTC (rev 52) @@ -1,8 +1,8 @@ # $Id$ -lib_LTLIBRARIES = libgmi.la +lib_LTLIBRARIES = libpmpgmi.la -libgmi_la_SOURCES = \ +libpmpgmi_la_SOURCES = \ ../../include/gmi.h \ gmi_mp3.c \ gmi_wma.c \ @@ -10,10 +10,10 @@ gmi_vorbis.c \ gmi.c -libgmi_la_LDFLAGS = \ +libpmpgmi_la_LDFLAGS = \ @ID3TAG_LIBS@ @OGG_LIBS@ @VORBIS_LIBS@ @VORBISFILE_LIBS@ \ - $(top_builddir)/lib/ucs2/libucs2.la \ - $(top_builddir)/lib/filepath/libfilepath.la \ + $(top_builddir)/lib/ucs2/libpmpucs2.la \ + $(top_builddir)/lib/filepath/libpmpfilepath.la \ -no-undefined AM_CFLAGS = @CFLAGS@ Modified: trunk/lib/playlist/Makefile.am =================================================================== --- trunk/lib/playlist/Makefile.am 2006-06-06 00:35:56 UTC (rev 51) +++ trunk/lib/playlist/Makefile.am 2006-06-06 17:43:27 UTC (rev 52) @@ -7,23 +7,23 @@ jspl/artists.jspl \ jspl/top_ranking.jspl -lib_LTLIBRARIES = libplaylist.la +lib_LTLIBRARIES = libpmpplaylist.la -libplaylist_la_SOURCES = \ +libpmpplaylist_la_SOURCES = \ ../../include/playlist.h \ rw_m3u.c \ rw_pls.c \ playlist.c \ jspl.c -libplaylist_la_CPPFLAGS = $(JS_CFLAGS) +libpmpplaylist_la_CPPFLAGS = $(JS_CFLAGS) -libplaylist_la_LDFLAGS = \ +libpmpplaylist_la_LDFLAGS = \ -no-undefined -libplaylist_la_LIBADD = \ - $(top_builddir)/lib/ucs2/libucs2.la \ - $(top_builddir)/lib/filepath/libfilepath.la \ +libpmpplaylist_la_LIBADD = \ + $(top_builddir)/lib/ucs2/libpmpucs2.la \ + $(top_builddir)/lib/filepath/libpmpfilepath.la \ $(JS_LIBS) EXTRA_DIST = \ Modified: trunk/lib/pmp/Makefile.am =================================================================== --- trunk/lib/pmp/Makefile.am 2006-06-06 00:35:56 UTC (rev 51) +++ trunk/lib/pmp/Makefile.am 2006-06-06 17:43:27 UTC (rev 52) @@ -14,8 +14,8 @@ -no-undefined libpmp_la_LIBADD = \ - $(top_builddir)/lib/ucs2/libucs2.la \ - $(top_builddir)/lib/filepath/libfilepath.la \ + $(top_builddir)/lib/ucs2/libpmpucs2.la \ + $(top_builddir)/lib/filepath/libpmpfilepath.la \ $(LIBLTDL) EXTRA_DIST = pmp_plugin.sym Modified: trunk/lib/pmp_iriverplus2/Makefile.am =================================================================== --- trunk/lib/pmp_iriverplus2/Makefile.am 2006-06-06 00:35:56 UTC (rev 51) +++ trunk/lib/pmp_iriverplus2/Makefile.am 2006-06-06 17:43:27 UTC (rev 52) @@ -28,8 +28,8 @@ -export-symbols $(top_srcdir)/lib/pmp/pmp_plugin.sym iriverplus2_la_LIBADD = \ - $(top_builddir)/lib/ucs2/libucs2.la \ - $(top_builddir)/lib/filepath/libfilepath.la \ + $(top_builddir)/lib/ucs2/libpmpucs2.la \ + $(top_builddir)/lib/filepath/libpmpfilepath.la \ $(top_builddir)/lib/pmp/libpmp.la AM_CFLAGS = @CFLAGS@ Modified: trunk/lib/pmp_irivnavi/Makefile.am =================================================================== --- trunk/lib/pmp_irivnavi/Makefile.am 2006-06-06 00:35:56 UTC (rev 51) +++ trunk/lib/pmp_irivnavi/Makefile.am 2006-06-06 17:43:27 UTC (rev 52) @@ -18,8 +18,8 @@ -export-symbols $(top_srcdir)/lib/pmp/pmp_plugin.sym irivnavi_la_LIBADD = \ - $(top_builddir)/lib/ucs2/libucs2.la \ - $(top_builddir)/lib/filepath/libfilepath.la \ + $(top_builddir)/lib/ucs2/libpmpucs2.la \ + $(top_builddir)/lib/filepath/libpmpfilepath.la \ $(top_builddir)/lib/pmp/libpmp.la AM_CFLAGS = @CFLAGS@ Modified: trunk/lib/pmp_portalplayer1/Makefile.am =================================================================== --- trunk/lib/pmp_portalplayer1/Makefile.am 2006-06-06 00:35:56 UTC (rev 51) +++ trunk/lib/pmp_portalplayer1/Makefile.am 2006-06-06 17:43:27 UTC (rev 52) @@ -32,8 +32,8 @@ -export-symbols $(top_srcdir)/lib/pmp/pmp_plugin.sym portalplayer1_la_LIBADD = \ - $(top_builddir)/lib/ucs2/libucs2.la \ - $(top_builddir)/lib/filepath/libfilepath.la \ + $(top_builddir)/lib/ucs2/libpmpucs2.la \ + $(top_builddir)/lib/filepath/libpmpfilepath.la \ $(top_builddir)/lib/pmp/libpmp.la AM_CFLAGS = @CFLAGS@ Modified: trunk/lib/ucs2/Makefile.am =================================================================== --- trunk/lib/ucs2/Makefile.am 2006-06-06 00:35:56 UTC (rev 51) +++ trunk/lib/ucs2/Makefile.am 2006-06-06 17:43:27 UTC (rev 52) @@ -1,13 +1,13 @@ # $Id$ -lib_LTLIBRARIES = libucs2.la +lib_LTLIBRARIES = libpmpucs2.la -libucs2_la_SOURCES = \ +libpmpucs2_la_SOURCES = \ ../../include/ucs2char.h \ ucs2char.c \ ucs2char_iconv.c -libucs2_la_LDFLAGS = @ICONV_LIBS@ -no-undefined +libpmpucs2_la_LDFLAGS = @ICONV_LIBS@ -no-undefined AM_CFLAGS = @CFLAGS@ INCLUDES = @INCLUDES@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |