Menu
▾
▴
[Pmplib-commits] SF.net SVN: pmplib: [28] trunk
|
From: <ny...@us...> - 2006-06-03 17:37:25
|
Revision: 28 Author: nyaochi Date: 2006-06-03 10:37:08 -0700 (Sat, 03 Jun 2006) ViewCVS: http://svn.sourceforge.net/pmplib/?rev=28&view=rev Log Message: ----------- Reduced warnings. Added Makefile.am in m4 directory. Modified Paths: -------------- trunk/Makefile.am trunk/configure.in trunk/include/gmi.h trunk/include/pmp.h trunk/lib/pmp/Makefile.am trunk/lib/pmp/pmp_posix.c trunk/lib/pmp_iriverplus2/Makefile.am trunk/lib/pmp_iriverplus2/ip2db_idx.c trunk/lib/pmp_irivnavi/Makefile.am trunk/lib/pmp_irivnavi/pmp_irivnavi.c trunk/lib/pmp_portalplayer1/Makefile.am Added Paths: ----------- trunk/m4/Makefile.am Modified: trunk/Makefile.am =================================================================== --- trunk/Makefile.am 2006-06-03 01:16:42 UTC (rev 27) +++ trunk/Makefile.am 2006-06-03 17:37:08 UTC (rev 28) @@ -1,9 +1,7 @@ # $Id$ -SUBDIRS = libltdl lib/ucs2 lib/filepath lib/gmi lib/playlist lib/pmp lib/pmp_irivnavi lib/pmp_portalplayer1 lib/pmp_iriverplus2 frontend/easypmp/cui +SUBDIRS = m4 libltdl lib/ucs2 lib/filepath lib/gmi lib/playlist lib/pmp lib/pmp_irivnavi lib/pmp_portalplayer1 lib/pmp_iriverplus2 frontend/easypmp/cui -INCLUDES = $(LTDLINCL) - docdir = $(prefix)/share/doc/@PACKAGE@ doc_DATA = README NEWS INSTALL COPYING AUTHORS ChangeLog Modified: trunk/configure.in =================================================================== --- trunk/configure.in 2006-06-03 01:16:42 UTC (rev 27) +++ trunk/configure.in 2006-06-03 17:37:08 UTC (rev 28) @@ -7,56 +7,70 @@ dnl INCLUDES +dnl ------------------------------------------------------------------ dnl Initialization for autoconf +dnl ------------------------------------------------------------------ AC_PREREQ(2.53) AC_INIT AC_CONFIG_SRCDIR([frontend/easypmp/cui/main.c]) +dnl ------------------------------------------------------------------ dnl Checks for system +dnl ------------------------------------------------------------------ AC_CANONICAL_HOST AC_AIX AC_MINIX AC_ISC_POSIX + +dnl ------------------------------------------------------------------ dnl Initialization for automake +dnl ------------------------------------------------------------------ AM_INIT_AUTOMAKE(pmplib, 0.11) AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE AM_C_PROTOTYPES + +dnl ------------------------------------------------------------------ dnl Checks for program +dnl ------------------------------------------------------------------ AM_PROG_CC_STDC AC_PROG_CC AC_PROG_INSTALL AC_PROG_LN_S -dnl Initialozation for libtool + +dnl ------------------------------------------------------------------ +dnl Checks for libltdl +dnl ------------------------------------------------------------------ AC_LIBLTDL_CONVENIENCE -dnl Substitute LTDLINCL and LIBLTDL in the Makefiles AC_SUBST(LTDLINCL) AC_SUBST(LIBLTDL) -dnl Check for dlopen support AC_LIBTOOL_DLOPEN -dnl Configure libtool AC_PROG_LIBTOOL -dnl Configure libltdl AC_CONFIG_SUBDIRS(libltdl) + +dnl ------------------------------------------------------------------ dnl Initialization for variables +dnl ------------------------------------------------------------------ CFLAGS="${ac_save_CFLAGS}" LDFLAGS="${ac_save_LDFLAGS}" INCLUDES="-I\$(top_srcdir) -I\$(top_srcdir)/include -I\$(srcdir)" -dnl Additional options - +dnl ------------------------------------------------------------------ dnl Checks for header files. +dnl ------------------------------------------------------------------ AC_HEADER_STDC AC_CHECK_HEADERS(fcntl.h limits.h malloc.h strings.h unistd.h stdint.h getopt.h) +dnl ------------------------------------------------------------------ dnl Checks for typedefs, structures, and compiler characteristics. +dnl ------------------------------------------------------------------ AC_C_CONST AC_CHECK_SIZEOF AC_TYPE_SIZE_T @@ -106,7 +120,10 @@ typedef A_UINT32_T uint32_t; #endif]) + +dnl ------------------------------------------------------------------ dnl Checks for debugging mode +dnl ------------------------------------------------------------------ AC_ARG_ENABLE( debug, [AC_HELP_STRING(--enable-debug, [Turn on debugging])] @@ -117,7 +134,9 @@ fi +dnl ------------------------------------------------------------------ dnl Checks for library functions. +dnl ------------------------------------------------------------------ AC_FUNC_ALLOCA AC_FUNC_MEMCMP AC_FUNC_VPRINTF @@ -127,7 +146,7 @@ AC_CHECK_LIB(m, rand) dnl Check for zlib library -AC_CHECK_LIB(z, uncompress, , [AC_MSG_ERROR(libz not found!)]) +AC_CHECK_LIB(z, uncompress) dnl Check for iconv library AM_ICONV @@ -163,12 +182,13 @@ dnl Checks for vorbis AM_PATH_VORBIS -dnl ------------------------------------------------------------------ dnl Check for libsmjs (SpiderMonkey JavaScript engine) -dnl ------------------------------------------------------------------ AC_PATH_SPIDERMONKEY + +dnl ------------------------------------------------------------------ dnl Export variables +dnl ------------------------------------------------------------------ AC_SUBST(CFLAGS) AC_SUBST(LDFLAGS) AC_SUBST(INCLUDES) @@ -179,19 +199,8 @@ AC_SUBST(VORBISFILE_LIBS) -dnl Should the in-tree copy of SMJS be used? Only on Windows. -case "$UNAME_SYSTEM" in - CYGWIN*) - AM_CONDITIONAL([WIN32], true) - ;; - MINGW*) - AM_CONDITIONAL([WIN32], true) - ;; - *) - AM_CONDITIONAL([WIN32], false) - ;; -esac - +dnl ------------------------------------------------------------------ dnl Output the configure results. -AC_CONFIG_FILES(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/playlist/Makefile frontend/easypmp/cui/Makefile) +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/playlist/Makefile frontend/easypmp/cui/Makefile) AC_OUTPUT Modified: trunk/include/gmi.h =================================================================== --- trunk/include/gmi.h 2006-06-03 01:16:42 UTC (rev 27) +++ trunk/include/gmi.h 2006-06-03 17:37:08 UTC (rev 28) @@ -57,7 +57,7 @@ const ucs2char_t *filename, const ucs2char_t* path_to_music, int flag, - const ucs2char_t* strip_words[], + const ucs2char_t** strip_words, int num_strip_words ); Modified: trunk/include/pmp.h =================================================================== --- trunk/include/pmp.h 2006-06-03 01:16:42 UTC (rev 27) +++ trunk/include/pmp.h 2006-06-03 17:37:08 UTC (rev 28) @@ -162,7 +162,7 @@ uint32_t (*add_ref)(pmppl_t* pmppl); uint32_t (*release)(pmppl_t* pmppl); - result_t (*write)(pmppl_t* pmppl, const ucs2char_t* filename, const ucs2char_t* files[], uint32_t num_files); + result_t (*write)(pmppl_t* pmppl, const ucs2char_t* filename, const ucs2char_t** files, uint32_t num_files); }; typedef result_t (*pmp_create_t)(pmp_t** pmp, const ucs2char_t* path_to_device, const char *devid); Modified: trunk/lib/pmp/Makefile.am =================================================================== --- trunk/lib/pmp/Makefile.am 2006-06-03 01:16:42 UTC (rev 27) +++ trunk/lib/pmp/Makefile.am 2006-06-03 17:37:08 UTC (rev 28) @@ -8,7 +8,7 @@ pmp.c \ pmp_posix.c -libpmp_la_CPPFLAGS = -DPMP_MODULES_DIR="\"$(libdir)/pmp\"" +libpmp_la_CPPFLAGS = -DPMP_MODULES_DIR="\"$(libdir)/pmp\"" $(LTDLINCL) libpmp_la_LDFLAGS = \ -no-undefined Modified: trunk/lib/pmp/pmp_posix.c =================================================================== --- trunk/lib/pmp/pmp_posix.c 2006-06-03 01:16:42 UTC (rev 27) +++ trunk/lib/pmp/pmp_posix.c 2006-06-03 17:37:08 UTC (rev 28) @@ -26,7 +26,7 @@ #include <config.h> #endif/*HAVE_CONFIG_H*/ -#include <dlfcn.h> +#include <ltdl.h> #include <os.h> #include <ucs2char.h> @@ -52,7 +52,7 @@ result_t pmphelp_init(pmphelp_t** ptr_pmphelp) { - void *inst = NULL; + lt_dlhandle inst = 0; pmphelp_posix_t* pmphelp = NULL; pmphelp = (pmphelp_posix_t*)calloc(1, sizeof(pmphelp_posix_t)); Modified: trunk/lib/pmp_iriverplus2/Makefile.am =================================================================== --- trunk/lib/pmp_iriverplus2/Makefile.am 2006-06-03 01:16:42 UTC (rev 27) +++ trunk/lib/pmp_iriverplus2/Makefile.am 2006-06-03 17:37:08 UTC (rev 28) @@ -1,6 +1,7 @@ # $Id$ -pmpdir=$(libdir)/pmp +libpmpdir=$(libdir)/pmp + lib_LTLIBRARIES = libpmp_iriverplus2.la libpmp_iriverplus2_la_SOURCES = \ Modified: trunk/lib/pmp_iriverplus2/ip2db_idx.c =================================================================== --- trunk/lib/pmp_iriverplus2/ip2db_idx.c 2006-06-03 01:16:42 UTC (rev 27) +++ trunk/lib/pmp_iriverplus2/ip2db_idx.c 2006-06-03 17:37:08 UTC (rev 28) @@ -71,7 +71,12 @@ sortitems[i].records = records; sortitems[i].index = i; } - qsort(sortitems, num_records, sizeof(sortitem_t), idxexp->comp); + qsort( + sortitems, + num_records, + sizeof(sortitem_t), + idxexp->comp + ); /* Convert record_t elements into idxkey elements. */ for (i = 0;i < num_records;++i) { Modified: trunk/lib/pmp_irivnavi/Makefile.am =================================================================== --- trunk/lib/pmp_irivnavi/Makefile.am 2006-06-03 01:16:42 UTC (rev 27) +++ trunk/lib/pmp_irivnavi/Makefile.am 2006-06-03 17:37:08 UTC (rev 28) @@ -1,5 +1,7 @@ # $Id$ +libpmpdir=$(libdir)/pmp + lib_LTLIBRARIES = libpmp_irivnavi.la libpmp_irivnavi_la_SOURCES = \ Modified: trunk/lib/pmp_irivnavi/pmp_irivnavi.c =================================================================== --- trunk/lib/pmp_irivnavi/pmp_irivnavi.c 2006-06-03 01:16:42 UTC (rev 27) +++ trunk/lib/pmp_irivnavi/pmp_irivnavi.c 2006-06-03 17:37:08 UTC (rev 28) @@ -262,7 +262,7 @@ *ptr_pmpdb = 0; // Allocate a PMPDB instance. - pmpdb = calloc(1, sizeof(pmpdb_t)); + pmpdb = (pmpdb_t*)calloc(1, sizeof(pmpdb_t)); if (!pmpdb) { return PMPDBE_OUTOFMEMORY; } @@ -277,7 +277,7 @@ pmpdb->dump = pmpdb_dump; // Allocate and initialize an internal object (irivnavi_t). - irivnavi = calloc(1, sizeof(irivnavi_t)); + irivnavi = (irivnavi_t*)calloc(1, sizeof(irivnavi_t)); if (!irivnavi) { free(pmpdb); return PMPDBE_OUTOFMEMORY; @@ -300,7 +300,7 @@ *ptr_pmppl = 0; - pmppl = calloc(1, sizeof(pmppl_t)); + pmppl = (pmppl_t*)calloc(1, sizeof(pmppl_t)); if (!pmppl) { return PMPDBE_OUTOFMEMORY; } Modified: trunk/lib/pmp_portalplayer1/Makefile.am =================================================================== --- trunk/lib/pmp_portalplayer1/Makefile.am 2006-06-03 01:16:42 UTC (rev 27) +++ trunk/lib/pmp_portalplayer1/Makefile.am 2006-06-03 17:37:08 UTC (rev 28) @@ -1,5 +1,7 @@ # $Id$ +libpmpdir=$(libdir)/pmp + lib_LTLIBRARIES = libpmp_portalplayer1.la libpmp_portalplayer1_la_SOURCES = \ Added: trunk/m4/Makefile.am =================================================================== --- trunk/m4/Makefile.am (rev 0) +++ trunk/m4/Makefile.am 2006-06-03 17:37:08 UTC (rev 28) @@ -0,0 +1,7 @@ +# $Id: Makefile.am 20 2006-06-02 18:12:30Z nyaochi $ + +EXTRA_DIST = \ + iconv.m4 \ + ogg.m4 \ + vorbis.m4 \ + smjs.m4 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
