make the unittests binary at top_srcdir

The unittests has to build after generating the protocol.
In order that, remove the unittests/Makefile.am.

Change-Id: I3f0948520eb8db936c21db04bf65badf138fa5e1

diff --git a/Makefile.am b/Makefile.am
index 3a9b370..f8a55ab 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,3 @@
-SUBDIRS = unittests
 AM_CPPFLAGS = \
                        -I$(top_builddir)/protocol/tizen \
                        -I$(top_builddir)/protocol/unstable \
@@ -432,3 +431,28 @@ tzrs_consumer_LDADD = \
    @ECORE_WL2_LIBS@ \
    @ELEMENTARY_LIBS@
 endif
+
+bin_PROGRAMS = libwayland-extension-unittests
+
+libwayland_extension_unittests_SOURCES = \
+       unittests/tc-main.cpp \
+       unittests/mockcompositor.cpp \
+       unittests/mockclient.cpp \
+       unittests/tc-mockcompositor.cpp
+
+libwayland_extension_unittests_CXXFLAGS = \
+       -I$(top_srcdir)/protocol/tizen \
+       ${CXXFLAGS} \
+       @GMOCK_CFLAGS@ \
+       @WAYLAND_SERVER_CFLAGS@ \
+       @WAYLAND_CLIENT_CFLAGS@
+
+libwayland_extension_unittests_LDFLAGS = \
+       ${LDFLAGS} \
+       @GMOCK_LIBS@ \
+       @WAYLAND_SERVER_LIBS@ \
+       @WAYLAND_CLIENT_LIBS@
+
+check:
+       ./libwayland-extension-unitests
+

diff --git a/configure.ac b/configure.ac
index 248e6c7..4161b6e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -93,7 +93,6 @@ GMOCK_LIBS="$GMOCK_LIBS"
 
 AC_CONFIG_FILES([
        Makefile
-   unittests/Makefile
        src/wayland-extension-version.h
        src/template-server.pc
        src/template-client.pc

diff --git a/unittests/Makefile.am b/unittests/Makefile.am
deleted file mode 100644 (file)
index 183a71f..0000000
--- a/unittests/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-bin_PROGRAMS = libwayland-extension-unittests
-
-libwayland_extension_unittests_SOURCES = \
-       tc-main.cpp \
-       mockcompositor.cpp \
-       mockclient.cpp \
-       tc-mockcompositor.cpp
-
-libwayland_extension_unittests_CXXFLAGS = \
-       -I$(top_srcdir)/protocol/tizen \
-       ${CXXFLAGS} \
-       @GMOCK_CFLAGS@ \
-       @WAYLAND_SERVER_CFLAGS@ \
-       @WAYLAND_CLIENT_CFLAGS@
-
-libwayland_extension_unittests_LDFLAGS = \
-       ${LDFLAGS} \
-       @GMOCK_LIBS@ \
-       @WAYLAND_SERVER_LIBS@ \
-       @WAYLAND_CLIENT_LIBS@
-
-check:
-       ./libwayland-extension-unitests