X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=blobdiff_plain;f=Makefile.am;h=ee71b7f23c8b7e36a4d5e76affcb6728fc819407;hp=57d5b0192557ad2bdc8e2a224d9a81f415e42d47;hb=HEAD;hpb=f58dde28504cd78267439ec232be9689ff82d47c

diff --git a/Makefile.am b/Makefile.am
index 57d5b019..ee71b7f2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,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
@@ -59,6 +65,24 @@ TESTS = testcases/complete-run.pl
 EXTRA_DIST = \
 	$(dist_docs_toc_DATA:.html=) \
 	$(dist_docs_notoc_DATA:.html=) \
+	AnyEvent-I3/Changes \
+	AnyEvent-I3/MANIFEST \
+	AnyEvent-I3/MANIFEST.SKIP \
+	AnyEvent-I3/Makefile.PL \
+	AnyEvent-I3/README \
+	AnyEvent-I3/lib/AnyEvent/I3.pm \
+	AnyEvent-I3/t/00-load.t \
+	AnyEvent-I3/t/01-workspaces.t \
+	AnyEvent-I3/t/02-sugar.t \
+	AnyEvent-I3/t/boilerplate.t \
+	AnyEvent-I3/t/manifest.t \
+	AnyEvent-I3/t/pod-coverage.t \
+	AnyEvent-I3/t/pod.t \
+	contrib/dump-asy.pl \
+	contrib/gtk-tree-watch.pl \
+	contrib/i3-wsbar \
+	contrib/per-workspace-layout.pl \
+	contrib/trivial-bar-script.sh \
 	docs/asciidoc-git.conf \
 	docs/bigpicture.png \
 	docs/i3-pod2html \
@@ -94,7 +118,7 @@ EXTRA_DIST = \
 	I3_VERSION \
 	LICENSE \
 	PACKAGE-MAINTAINER \
-	RELEASE-NOTES-4.12 \
+	RELEASE-NOTES-4.16.1 \
 	generate-command-parser.pl \
 	parser-specs/commands.spec \
 	parser-specs/config.spec \
@@ -212,6 +236,7 @@ asciidoc_MANS =
 endif
 
 AM_CPPFLAGS = \
+	-DSYSCONFDIR="\"$(sysconfdir)\"" \
 	-I$(top_builddir)/parser \
 	-I$(top_srcdir)/include \
 	@AX_EXTEND_SRCDIR_CPPFLAGS@
@@ -276,6 +301,7 @@ libi3_a_SOURCES = \
 	libi3/fake_configure_notify.c \
 	libi3/font.c \
 	libi3/format_placeholders.c \
+	libi3/g_utf8_make_valid.c \
 	libi3/get_colorpixel.c \
 	libi3/get_config_path.c \
 	libi3/get_exe_path.c \
@@ -332,10 +358,12 @@ i3_msg_i3_msg_SOURCES = \
 
 i3_nagbar_i3_nagbar_CFLAGS = \
 	$(AM_CFLAGS) \
+	$(LIBSN_CFLAGS) \
 	$(libi3_CFLAGS)
 
 i3_nagbar_i3_nagbar_LDADD = \
 	$(libi3_LIBS) \
+	$(LIBSN_LIBS) \
 	$(XCB_UTIL_CURSOR_LIBS)
 
 i3_nagbar_i3_nagbar_SOURCES = \
@@ -389,10 +417,12 @@ i3bar_i3bar_SOURCES = \
 i3_config_wizard_i3_config_wizard_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(libi3_CFLAGS) \
+	$(LIBSN_CFLAGS) \
 	$(XKBCOMMON_CFLAGS)
 
 i3_config_wizard_i3_config_wizard_LDADD = \
 	$(libi3_LIBS) \
+	$(LIBSN_LIBS) \
 	$(XCB_UTIL_KEYSYMS_LIBS) \
 	$(XKBCOMMON_LIBS)
 
@@ -401,6 +431,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
@@ -457,7 +500,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 \
@@ -484,6 +526,7 @@ i3_SOURCES = \
 	include/shmlog.h \
 	include/sighandler.h \
 	include/startup.h \
+	include/sync.h \
 	include/tree.h \
 	include/util.h \
 	include/window.h \
@@ -502,7 +545,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 \
@@ -526,6 +568,7 @@ i3_SOURCES = \
 	src/sd-daemon.c \
 	src/sighandler.c \
 	src/startup.c \
+	src/sync.c \
 	src/tree.c \
 	src/util.c \
 	src/version.c \
@@ -558,6 +601,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