[Pmplib-commits] SF.net SVN: pmplib: [299] trunk/pmplib

[<ny...@us...>]

Revision: 299
          http://svn.sourceforge.net/pmplib/?rev=299&view=rev
Author:   nyaochi
Date:     2007-02-05 21:27:45 -0800 (Mon, 05 Feb 2007)

Log Message:
-----------
Merge libpmpucs2 and libpmpfilepath into libpmp.

Modified Paths:
--------------
    trunk/pmplib/Makefile.am
    trunk/pmplib/configure.in
    trunk/pmplib/frontend/easypmp/cui/Makefile.am
    trunk/pmplib/lib/filepath/Makefile.am
    trunk/pmplib/lib/gmi/Makefile.am
    trunk/pmplib/lib/playlist/Makefile.am
    trunk/pmplib/lib/pmp/Makefile.am
    trunk/pmplib/lib/pmp_iriverplus2/Makefile.am
    trunk/pmplib/lib/pmp_iriverplus3/Makefile.am
    trunk/pmplib/lib/pmp_irivnavi/Makefile.am
    trunk/pmplib/lib/pmp_portalplayer1/Makefile.am
    trunk/pmplib/lib/ucs2/Makefile.am

Modified: trunk/pmplib/Makefile.am
===================================================================
--- trunk/pmplib/Makefile.am	2007-02-06 04:39:09 UTC (rev 298)
+++ trunk/pmplib/Makefile.am	2007-02-06 05:27:45 UTC (rev 299)
@@ -1,6 +1,6 @@
 # $Id$
 
-SUBDIRS = m4 libltdl lib/ucs2 lib/filepath lib/gmi lib/playlist lib/pmp lib/pmp_irivnavi lib/pmp_portalplayer1 lib/pmp_iriverplus2 lib/pmp_iriverplus3 frontend/easypmp/cui
+SUBDIRS = m4 libltdl lib/ucs2 lib/filepath lib/pmp lib/gmi lib/playlist lib/pmp_irivnavi lib/pmp_portalplayer1 lib/pmp_iriverplus2 lib/pmp_iriverplus3 frontend/easypmp/cui
 
 docdir = $(prefix)/share/doc/@PACKAGE@
 doc_DATA = README INSTALL COPYING AUTHORS ChangeLog

Modified: trunk/pmplib/configure.in
===================================================================
--- trunk/pmplib/configure.in	2007-02-06 04:39:09 UTC (rev 298)
+++ trunk/pmplib/configure.in	2007-02-06 05:27:45 UTC (rev 299)
@@ -228,7 +228,7 @@
 dnl ------------------------------------------------------------------
 dnl Output the configure results.
 dnl ------------------------------------------------------------------
-AC_CONFIG_FILES(Makefile m4/Makefile lib/ucs2/Makefile lib/filepath/Makefile lib/gmi/Makefile lib/pmp/Makefile lib/pmp_irivnavi/Makefile lib/pmp_portalplayer1/Makefile lib/pmp_iriverplus2/Makefile lib/pmp_iriverplus3/Makefile lib/playlist/Makefile frontend/easypmp/cui/Makefile)
+AC_CONFIG_FILES(Makefile m4/Makefile lib/ucs2/Makefile lib/filepath/Makefile lib/pmp/Makefile lib/gmi/Makefile lib/pmp_irivnavi/Makefile lib/pmp_portalplayer1/Makefile lib/pmp_iriverplus2/Makefile lib/pmp_iriverplus3/Makefile lib/playlist/Makefile frontend/easypmp/cui/Makefile)
 
 if test -n "$JS_CFLAGS" ; then
   AC_DEFINE([HAVE_JSAPI_H], 1, [Define if you have the jsapi.h header])

Modified: trunk/pmplib/frontend/easypmp/cui/Makefile.am
===================================================================
--- trunk/pmplib/frontend/easypmp/cui/Makefile.am	2007-02-06 04:39:09 UTC (rev 298)
+++ trunk/pmplib/frontend/easypmp/cui/Makefile.am	2007-02-06 05:27:45 UTC (rev 299)
@@ -33,8 +33,6 @@
 easypmp_CFLAGS = -DPMP_JSPL_DIR="\"$(prefix)/share/@PACKAGE@/jspl\""
 
 easypmp_LDADD = \
-	$(top_builddir)/lib/ucs2/libpmpucs2.la \
-	$(top_builddir)/lib/filepath/libpmpfilepath.la \
+	$(top_builddir)/lib/pmp/libpmp.la \
 	$(top_builddir)/lib/gmi/libpmpgmi.la \
-	$(top_builddir)/lib/playlist/libpmpplaylist.la \
-	$(top_builddir)/lib/pmp/libpmp.la
+	$(top_builddir)/lib/playlist/libpmpplaylist.la

Modified: trunk/pmplib/lib/filepath/Makefile.am
===================================================================
--- trunk/pmplib/lib/filepath/Makefile.am	2007-02-06 04:39:09 UTC (rev 298)
+++ trunk/pmplib/lib/filepath/Makefile.am	2007-02-06 05:27:45 UTC (rev 299)
@@ -1,16 +1,12 @@
 # $Id$
 
-lib_LTLIBRARIES = libpmpfilepath.la
+noinst_LTLIBRARIES = libfilepath.la
 
-libpmpfilepath_la_SOURCES = \
+libfilepath_la_SOURCES = \
 	../../include/filepath.h \
 	filepath_posix.c \
 	rel2abs.h \
 	rel2abs.c
 
-libpmpfilepath_la_LDFLAGS = \
-	$(top_builddir)/lib/ucs2/libpmpucs2.la \
-	-no-undefined
-
 AM_CFLAGS = @CFLAGS@
 INCLUDES = @INCLUDES@

Modified: trunk/pmplib/lib/gmi/Makefile.am
===================================================================
--- trunk/pmplib/lib/gmi/Makefile.am	2007-02-06 04:39:09 UTC (rev 298)
+++ trunk/pmplib/lib/gmi/Makefile.am	2007-02-06 05:27:45 UTC (rev 299)
@@ -12,8 +12,7 @@
 
 libpmpgmi_la_LDFLAGS = \
 	@ID3TAG_LIBS@ @OGG_LIBS@ @VORBIS_LIBS@ @VORBISFILE_LIBS@ \
-	$(top_builddir)/lib/ucs2/libpmpucs2.la \
-	$(top_builddir)/lib/filepath/libpmpfilepath.la \
+	$(top_builddir)/lib/pmp/libpmp.la \
 	-no-undefined
 
 AM_CFLAGS = @CFLAGS@

Modified: trunk/pmplib/lib/playlist/Makefile.am
===================================================================
--- trunk/pmplib/lib/playlist/Makefile.am	2007-02-06 04:39:09 UTC (rev 298)
+++ trunk/pmplib/lib/playlist/Makefile.am	2007-02-06 05:27:45 UTC (rev 299)
@@ -27,8 +27,7 @@
 	-no-undefined
 
 libpmpplaylist_la_LIBADD = \
-	$(top_builddir)/lib/ucs2/libpmpucs2.la \
-	$(top_builddir)/lib/filepath/libpmpfilepath.la \
+	$(top_builddir)/lib/pmp/libpmp.la \
 	$(JS_LIBS)
 
 EXTRA_DIST = \

Modified: trunk/pmplib/lib/pmp/Makefile.am
===================================================================
--- trunk/pmplib/lib/pmp/Makefile.am	2007-02-06 04:39:09 UTC (rev 298)
+++ trunk/pmplib/lib/pmp/Makefile.am	2007-02-06 05:27:45 UTC (rev 299)
@@ -13,8 +13,8 @@
 	-no-undefined
 
 libpmp_la_LIBADD = \
-	$(top_builddir)/lib/ucs2/libpmpucs2.la \
-	$(top_builddir)/lib/filepath/libpmpfilepath.la \
+	$(top_builddir)/lib/ucs2/libucs2.la \
+	$(top_builddir)/lib/filepath/libfilepath.la \
 	$(LIBLTDL)
 
 EXTRA_DIST = pmp_plugin.sym

Modified: trunk/pmplib/lib/pmp_iriverplus2/Makefile.am
===================================================================
--- trunk/pmplib/lib/pmp_iriverplus2/Makefile.am	2007-02-06 04:39:09 UTC (rev 298)
+++ trunk/pmplib/lib/pmp_iriverplus2/Makefile.am	2007-02-06 05:27:45 UTC (rev 299)
@@ -28,8 +28,6 @@
 	-export-symbols $(top_srcdir)/lib/pmp/pmp_plugin.sym
 
 iriverplus2_la_LIBADD = \
-	$(top_builddir)/lib/ucs2/libpmpucs2.la \
-	$(top_builddir)/lib/filepath/libpmpfilepath.la \
 	$(top_builddir)/lib/pmp/libpmp.la
 
 AM_CFLAGS = @CFLAGS@

Modified: trunk/pmplib/lib/pmp_iriverplus3/Makefile.am
===================================================================
--- trunk/pmplib/lib/pmp_iriverplus3/Makefile.am	2007-02-06 04:39:09 UTC (rev 298)
+++ trunk/pmplib/lib/pmp_iriverplus3/Makefile.am	2007-02-06 05:27:45 UTC (rev 299)
@@ -24,8 +24,6 @@
 	-export-symbols $(top_srcdir)/lib/pmp/pmp_plugin.sym
 
 iriverplus3_la_LIBADD = \
-	$(top_builddir)/lib/ucs2/libpmpucs2.la \
-	$(top_builddir)/lib/filepath/libpmpfilepath.la \
 	$(top_builddir)/lib/pmp/libpmp.la
 
 AM_CFLAGS = @CFLAGS@

Modified: trunk/pmplib/lib/pmp_irivnavi/Makefile.am
===================================================================
--- trunk/pmplib/lib/pmp_irivnavi/Makefile.am	2007-02-06 04:39:09 UTC (rev 298)
+++ trunk/pmplib/lib/pmp_irivnavi/Makefile.am	2007-02-06 05:27:45 UTC (rev 299)
@@ -18,8 +18,6 @@
 	-export-symbols $(top_srcdir)/lib/pmp/pmp_plugin.sym
 
 irivnavi_la_LIBADD = \
-	$(top_builddir)/lib/ucs2/libpmpucs2.la \
-	$(top_builddir)/lib/filepath/libpmpfilepath.la \
 	$(top_builddir)/lib/pmp/libpmp.la
 
 AM_CFLAGS = @CFLAGS@

Modified: trunk/pmplib/lib/pmp_portalplayer1/Makefile.am
===================================================================
--- trunk/pmplib/lib/pmp_portalplayer1/Makefile.am	2007-02-06 04:39:09 UTC (rev 298)
+++ trunk/pmplib/lib/pmp_portalplayer1/Makefile.am	2007-02-06 05:27:45 UTC (rev 299)
@@ -34,8 +34,6 @@
 	-export-symbols $(top_srcdir)/lib/pmp/pmp_plugin.sym
 
 portalplayer1_la_LIBADD = \
-	$(top_builddir)/lib/ucs2/libpmpucs2.la \
-	$(top_builddir)/lib/filepath/libpmpfilepath.la \
 	$(top_builddir)/lib/pmp/libpmp.la
 
 AM_CFLAGS = @CFLAGS@

Modified: trunk/pmplib/lib/ucs2/Makefile.am
===================================================================
--- trunk/pmplib/lib/ucs2/Makefile.am	2007-02-06 04:39:09 UTC (rev 298)
+++ trunk/pmplib/lib/ucs2/Makefile.am	2007-02-06 05:27:45 UTC (rev 299)
@@ -1,13 +1,13 @@
 # $Id$
 
-lib_LTLIBRARIES = libpmpucs2.la
+noinst_LTLIBRARIES = libucs2.la
 
-libpmpucs2_la_SOURCES = \
+libucs2_la_SOURCES = \
 	../../include/ucs2char.h \
 	ucs2char.c \
 	ucs2char_iconv.c
 
-libpmpucs2_la_LDFLAGS = @ICONV_LIBS@ @LIBICONV@ -no-undefined
+libucs2_la_LDFLAGS = @ICONV_LIBS@ @LIBICONV@ -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.