testcases: remove external AnyEvent::I3 dependency

[i3/i3] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7bba241b3f340bf41e71bcfb7a6a0209c4e5d36a..ec28991cf706fa49801df4adf6f7ad3433e8d66e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,8 @@
 @CODE_COVERAGE_RULES@
 
+echo-version:
+       @echo "@I3_VERSION@"
+
 bin_PROGRAMS = \
        i3 \
        i3bar/i3bar \
@@ -42,11 +45,17 @@ dist_xsessions_DATA = \
 
 noinst_LIBRARIES = libi3.a
 
-check_PROGRAMS = test.commands_parser test.config_parser
+check_PROGRAMS = \
+       test.commands_parser \
+       test.config_parser \
+       test.inject_randr15
 
 check_SCRIPTS = \
        testcases/complete-run.pl
 
+check_DATA = \
+       anyevent-i3.stamp
+
 clean-check:
        rm -rf testsuite-* latest i3-cfg-for-* _Inline
 clean-local: clean-check
@@ -86,12 +95,12 @@ EXTRA_DIST = \
        libi3/README \
        $(asciidoc_MANS:.1=.man) \
        $(asciidoc_MANS:.1=.man) \
-       man/asciidoc.conf \
+       man/asciidoc.conf.in \
        DEPENDS \
        I3_VERSION \
        LICENSE \
        PACKAGE-MAINTAINER \
-       RELEASE-NOTES-4.12 \
+       RELEASE-NOTES-4.13 \
        generate-command-parser.pl \
        parser-specs/commands.spec \
        parser-specs/config.spec \
@@ -200,7 +209,7 @@ $(asciidoc_MANS): man/%.1: man/%.xml man/$(dirstamp)
        @stamp='$@'; $(MKDIR_P) "$${stamp%/*}"
 
 man/%.xml: man/%.man man/asciidoc.conf man/$(dirstamp)
-       $(AM_V_GEN) @PATH_ASCIIDOC@ -d manpage -b docbook -f $(top_srcdir)/man/asciidoc.conf -o $@ $<
+       $(AM_V_GEN) @PATH_ASCIIDOC@ -d manpage -b docbook -f $(top_builddir)/man/asciidoc.conf -o $@ $<
 
 $(pod_MANS): man/%.1: % man/$(dirstamp)
        $(AM_V_GEN) @PATH_POD2MAN@ --utf8 $< > $@
@@ -209,6 +218,7 @@ asciidoc_MANS =
 endif
 
 AM_CPPFLAGS = \
+       -DSYSCONFDIR="\"$(sysconfdir)\"" \
        -I$(top_builddir)/parser \
        -I$(top_srcdir)/include \
        @AX_EXTEND_SRCDIR_CPPFLAGS@
@@ -398,6 +408,19 @@ i3_config_wizard_i3_config_wizard_SOURCES = \
        i3-config-wizard/main.c \
        i3-config-wizard/xcb.h
 
+test_inject_randr15_CPPFLAGS = \
+       $(AM_CPPFLAGS)
+
+test_inject_randr15_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(i3_CFLAGS)
+
+test_inject_randr15_SOURCES = \
+       testcases/inject_randr1.5.c
+
+test_inject_randr15_LDADD = \
+       $(i3_LDADD)
+
 test_commands_parser_CPPFLAGS = \
        $(AM_CPPFLAGS) \
        -DTEST_PARSER
@@ -454,7 +477,6 @@ i3_SOURCES = \
        include/config_parser.h \
        include/con.h \
        include/data.h \
-       include/debug.h \
        include/display_version.h \
        include/ewmh.h \
        include/fake_outputs.h \
@@ -499,7 +521,6 @@ i3_SOURCES = \
        src/config.c \
        src/config_directives.c \
        src/config_parser.c \
-       src/debug.c \
        src/display_version.c \
        src/ewmh.c \
        src/fake_outputs.c \
@@ -555,6 +576,15 @@ i3-config-parser.stamp: parser/$(dirstamp) generate-command-parser.pl parser-spe
        $(AM_V_at) mv GENERATED_config_* $(top_builddir)/parser
        $(AM_V_at) touch $@
 
+################################################################################
+# AnyEvent-I3 build process
+################################################################################
+
+anyevent-i3.stamp: generate-command-parser.pl parser-specs/config.spec
+       $(AM_V_BUILD) (cd $(top_srcdir)/AnyEvent-I3 && perl Makefile.PL && make)
+       $(AM_V_at) touch $@
+
 CLEANFILES = \
        i3-command-parser.stamp \
-       i3-config-parser.stamp
+       i3-config-parser.stamp \
+       anyevent-i3.stamp