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

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

Revision: 39
Author:   nyaochi
Date:     2006-06-03 19:27:26 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=39&view=rev

Log Message:
-----------
JSPL files (include library and sample files) are now installed into
"$(PREFIX)/share/pmp/jspl" directory.

Modified Paths:
--------------
    trunk/frontend/easypmp/cui/Makefile.am
    trunk/frontend/easypmp/cui/main.c
    trunk/lib/playlist/Makefile.am
    trunk/lib/pmp/pmp_posix.c
    trunk/m4/smjs.m4
Modified: trunk/frontend/easypmp/cui/Makefile.am
===================================================================
--- trunk/frontend/easypmp/cui/Makefile.am	2006-06-04 01:34:08 UTC (rev 38)
+++ trunk/frontend/easypmp/cui/Makefile.am	2006-06-04 02:27:26 UTC (rev 39)
@@ -22,10 +22,11 @@
 INCLUDES = @INCLUDES@ -I../common
 AM_LDFLAGS = @LDFLAGS@
 
+easypmp_CFLAGS = -DPMP_JSPL_DIR="\"$(prefix)/share/pmp/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/pmp/libpmp.la
-

Modified: trunk/frontend/easypmp/cui/main.c
===================================================================
--- trunk/frontend/easypmp/cui/main.c	2006-06-04 01:34:08 UTC (rev 38)
+++ trunk/frontend/easypmp/cui/main.c	2006-06-04 02:27:26 UTC (rev 39)
@@ -286,7 +286,7 @@
 		filepath_addslash(opt.path_to_include);
 #else
 		// Obtain JavaScript Playlist directory from PMP_JSPLINCL_DIR
-		mbstoucs2(opt.path_to_include, MAX_PATH, PMP_JSPLINCL_DIR, strlen(PMP_JSPLINCL_DIR)+1);
+		mbstoucs2(opt.path_to_include, MAX_PATH, PMP_JSPL_DIR, strlen(PMP_JSPL_DIR)+1);
 #endif
 	}
 

Modified: trunk/lib/playlist/Makefile.am
===================================================================
--- trunk/lib/playlist/Makefile.am	2006-06-04 01:34:08 UTC (rev 38)
+++ trunk/lib/playlist/Makefile.am	2006-06-04 02:27:26 UTC (rev 39)
@@ -1,5 +1,12 @@
 # $Id$
 
+jspldir = $(prefix)/share/pmp/jspl
+jspl_DATA = \
+	jspl/playlist.js \
+	jspl/artist.jspl \
+	jspl/artists.jspl \
+	jspl/top_ranking.jspl
+
 lib_LTLIBRARIES = libplaylist.la
 
 libplaylist_la_SOURCES = \

Modified: trunk/lib/pmp/pmp_posix.c
===================================================================
--- trunk/lib/pmp/pmp_posix.c	2006-06-04 01:34:08 UTC (rev 38)
+++ trunk/lib/pmp/pmp_posix.c	2006-06-04 02:27:26 UTC (rev 39)
@@ -68,7 +68,7 @@
 		pmphelp->plugins = (lt_dlhandle*)realloc(pmphelp->plugins, sizeof(lt_dlhandle) * pmphelp->num_plugins);
 		pmphelp->plugins[pmphelp->num_plugins-1] = inst;
 	} else {
-		fprintf(stderr, "FAILED: pmp_portalplayer1 in %s\n", PMP_MODULES_DIR);
+		fprintf(stderr, "FAILED: portalplayer1 in %s\n", PMP_MODULES_DIR);
 	}
 
 	inst = lt_dlopenext("iriverplus2");
@@ -77,7 +77,7 @@
 		pmphelp->plugins = (lt_dlhandle*)realloc(pmphelp->plugins, sizeof(lt_dlhandle) * pmphelp->num_plugins);
 		pmphelp->plugins[pmphelp->num_plugins-1] = inst;
 	} else {
-		fprintf(stderr, "FAILED: pmp_iriverplus2\n");
+		fprintf(stderr, "FAILED: iriverplus2\n");
 	}
 
 	inst = lt_dlopenext("irivnavi");
@@ -86,7 +86,7 @@
 		pmphelp->plugins = (lt_dlhandle*)realloc(pmphelp->plugins, sizeof(lt_dlhandle) * pmphelp->num_plugins);
 		pmphelp->plugins[pmphelp->num_plugins-1] = inst;
 	} else {
-		fprintf(stderr, "FAILED: pmp_irivnavi\n");
+		fprintf(stderr, "FAILED: irivnavi\n");
 	}
 
 	*ptr_pmphelp = pmphelp;

Modified: trunk/m4/smjs.m4
===================================================================
--- trunk/m4/smjs.m4	2006-06-04 01:34:08 UTC (rev 38)
+++ trunk/m4/smjs.m4	2006-06-04 02:27:26 UTC (rev 39)
@@ -28,7 +28,7 @@
 
 m4_define([spidermonkey_locate],
     [AC_CHECK_HEADER([$1jsapi.h],
-	[JS_CFLAGS="-I`spidermonkey_locate_header([$1], [jsapi.h])`"
+	[JS_CFLAGS="-DXP_UNIX -I`spidermonkey_locate_header([$1], [jsapi.h])`"
 	 JS_LIBS="`spidermonkey_locate_lib([$2])`"
 	],
 	[unset JS_CFLAGS JS_LIBS],


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.