summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYong Yeon Kim <yy9875.kim@samsung.com>2012-02-18 17:23:56 +0900
committerYong Yeon Kim <yy9875.kim@samsung.com>2012-02-18 17:23:56 +0900
commit0f5acc4600f81b43a65aa56cab9c96898c7b99d3 (patch)
tree587dfcebcc97d502172bb0c8b7c4110084272052
parentd097778af108d85aa2f7218177e7beb996b743b4 (diff)
downloadmedia-server-0f5acc4600f81b43a65aa56cab9c96898c7b99d3.tar.gz
media-server-0f5acc4600f81b43a65aa56cab9c96898c7b99d3.tar.bz2
media-server-0f5acc4600f81b43a65aa56cab9c96898c7b99d3.zip
fix build error
-rwxr-xr-xMakefile.am5
-rwxr-xr-xconfigure.ac4
-rwxr-xr-xdebian/changelog8
-rw-r--r--lib/include/.media-util-register.h.swpbin0 -> 12288 bytes
-rwxr-xr-xlib/include/media-util-register.h2
-rwxr-xr-xlib/media-util-register.c1
6 files changed, 13 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am
index df4cd48..b47cbd8 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,8 +43,9 @@ libmedia_utils_la_LIBADD = $(MEDIA_INFO_LIBS) \
### file-manager-server ###
bin_PROGRAMS = media-server
-media_server_SOURCES = common/media-server-common.c \
- common/media-server-thumb.c \
+media_server_SOURCES = common/media-server-utils.c \
+ common/media-server-db-svc.c \
+ common/media-server-external-storage.c \
common/media-server-inotify-internal.c \
common/media-server-inotify.c \
common/media-server-scan-internal.c \
diff --git a/configure.ac b/configure.ac
index 1b9ba34..5a57b2a 100755
--- a/configure.ac
+++ b/configure.ac
@@ -76,10 +76,6 @@ PKG_CHECK_MODULES(PHONESTATUS, vconf)
AC_SUBST(PHONESTATUS_CFLAGS)
AC_SUBST(PHONESTATUS_LIBS)
-PKG_CHECK_MODULES(UTIL, heynoti)
-AC_SUBST(UTIL_CFLAGS)
-AC_SUBST(UTIL_LIBS)
-
PKG_CHECK_MODULES(MM_FILEINFO, mm-fileinfo)
AC_SUBST(MM_FILEINFO_CFLAGS)
AC_SUBST(MM_FILEINFO_LIBS)
diff --git a/debian/changelog b/debian/changelog
index 2a63fcb..39b4114 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+media-server (0.1.53) unstable; urgency=low
+
+ * fix build error
+ * Git : pkgs/m/media-server
+ * Tag : media-server_0.1.53
+
+ -- Yong Yeon Kim <yy9875.kim@samsung.com> Sat, 18 Feb 2012 17:22:51 +0900
+
media-server (0.1.52) unstable; urgency=low
* for beta release
diff --git a/lib/include/.media-util-register.h.swp b/lib/include/.media-util-register.h.swp
new file mode 100644
index 0000000..c6c9aaf
--- /dev/null
+++ b/lib/include/.media-util-register.h.swp
Binary files differ
diff --git a/lib/include/media-util-register.h b/lib/include/media-util-register.h
index e61d19d..a5684b6 100755
--- a/lib/include/media-util-register.h
+++ b/lib/include/media-util-register.h
@@ -78,7 +78,7 @@ int main()
*/
int media_file_register(const char *file_full_path);
- typedef GArray* media_list;
+typedef GArray* media_list;
int media_list_new(media_list *list);
diff --git a/lib/media-util-register.c b/lib/media-util-register.c
index 4793d69..d65b47f 100755
--- a/lib/media-util-register.c
+++ b/lib/media-util-register.c
@@ -35,6 +35,7 @@
#include <fcntl.h>
#include <sys/socket.h>
#include <string.h>
+#include <stdbool.h>
#include <media-svc.h>
#include <audio-svc.h>