[geany/geany-plugins] bd20c6: autotools: Enable subdir-objects

[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:05 UTC
Commit:      bd20c631cb1564935d71a7b81044d452cf002530
             https://github.com/geany/geany-plugins/commit/bd20c631cb1564935d71a7b81044d452cf002530

Log Message:
-----------
autotools: Enable subdir-objects

This required tweaking geanyprj and geanyvc build system because they
used an unsupported feature of re-building and object from a directory
that already built objects, leading to a unexpected failure on cleanup.


Modified Paths:
--------------
    configure.ac
    geanyprj/src/Makefile.am
    geanyprj/tests/Makefile.am
    geanyvc/src/Makefile.am
    geanyvc/tests/Makefile.am

Modified: configure.ac
3 lines changed, 2 insertions(+), 1 deletions(-)
===================================================================
@@ -1,7 +1,7 @@
 AC_PREREQ([2.61])
 dnl Don't forget when updating version number to do GP_CHECK_GEANY also
 AC_INIT([geany-plugins], [1.25])
-AM_INIT_AUTOMAKE([1.8 foreign dist-bzip2 tar-ustar])
+AM_INIT_AUTOMAKE([1.8 foreign dist-bzip2 tar-ustar subdir-objects])
 
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
@@ -10,6 +10,7 @@ AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([build/cache])
 
 AC_PROG_CC
+AC_PROG_CC_C_O
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 


Modified: geanyprj/src/Makefile.am
8 lines changed, 8 insertions(+), 0 deletions(-)
===================================================================
@@ -13,6 +13,14 @@ 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)
+
 AM_CPPCHECKFLAGS = --suppress='constStatement:*'
 AM_CPPCHECKFLAGS += --suppress='memleak:utils.c:72'
 


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


Modified: geanyvc/src/Makefile.am
8 lines changed, 8 insertions(+), 0 deletions(-)
===================================================================
@@ -22,4 +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)
+
 include $(top_srcdir)/build/cppcheck.mk


Modified: geanyvc/tests/Makefile.am
5 lines changed, 3 insertions(+), 2 deletions(-)
===================================================================
@@ -2,7 +2,8 @@ if UNITTESTS
 include $(top_srcdir)/build/vars.build.mk
 TESTS=unittests
 check_PROGRAMS=unittests
-unittests_SOURCES = unittests.c ../src/utils.c
+unittests_SOURCES = unittests.c
 unittests_CFLAGS  = $(GEANY_CFLAGS) -DUNITTESTS
-unittests_LDADD   = @GEANY_LIBS@ $(INTLLIBS) @CHECK_LIBS@
+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).