[Pmplib-commits] SF.net SVN: pmplib: [33] trunk/lib/pmp

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

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

Log Message:
-----------
Revert LDADD->LIBADD thinko.
Install plugins into /usr/lib/pmp again.

Modified Paths:
--------------
    trunk/frontend/easypmp/cui/Makefile.am
    trunk/lib/pmp/pmp_posix.c
    trunk/lib/pmp_iriverplus2/Makefile.am
    trunk/lib/pmp_irivnavi/Makefile.am
    trunk/lib/pmp_portalplayer1/Makefile.am
Modified: trunk/frontend/easypmp/cui/Makefile.am
===================================================================
--- trunk/frontend/easypmp/cui/Makefile.am	2006-06-03 22:04:42 UTC (rev 32)
+++ trunk/frontend/easypmp/cui/Makefile.am	2006-06-03 22:25:38 UTC (rev 33)
@@ -21,7 +21,7 @@
 INCLUDES = @INCLUDES@ -I../common
 AM_LDFLAGS = @LDFLAGS@
 
-easypmp_LIBADD = \
+easypmp_LDADD = \
 	$(top_builddir)/lib/ucs2/libucs2.la \
 	$(top_builddir)/lib/filepath/libfilepath.la \
 	$(top_builddir)/lib/gmi/libgmi.la \

Modified: trunk/lib/pmp/pmp_posix.c
===================================================================
--- trunk/lib/pmp/pmp_posix.c	2006-06-03 22:04:42 UTC (rev 32)
+++ trunk/lib/pmp/pmp_posix.c	2006-06-03 22:25:38 UTC (rev 33)
@@ -62,7 +62,7 @@
 	lt_dlinit();
 	lt_dlsetsearchpath(PMP_MODULES_DIR);
 
-	inst = lt_dlopenext("libpmp_portalplayer1");
+	inst = lt_dlopenext("portalplayer1");
 	if (inst) {
 		pmphelp->num_plugins++;
 		pmphelp->plugins = (lt_dlhandle*)realloc(pmphelp->plugins, sizeof(lt_dlhandle) * pmphelp->num_plugins);
@@ -71,7 +71,7 @@
 		fprintf(stderr, "FAILED: pmp_portalplayer1 in %s\n", PMP_MODULES_DIR);
 	}
 
-	inst = lt_dlopenext("libpmp_iriverplus2");
+	inst = lt_dlopenext("iriverplus2");
 	if (inst) {
 		pmphelp->num_plugins++;
 		pmphelp->plugins = (lt_dlhandle*)realloc(pmphelp->plugins, sizeof(lt_dlhandle) * pmphelp->num_plugins);
@@ -80,7 +80,7 @@
 		fprintf(stderr, "FAILED: pmp_iriverplus2\n");
 	}
 
-	inst = lt_dlopenext("libpmp_irivnavi");
+	inst = lt_dlopenext("irivnavi");
 	if (inst) {
 		pmphelp->num_plugins++;
 		pmphelp->plugins = (lt_dlhandle*)realloc(pmphelp->plugins, sizeof(lt_dlhandle) * pmphelp->num_plugins);

Modified: trunk/lib/pmp_iriverplus2/Makefile.am
===================================================================
--- trunk/lib/pmp_iriverplus2/Makefile.am	2006-06-03 22:04:42 UTC (rev 32)
+++ trunk/lib/pmp_iriverplus2/Makefile.am	2006-06-03 22:25:38 UTC (rev 33)
@@ -1,10 +1,9 @@
 # $Id$
 
-libpmpdir=$(libdir)/pmp
+pmpdir=$(libdir)/pmp
+pmp_LTLIBRARIES = iriverplus2.la
 
-lib_LTLIBRARIES = libpmp_iriverplus2.la
-
-libpmp_iriverplus2_la_SOURCES = \
+iriverplus2_la_SOURCES = \
 	../../include/pmp.h \
 	dat.c \
 	idx.c \
@@ -24,11 +23,11 @@
 	util.h \
 	pmp_iriverplus2.c
 
-libpmp_iriverplus2_la_LDFLAGS = \
+iriverplus2_la_LDFLAGS = \
 	-no-undefined  -module -avoid-version \
 	-export-symbols ../pmp/pmp_plugin.sym
 
-libpmp_iriverplus2_la_LIBADD = \
+iriverplus2_la_LIBADD = \
 	$(top_builddir)/lib/ucs2/libucs2.la \
 	$(top_builddir)/lib/filepath/libfilepath.la \
 	$(top_builddir)/lib/pmp/libpmp.la

Modified: trunk/lib/pmp_irivnavi/Makefile.am
===================================================================
--- trunk/lib/pmp_irivnavi/Makefile.am	2006-06-03 22:04:42 UTC (rev 32)
+++ trunk/lib/pmp_irivnavi/Makefile.am	2006-06-03 22:25:38 UTC (rev 33)
@@ -1,10 +1,9 @@
 # $Id$
 
-libpmpdir=$(libdir)/pmp
+pmpdir=$(libdir)/pmp
+pmp_LTLIBRARIES = irivnavi.la
 
-lib_LTLIBRARIES = libpmp_irivnavi.la
-
-libpmp_irivnavi_la_SOURCES = \
+irivnavi_la_SOURCES = \
 	../../include/pmp.h \
 	../../include/pmphelp.h \
 	irivnavi.c \
@@ -14,11 +13,11 @@
 	serialize.h \
 	pmp_irivnavi.c
 
-libpmp_irivnavi_la_LDFLAGS = \
+irivnavi_la_LDFLAGS = \
 	-no-undefined -module -avoid-version \
 	-export-symbols ../pmp/pmp_plugin.sym
 
-libpmp_irivnavi_la_LIBADD = \
+irivnavi_la_LIBADD = \
 	$(top_builddir)/lib/ucs2/libucs2.la \
 	$(top_builddir)/lib/filepath/libfilepath.la \
 	$(top_builddir)/lib/pmp/libpmp.la

Modified: trunk/lib/pmp_portalplayer1/Makefile.am
===================================================================
--- trunk/lib/pmp_portalplayer1/Makefile.am	2006-06-03 22:04:42 UTC (rev 32)
+++ trunk/lib/pmp_portalplayer1/Makefile.am	2006-06-03 22:25:38 UTC (rev 33)
@@ -1,10 +1,9 @@
 # $Id$
 
-libpmpdir=$(libdir)/pmp
+pmpdir=$(libdir)/pmp
+pmp_LTLIBRARIES = portalplayer1.la
 
-lib_LTLIBRARIES = libpmp_portalplayer1.la
-
-libpmp_portalplayer1_la_SOURCES = \
+portalplayer1_la_SOURCES = \
 	../../include/pmp.h \
 	hdr.c \
 	hdr_template.c \
@@ -28,11 +27,11 @@
 	model_samsung.c \
 	pmp_portalplayer1.c
 
-libpmp_portalplayer1_la_LDFLAGS = \
+portalplayer1_la_LDFLAGS = \
 	-no-undefined -module -avoid-version \
 	-export-symbols ../pmp/pmp_plugin.sym
 
-libpmp_portalplayer1_la_LIBADD = \
+portalplayer1_la_LIBADD = \
 	$(top_builddir)/lib/ucs2/libucs2.la \
 	$(top_builddir)/lib/filepath/libfilepath.la \
 	$(top_builddir)/lib/pmp/libpmp.la


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