Merge branch 'next' into master

[i3/i3] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index aea4256b9f04600796bb666b8e86e3ff93a567a0..3ea300e5a71f0b1efa752e95aed59455d68ebef9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,6 +53,9 @@ check_PROGRAMS = \
 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
@@ -97,7 +100,7 @@ EXTRA_DIST = \
        I3_VERSION \
        LICENSE \
        PACKAGE-MAINTAINER \
-       RELEASE-NOTES-4.13 \
+       RELEASE-NOTES-4.14 \
        generate-command-parser.pl \
        parser-specs/commands.spec \
        parser-specs/config.spec \
@@ -215,6 +218,7 @@ asciidoc_MANS =
 endif
 
 AM_CPPFLAGS = \
+       -DSYSCONFDIR="\"$(sysconfdir)\"" \
        -I$(top_builddir)/parser \
        -I$(top_srcdir)/include \
        @AX_EXTEND_SRCDIR_CPPFLAGS@
@@ -473,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 \
@@ -518,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 \
@@ -574,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: AnyEvent-I3/lib/AnyEvent/I3.pm
+       $(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