6 files changed, 5 insertions, 67 deletions
diff --git a/testcase/Makefile.am b/testcase/Makefile.am
index 32fae42..ac1b359 100644
--- a/testcase/Makefile.am
+++ b/testcase/Makefile.am
@@ -1,4 +1,2 @@
-if TC_CAMERA
 SUBDIRS = camera
-endif
 
diff --git a/testcase/build/Makefile.am b/testcase/build/Makefile.am
deleted file mode 100644
index efb1910..0000000
--- a/testcase/build/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-SUBDIRS = testcase
-
diff --git a/testcase/build/autogen.sh b/testcase/build/autogen.sh
deleted file mode 100755
index 2f43082..0000000
--- a/testcase/build/autogen.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#! /bin/sh
-
-libtoolize --copy --force
-aclocal -I m4 
-autoheader
-autoconf
-automake -a -c
diff --git a/testcase/build/configure.ac b/testcase/build/configure.ac
deleted file mode 100644
index ec4cd95..0000000
--- a/testcase/build/configure.ac
+++ /dev/null
@@ -1,46 +0,0 @@
-AC_PREREQ(2.52)
-
-AC_INIT([mm-hal-testcase], [0.8.0])
-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
-AC_CONFIG_HEADERS([config.h:config.hin])
-AC_CONFIG_MACRO_DIR([m4])
-
-# Checks for programs.
-m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
-AC_PROG_CC
-AC_PROG_CXX
-AM_PROG_CC_C_O
-AC_C_CONST
-AC_HEADER_STDBOOL
-AC_HEADER_STDC
-AC_HEADER_TIME
-AC_PROG_GCC_TRADITIONAL
-AC_PROG_LIBTOOL
-
-# Checks for libraries.
-AC_ARG_ENABLE(tc-camera, AC_HELP_STRING([--enable-tc-camera], [enable tc-camera]),
-[
-  case "${enableval}" in
-    yes) TC_CAMERA=yes ;;
-    no)  TC_CAMERA=no ;;
-    *) AC_MSG_ERROR(bad value ${enableval} for --enable-tc-camera) ;;
-  esac
-],[TC_CAMERA=no])
-AM_CONDITIONAL([TC_CAMERA], [test "x$TC_CAMERA" = "xyes"])
-
-PKG_CHECK_MODULES(GLIB, glib-2.0)
-AC_SUBST(GLIB_CFLAGS)
-AC_SUBST(GLIB_LIBS)
-
-PKG_CHECK_MODULES(DLOG, dlog)
-AC_SUBST(DLOG_CFLAGS)
-AC_SUBST(DLOG_LIBS)
-
-# Checks for library functions.
-AC_CONFIG_FILES([
-Makefile
-testcase/Makefile
-testcase/camera/Makefile
-])
-AC_OUTPUT
-
diff --git a/testcase/build/mm-hal-testcase.manifest b/testcase/build/mm-hal-testcase.manifest
deleted file mode 100644
index a76fdba..0000000
--- a/testcase/build/mm-hal-testcase.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
-	<request>
-		<domain name="_" />
-	</request>
-</manifest>
diff --git a/testcase/camera/Makefile.am b/testcase/camera/Makefile.am
index 1699fa8..13e0782 100644
--- a/testcase/camera/Makefile.am
+++ b/testcase/camera/Makefile.am
@@ -1,12 +1,12 @@
 # with gtest
-bin_PROGRAMS = camera_hal_tc
+bin_PROGRAMS = camera_hal_gtests
 
-camera_hal_tc_SOURCES = camera_hal_tc.cpp camera_hal_interface.c
+camera_hal_gtests_SOURCES = camera_hal_tc.cpp camera_hal_interface.c
 
-camera_hal_tc_CFLAGS = $(GLIB_CFLAGS) $(DLOG_CFLAGS)
-camera_hal_tc_CPPFLAGS = $(GLIB_CFLAGS) $(DLOG_CFLAGS)
+camera_hal_gtests_CFLAGS = $(GLIB_CFLAGS) $(DLOG_CFLAGS)
+camera_hal_gtests_CPPFLAGS = $(GLIB_CFLAGS) $(DLOG_CFLAGS) -I$(srcdir)/../../include/camera
 
-camera_hal_tc_LDADD = \
+camera_hal_gtests_LDADD = \
 	-ldl \
 	-lgtest \
 	$(GLIB_LIBS) \