Codebase list i3-gaps / ef8935b
autotools: place binaries in top level of build dir, not in subdirs (#4093) meson only supports the top level (no subdirs), so this makes the transition easier. For this to work with autotools, we need to *disable* the subdir-objects option, that autotools wants us to enable for forward-compatibility. This results in a bunch of warnings at autoreconf-time, but we don’t care, given that we intend to switch away from autotools. Both build systems working next to each other (as best as they can) is more important. related to #4086 Michael Stapelberg authored 3 years ago GitHub committed 3 years ago
4 changed file(s) with 39 addition(s) and 45 deletion(s). Raw diff Collapse all Expand all
+26
-26
Makefile.am less more
44
55 bin_PROGRAMS = \
66 i3 \
7 i3bar/i3bar \
8 i3-config-wizard/i3-config-wizard \
9 i3-dump-log/i3-dump-log \
10 i3-input/i3-input \
11 i3-msg/i3-msg \
12 i3-nagbar/i3-nagbar
7 i3bar \
8 i3-config-wizard \
9 i3-dump-log \
10 i3-input \
11 i3-msg \
12 i3-nagbar
1313
1414 install-exec-hook:
1515 $(LN_S) -f i3 $(DESTDIR)$(bindir)/i3-with-shmlog
330330 libi3/strndup.c \
331331 libi3/ucs2_conversion.c
332332
333 i3_dump_log_i3_dump_log_CFLAGS = \
333 i3_dump_log_CFLAGS = \
334334 $(AM_CFLAGS) \
335335 $(PTHREAD_CFLAGS) \
336336 $(libi3_CFLAGS)
337337
338 i3_dump_log_i3_dump_log_LDADD = \
338 i3_dump_log_LDADD = \
339339 $(PTHREAD_LIBS) \
340340 $(libi3_LIBS)
341341
342 i3_dump_log_i3_dump_log_SOURCES = \
342 i3_dump_log_SOURCES = \
343343 i3-dump-log/main.c
344344
345 i3_input_i3_input_CFLAGS = \
345 i3_input_CFLAGS = \
346346 $(AM_CFLAGS) \
347347 $(libi3_CFLAGS)
348348
349 i3_input_i3_input_LDADD = \
349 i3_input_LDADD = \
350350 $(libi3_LIBS) \
351351 $(XCB_UTIL_KEYSYMS_LIBS)
352352
353 i3_input_i3_input_SOURCES = \
353 i3_input_SOURCES = \
354354 i3-input/i3-input.h \
355355 i3-input/keysym2ucs.c \
356356 i3-input/keysym2ucs.h \
357357 i3-input/main.c
358358
359 i3_msg_i3_msg_CFLAGS = \
359 i3_msg_CFLAGS = \
360360 $(AM_CFLAGS) \
361361 $(libi3_CFLAGS)
362362
363 i3_msg_i3_msg_LDADD = \
363 i3_msg_LDADD = \
364364 $(libi3_LIBS)
365365
366 i3_msg_i3_msg_SOURCES = \
366 i3_msg_SOURCES = \
367367 i3-msg/main.c
368368
369 i3_nagbar_i3_nagbar_CFLAGS = \
369 i3_nagbar_CFLAGS = \
370370 $(AM_CFLAGS) \
371371 $(LIBSN_CFLAGS) \
372372 $(libi3_CFLAGS)
373373
374 i3_nagbar_i3_nagbar_LDADD = \
374 i3_nagbar_LDADD = \
375375 $(libi3_LIBS) \
376376 $(LIBSN_LIBS) \
377377 $(XCB_UTIL_CURSOR_LIBS)
378378
379 i3_nagbar_i3_nagbar_SOURCES = \
379 i3_nagbar_SOURCES = \
380380 i3-nagbar/i3-nagbar-atoms.xmacro.h \
381381 i3-nagbar/main.c
382382
383 i3bar_i3bar_CPPFLAGS = \
383 i3bar_CPPFLAGS = \
384384 $(AM_CPPFLAGS) \
385385 -I$(top_srcdir)/i3bar/include
386386
387 i3bar_i3bar_CFLAGS = \
387 i3bar_CFLAGS = \
388388 $(AM_CFLAGS) \
389389 $(libi3_CFLAGS) \
390390 $(XCB_CFLAGS) \
392392 $(PANGOCAIRO_CFLAGS) \
393393 $(YAJL_CFLAGS)
394394
395 i3bar_i3bar_LDADD = \
395 i3bar_LDADD = \
396396 $(libi3_LIBS) \
397397 $(XCB_LIBS) \
398398 $(XCB_UTIL_CURSOR_LIBS) \
400400 $(PANGOCAIRO_LIBS) \
401401 $(YAJL_LIBS)
402402
403 i3bar_i3bar_SOURCES = \
403 i3bar_SOURCES = \
404404 i3bar/include/child.h \
405405 i3bar/include/common.h \
406406 i3bar/include/configuration.h \
423423 i3bar/src/workspaces.c \
424424 i3bar/src/xcb.c
425425
426 i3_config_wizard_i3_config_wizard_CFLAGS = \
426 i3_config_wizard_CFLAGS = \
427427 $(AM_CFLAGS) \
428428 $(libi3_CFLAGS) \
429429 $(LIBSN_CFLAGS) \
430430 $(XKBCOMMON_CFLAGS)
431431
432 i3_config_wizard_i3_config_wizard_LDADD = \
432 i3_config_wizard_LDADD = \
433433 $(libi3_LIBS) \
434434 $(LIBSN_LIBS) \
435435 $(XCB_UTIL_KEYSYMS_LIBS) \
436436 $(XKBCOMMON_LIBS)
437437
438 i3_config_wizard_i3_config_wizard_SOURCES = \
438 i3_config_wizard_SOURCES = \
439439 i3-config-wizard/i3-config-wizard-atoms.xmacro.h \
440440 i3-config-wizard/main.c \
441441 i3-config-wizard/xcb.h
442442
443 i3_config_wizard_i3_config_wizard_DEPENDENCIES = \
443 i3_config_wizard_DEPENDENCIES = \
444444 $(top_builddir)/libi3.a
445445
446446 test_inject_randr15_CPPFLAGS = \
+1
-1
configure.ac less more
44 AC_INIT([i3], [4.18.1], [https://github.com/i3/i3/issues])
55 # For AX_EXTEND_SRCDIR
66 AX_ENABLE_BUILDDIR
7 AM_INIT_AUTOMAKE([foreign subdir-objects -Wall no-dist-gzip dist-bzip2])
7 AM_INIT_AUTOMAKE([foreign -Wall no-dist-gzip dist-bzip2])
88 # Default to silent rules, use V=1 to get verbose compilation output.
99 AM_SILENT_RULES([yes])
1010 # Make it possible to disable maintainer mode to disable re-generation of build
+6
-12
testcases/complete-run.pl.in less more
7777 # Check for missing executables
7878 my @binaries = qw(
7979 @abs_top_builddir@/i3
80 @abs_top_builddir@/i3bar/i3bar
81 @abs_top_builddir@/i3-config-wizard/i3-config-wizard
82 @abs_top_builddir@/i3-dump-log/i3-dump-log
83 @abs_top_builddir@/i3-input/i3-input
84 @abs_top_builddir@/i3-msg/i3-msg
85 @abs_top_builddir@/i3-nagbar/i3-nagbar
80 @abs_top_builddir@/i3bar
81 @abs_top_builddir@/i3-config-wizard
82 @abs_top_builddir@/i3-dump-log
83 @abs_top_builddir@/i3-input
84 @abs_top_builddir@/i3-msg
85 @abs_top_builddir@/i3-nagbar
8686 );
8787
8888 foreach my $binary (@binaries) {
102102 }
103103
104104 $ENV{PATH} = join(':',
105 '@abs_top_builddir@/i3-nagbar',
106 '@abs_top_builddir@/i3-msg',
107 '@abs_top_builddir@/i3-input',
108 '@abs_top_builddir@/i3-dump-log',
109 '@abs_top_builddir@/i3-config-wizard',
110 '@abs_top_builddir@/i3bar',
111105 '@abs_top_builddir@',
112106 '@abs_top_srcdir@',
113107 $ENV{PATH});
+6
-6
travis/check-spelling.pl less more
3232 };
3333 my @binaries = qw(
3434 build/i3
35 build/i3-config-wizard/i3-config-wizard
36 build/i3-dump-log/i3-dump-log
37 build/i3-input/i3-input
38 build/i3-msg/i3-msg
39 build/i3-nagbar/i3-nagbar
40 build/i3bar/i3bar
35 build/i3-config-wizard
36 build/i3-dump-log
37 build/i3-input
38 build/i3-msg
39 build/i3-nagbar
40 build/i3bar
4141 );
4242 for my $binary (@binaries) {
4343 check_spelling(slurp($binary), $binary_spelling_exceptions, sub {