[geany/geany-plugins] 7c45d2: autotools: Simplify geanyvc and geanyprj test setup

[Colomban Wendling]

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Thu, 05 Mar 2015 22:06:06 UTC
Commit:      7c45d275e8349857c2a65eddd13247e0f63278c5
             https://github.com/geany/geany-plugins/commit/7c45d275e8349857c2a65eddd13247e0f63278c5

Log Message:
-----------
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.


Modified Paths:
--------------
    build/geanyprj.m4
    build/geanyvc.m4
    geanyprj/Makefile.am
    geanyprj/src/Makefile.am
    geanyprj/src/unittests.c
    geanyprj/tests/Makefile.am
    geanyvc/Makefile.am
    geanyvc/src/Makefile.am
    geanyvc/src/unittests.c
    geanyvc/tests/Makefile.am

Modified: build/geanyprj.m4
1 lines changed, 0 insertions(+), 1 deletions(-)
===================================================================
@@ -6,6 +6,5 @@ AC_DEFUN([GP_CHECK_GEANYPRJ],
     AC_CONFIG_FILES([
         geanyprj/Makefile
         geanyprj/src/Makefile
-        geanyprj/tests/Makefile
     ])
 ])


Modified: build/geanyvc.m4
1 lines changed, 0 insertions(+), 1 deletions(-)
===================================================================
@@ -27,6 +27,5 @@ AC_DEFUN([GP_CHECK_GEANYVC],
     AC_CONFIG_FILES([
         geanyvc/Makefile
         geanyvc/src/Makefile
-        geanyvc/tests/Makefile
     ])
 ])


Modified: geanyprj/Makefile.am
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,4 +1,4 @@
 include $(top_srcdir)/build/vars.auxfiles.mk
 
-SUBDIRS = src tests
+SUBDIRS = src
 plugin = geanyprj


Modified: geanyprj/src/Makefile.am
14 lines changed, 7 insertions(+), 7 deletions(-)
===================================================================
@@ -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'


Modified: geanyprj/src/unittests.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online


Modified: geanyprj/tests/Makefile.am
9 lines changed, 0 insertions(+), 9 deletions(-)
===================================================================
@@ -1,9 +0,0 @@
-if UNITTESTS
-include $(top_srcdir)/build/vars.build.mk
-TESTS=unittests
-check_PROGRAMS=unittests
-unittests_SOURCES = unittests.c
-unittests_CFLAGS  = $(GEANY_CFLAGS) -I$(srcdir)/../src -DUNITTESTS
-unittests_LDADD   = @GEANY_LIBS@ $(INTLLIBS) @CHECK_LIBS@ \
-                    ../src/libgeanyprj-test.la
-endif


Modified: geanyvc/Makefile.am
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,4 +1,4 @@
 include $(top_srcdir)/build/vars.auxfiles.mk
 
-SUBDIRS = src tests
+SUBDIRS = src
 plugin = geanyvc


Modified: geanyvc/src/Makefile.am
14 lines changed, 7 insertions(+), 7 deletions(-)
===================================================================
@@ -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


Modified: geanyvc/src/unittests.c
0 lines changed, 0 insertions(+), 0 deletions(-)
===================================================================
No diff available, check online


Modified: geanyvc/tests/Makefile.am
9 lines changed, 0 insertions(+), 9 deletions(-)
===================================================================
@@ -1,9 +0,0 @@
-if UNITTESTS
-include $(top_srcdir)/build/vars.build.mk
-TESTS=unittests
-check_PROGRAMS=unittests
-unittests_SOURCES = unittests.c
-unittests_CFLAGS  = $(GEANY_CFLAGS) -DUNITTESTS
-unittests_LDADD   = @GEANY_LIBS@ $(INTLLIBS) @CHECK_LIBS@ \
-                    ../src/libgeanyvc-test.la
-endif



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).