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

[<suc...@us...>]

Revision: 32
Author:   sucknblow
Date:     2006-06-03 15:04:42 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pmplib/?rev=32&view=rev

Log Message:
-----------
Add missing build dependency.  Now builds on Debian sid using
libmozjs-dev (still works using libsmjs-dev on older systems).

Modified Paths:
--------------
    trunk/configure.in
    trunk/debian/control
    trunk/frontend/easypmp/cui/Makefile.am
    trunk/lib/playlist/Makefile.am
    trunk/lib/playlist/jspl.c
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2006-06-03 19:41:05 UTC (rev 31)
+++ trunk/configure.in	2006-06-03 22:04:42 UTC (rev 32)
@@ -197,6 +197,8 @@
 AC_SUBST(OGG_LIBS)
 AC_SUBST(VORBIS_LIBS)
 AC_SUBST(VORBISFILE_LIBS)
+AC_SUBST(JS_CFLAGS)
+AC_SUBST(JS_LIBS)
 
 
 dnl ------------------------------------------------------------------

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2006-06-03 19:41:05 UTC (rev 31)
+++ trunk/debian/control	2006-06-03 22:04:42 UTC (rev 32)
@@ -2,7 +2,7 @@
 Section: sound
 Priority: optional
 Maintainer: Martin Ellis <mar...@kd...>
-Build-Depends: debhelper (>= 4.0.0), libid3tag0-dev, libmozjs-dev
+Build-Depends: debhelper (>= 4.0.0), libvorbis-dev, libid3tag0-dev, libmozjs-dev
 Standards-Version: 3.6.2
 
 Package: easypmp

Modified: trunk/frontend/easypmp/cui/Makefile.am
===================================================================
--- trunk/frontend/easypmp/cui/Makefile.am	2006-06-03 19:41:05 UTC (rev 31)
+++ trunk/frontend/easypmp/cui/Makefile.am	2006-06-03 22:04:42 UTC (rev 32)
@@ -21,7 +21,7 @@
 INCLUDES = @INCLUDES@ -I../common
 AM_LDFLAGS = @LDFLAGS@
 
-LDADD = \
+easypmp_LIBADD = \
 	$(top_builddir)/lib/ucs2/libucs2.la \
 	$(top_builddir)/lib/filepath/libfilepath.la \
 	$(top_builddir)/lib/gmi/libgmi.la \

Modified: trunk/lib/playlist/Makefile.am
===================================================================
--- trunk/lib/playlist/Makefile.am	2006-06-03 19:41:05 UTC (rev 31)
+++ trunk/lib/playlist/Makefile.am	2006-06-03 22:04:42 UTC (rev 32)
@@ -9,14 +9,15 @@
 	playlist.c \
 	jspl.c
 
-libplaylist_la_CPPFLAGS = $(js_inc)
+libplaylist_la_CPPFLAGS = $(JS_CFLAGS)
 
 libplaylist_la_LDFLAGS = \
+	-no-undefined
+
+libplaylist_la_LIBADD = \
 	$(top_builddir)/lib/ucs2/libucs2.la \
 	$(top_builddir)/lib/filepath/libfilepath.la \
-	-no-undefined
+	$(JS_LIBS)
 
-libplaylist_la_LIBADD = -lsmjs
-
-AM_CFLAGS = @CFLAGS@ $(js_def)
+AM_CFLAGS = @CFLAGS@
 INCLUDES = @INCLUDES@

Modified: trunk/lib/playlist/jspl.c
===================================================================
--- trunk/lib/playlist/jspl.c	2006-06-03 19:41:05 UTC (rev 31)
+++ trunk/lib/playlist/jspl.c	2006-06-03 22:04:42 UTC (rev 32)
@@ -42,9 +42,11 @@
 #define	XP_WIN
 #include <js/jsapi.h>
 #else
-// Build against external SMJS headers.
+/* Build against external Javascript library headers.
+   XP_UNIX is already defined if we found them by pkgconfig, 
+   but #define here just in case we didn't... */
 #define XP_UNIX
-#include <smjs/jsapi.h>
+#include <jsapi.h>
 #endif
 
 #define	MAX_SOURCE_DEPTH	64


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