Use the DPI setting within the i3-config-wizard and i3-nagbar (#2585)

[i3/i3] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 21f57e5bfbb40625cf1cd8fc86ec581df6e82f6b..0368ecca83e0ab37588292b6f039e208b38422f2 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,7 +45,10 @@ 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
@@ -91,7 +97,7 @@ EXTRA_DIST = \
        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 \
@@ -398,6 +404,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 +473,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 +517,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 \