summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Dilly <bdilly@profusion.mobi>2016-10-17 12:26:30 -0200
committerBruno Dilly <bdilly@profusion.mobi>2016-10-17 13:05:44 -0200
commit65575a6c1b9ed8fb3dc2e87735e4a96652d56570 (patch)
tree1ba7906f825f50c73bc978fae52b7326f5f174f6
parent915820886f1f4738f1900be9e240b3f8f5f82925 (diff)
Enable subdir-objects to avoid automake warnings
Avoid warning: src/bin/Makefile.am:18: warning: source file '$(builddir)/game_world.c' is in a subdirectory, src/bin/Makefile.am:18: but option 'subdir-objects' is disabled [...] automake: You are advised to start using 'subdir-objects' option throughout your automake: project, to avoid future incompatibilities.
-rw-r--r--configure.ac2
-rw-r--r--src/bin/Makefile.am4
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index ee55dbf..5a2008d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ AC_CANONICAL_BUILD
27AC_CANONICAL_HOST 27AC_CANONICAL_HOST
28AC_ISC_POSIX 28AC_ISC_POSIX
29 29
30AM_INIT_AUTOMAKE(1.6 dist-bzip2) 30AM_INIT_AUTOMAKE(1.6 dist-bzip2 subdir-objects)
31AC_CONFIG_HEADERS(config.h) 31AC_CONFIG_HEADERS(config.h)
32m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) 32m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
33 33
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 032f699..1e22409 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -16,13 +16,13 @@ bin_PROGRAMS += efbb_ql
16endif 16endif
17 17
18GAME_SOURCES = \ 18GAME_SOURCES = \
19 $(builddir)/game_world.c \ 19 game_world.c \
20 main.c \ 20 main.c \
21 main_screen.c \ 21 main_screen.c \
22 level_select_screen.c \ 22 level_select_screen.c \
23 cannon.c \ 23 cannon.c \
24 sound.c \ 24 sound.c \
25 score.c \ 25 score.c \
26 bg.c 26 bg.c
27 27
28efbb_LDADD = @EFBB_LIBS@ 28efbb_LDADD = @EFBB_LIBS@