autotools: Simplify geanyvc and geanyprj test setup

As both plugins actually rebuild source files differently for the tests, put the test controller in the same directory.
DevynCJohnson · Mar 5, 2015 · 7c45d27 · 7c45d27
1 parent bd20c63
commit 7c45d27
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 36 deletions.
diff --git a/build/geanyprj.m4 b/build/geanyprj.m4
@@ -6,6 +6,5 @@ AC_DEFUN([GP_CHECK_GEANYPRJ],
     AC_CONFIG_FILES([
         geanyprj/Makefile
         geanyprj/src/Makefile
-        geanyprj/tests/Makefile
     ])
 ])
diff --git a/build/geanyvc.m4 b/build/geanyvc.m4
@@ -27,6 +27,5 @@ AC_DEFUN([GP_CHECK_GEANYVC],
     AC_CONFIG_FILES([
         geanyvc/Makefile
         geanyvc/src/Makefile
-        geanyvc/tests/Makefile
     ])
 ])
diff --git a/geanyprj/Makefile.am b/geanyprj/Makefile.am
@@ -1,4 +1,4 @@
 include $(top_srcdir)/build/vars.auxfiles.mk
 
-SUBDIRS = src tests
+SUBDIRS = src
 plugin = geanyprj
diff --git a/geanyprj/src/Makefile.am b/geanyprj/src/Makefile.am
@@ -13,13 +13,13 @@ geanyprj_la_SOURCES = geanyprj.c \
 geanyprj_la_CFLAGS = $(AM_CFLAGS)
 geanyprj_la_LIBADD = $(COMMONLIBS)
 
-check_LTLIBRARIES = libgeanyprj-test.la
-
-libgeanyprj_test_la_SOURCES = \
-	utils.c
-libgeanyprj_test_la_CPPFLAGS = $(AM_CFLAGS) -DUNITTESTS
-libgeanyprj_test_la_LDFLAGS = -avoid-version $(GP_LDFLAGS)
-libgeanyprj_test_la_LIBADD = $(COMMONLIBS)
+if UNITTESTS
+TESTS = unittests
+check_PROGRAMS = unittests
+unittests_SOURCES = unittests.c utils.c
+unittests_CFLAGS  = $(GEANY_CFLAGS) -DUNITTESTS
+unittests_LDADD   = @GEANY_LIBS@ $(INTLLIBS) @CHECK_LIBS@
+endif
 
 AM_CPPCHECKFLAGS = --suppress='constStatement:*'
 AM_CPPCHECKFLAGS += --suppress='memleak:utils.c:72'

diff --git a/geanyprj/tests/unittests.c → geanyprj/src/unittests.c b/geanyprj/tests/unittests.c → geanyprj/src/unittests.c
diff --git a/geanyprj/tests/Makefile.am b/geanyprj/tests/Makefile.am
diff --git a/geanyvc/Makefile.am b/geanyvc/Makefile.am
@@ -1,4 +1,4 @@
 include $(top_srcdir)/build/vars.auxfiles.mk
 
-SUBDIRS = src tests
+SUBDIRS = src
 plugin = geanyvc
diff --git a/geanyvc/src/Makefile.am b/geanyvc/src/Makefile.am
@@ -22,12 +22,12 @@ geanyvc_la_LIBADD = \
 	$(GTKSPELL_LIBS) \
 	$(COMMONLIBS)
 
-check_LTLIBRARIES = libgeanyvc-test.la
-
-libgeanyvc_test_la_SOURCES = \
-	utils.c
-libgeanyvc_test_la_CFLAGS = $(AM_CFLAGS) -DUNITTESTS
-libgeanyvc_test_la_LDFLAGS = -avoid-version $(GP_LDFLAGS)
-libgeanyvc_test_la_LIBADD = $(COMMONLIBS)
+if UNITTESTS
+TESTS = unittests
+check_PROGRAMS = unittests
+unittests_SOURCES = unittests.c utils.c
+unittests_CFLAGS  = $(GEANY_CFLAGS) -DUNITTESTS
+unittests_LDADD   = @GEANY_LIBS@ $(INTLLIBS) @CHECK_LIBS@
+endif
 
 include $(top_srcdir)/build/cppcheck.mk
diff --git a/geanyvc/tests/unittests.c → geanyvc/src/unittests.c b/geanyvc/tests/unittests.c → geanyvc/src/unittests.c
diff --git a/geanyvc/tests/Makefile.am b/geanyvc/tests/Makefile.am