Branch: refs/heads/master Author: Frank Lanitz frank@frank.uvena.de Committer: Frank Lanitz frank@frank.uvena.de Date: Tue, 10 Mar 2015 22:10:21 UTC Commit: 524586adeedc2b8f7851b7d4f7e5edfd4bfcd9b7 https://github.com/geany/geany-plugins/commit/524586adeedc2b8f7851b7d4f7e5ed...
Log Message: ----------- Merge pull request #198 from b4n/autotools/subdir-objects
Autotools: Enable subdir-objects option
Modified Paths: -------------- build/geanyprj.m4 build/geanyvc.m4 configure.ac 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: 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/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 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)
+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 8 lines changed, 0 insertions(+), 8 deletions(-) =================================================================== @@ -1,8 +0,0 @@ -if UNITTESTS -include $(top_srcdir)/build/vars.build.mk -TESTS=unittests -check_PROGRAMS=unittests -unittests_SOURCES = unittests.c ../src/utils.c -unittests_CFLAGS = $(GEANY_CFLAGS) -I$(srcdir)/../src -DUNITTESTS -unittests_LDADD = @GEANY_LIBS@ $(INTLLIBS) @CHECK_LIBS@ -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 8 lines changed, 8 insertions(+), 0 deletions(-) =================================================================== @@ -22,4 +22,12 @@ geanyvc_la_LIBADD = \ $(GTKSPELL_LIBS) \ $(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 8 lines changed, 0 insertions(+), 8 deletions(-) =================================================================== @@ -1,8 +0,0 @@ -if UNITTESTS -include $(top_srcdir)/build/vars.build.mk -TESTS=unittests -check_PROGRAMS=unittests -unittests_SOURCES = unittests.c ../src/utils.c -unittests_CFLAGS = $(GEANY_CFLAGS) -DUNITTESTS -unittests_LDADD = @GEANY_LIBS@ $(INTLLIBS) @CHECK_LIBS@ -endif
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).