From: adam <adamansky@gmail.com>
Date: Sat, 10 Nov 2012 12:20:06 +0000 (+0700)
Subject: Merge branch 'master' into ticket3
X-Git-Tag: v1.2.12~634^2~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=51f7c9114aff54c420f1afcd614249e4742b04de;p=platform%2Fupstream%2Fejdb.git

Merge branch 'master' into ticket3
---

51f7c9114aff54c420f1afcd614249e4742b04de
diff --cc tcejdb/configure
index a559623,7f3b3dd..0a84ee3
--- a/tcejdb/configure
+++ b/tcejdb/configure
@@@ -2059,10 -2077,9 +2059,10 @@@ MYLIBREV=1
  MYFORMATVER="1.0"
  
  # Targets
- MYHEADERFILES="tcutil.h tchdb.h tcbdb.h tcfdb.h tctdb.h tcadb.h ejdb.h ejdefs.h bson.h"
+ MYHEADERFILES="tcutil.h tchdb.h tcbdb.h tcfdb.h tctdb.h tcadb.h ejdb.h bson.h"
  MYLIBRARYFILES="libtcejdb.a"
 -MYLIBOBJFILES="tcutil.o tchdb.o tcbdb.o tcfdb.o tctdb.o tcadb.o myconf.o md5.o ejdb.o bson.o timsort.o numbers.o encoding.o"
 +MYLIBOBJFILES="tcutil.o tchdb.o tcbdb.o tcfdb.o tctdb.o tcadb.o myconf.o md5.o ejdb.o \
 +bson.o timsort.o numbers.o encoding.o utf8proc.o"
  MYCOMMANDFILES="tcutest tcumttest tcucodec tchtest tchmttest tchmgr"
  MYCOMMANDFILES="$MYCOMMANDFILES tcbtest tcbmttest tcbmgr tcftest tcfmttest tcfmgr"
  MYCOMMANDFILES="$MYCOMMANDFILES tcttest tctmttest tctmgr tcatest tcamttest tcamgr"
diff --cc tcejdb/configure.in
index ff50b16,8120858..d654061
--- a/tcejdb/configure.in
+++ b/tcejdb/configure.in
@@@ -19,10 -19,9 +19,10 @@@ MYLIBREV=1
  MYFORMATVER="1.0"
  
  # Targets
- MYHEADERFILES="tcutil.h tchdb.h tcbdb.h tcfdb.h tctdb.h tcadb.h ejdb.h ejdefs.h bson.h"
+ MYHEADERFILES="tcutil.h tchdb.h tcbdb.h tcfdb.h tctdb.h tcadb.h ejdb.h bson.h"
  MYLIBRARYFILES="libtcejdb.a"
 -MYLIBOBJFILES="tcutil.o tchdb.o tcbdb.o tcfdb.o tctdb.o tcadb.o myconf.o md5.o ejdb.o bson.o timsort.o numbers.o encoding.o"
 +MYLIBOBJFILES="tcutil.o tchdb.o tcbdb.o tcfdb.o tctdb.o tcadb.o myconf.o md5.o ejdb.o \
 +bson.o timsort.o numbers.o encoding.o utf8proc.o"
  MYCOMMANDFILES="tcutest tcumttest tcucodec tchtest tchmttest tchmgr"
  MYCOMMANDFILES="$MYCOMMANDFILES tcbtest tcbmttest tcbmgr tcftest tcfmttest tcfmgr"
  MYCOMMANDFILES="$MYCOMMANDFILES tcttest tctmttest tctmgr tcatest tcamttest tcamgr"