summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Friloux <guillaume@friloux.me>2016-07-15 11:11:14 +0200
committerGuillaume Friloux <guillaume@friloux.me>2016-07-15 11:11:14 +0200
commit4d33f4588a6f77ee9a28b127cc1fdceffe0980d9 (patch)
tree97ede514a472efcb8374e219ce540acbede6c223
parent9c4bb650ab2e557a15eca191f6926f0606323794 (diff)
Revert "Still trying to fix cross compilation."
This reverts commit 9c4bb650ab2e557a15eca191f6926f0606323794. This doesnt work.
-rw-r--r--configure.ac3
-rw-r--r--src/bin/azy.mk10
2 files changed, 7 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 0900c6d..4f37f28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -451,6 +451,9 @@ Summary:
451 * prefix..........: $(txt_strip $prefix) 451 * prefix..........: $(txt_strip $prefix)
452 * CFLAGS..........: $(txt_strip $CFLAGS) 452 * CFLAGS..........: $(txt_strip $CFLAGS)
453 * LDFLAGS.........: $(txt_strip $LDFLAGS) 453 * LDFLAGS.........: $(txt_strip $LDFLAGS)
454 * AZY_CFLAGS......: $AZY_CFLAGS
455 * EMAIL_CFLAGS....: $EMAIL_CFLAGS
456 * SHOTGUN_CFLAGS..: $SHOTGUN_CFLAGS
454SUMMARY_EOF 457SUMMARY_EOF
455echo 458echo
456cat << FEATURES_EOF 459cat << FEATURES_EOF
diff --git a/src/bin/azy.mk b/src/bin/azy.mk
index 506cfed..c9087d2 100644
--- a/src/bin/azy.mk
+++ b/src/bin/azy.mk
@@ -15,11 +15,9 @@ src/bin/y.tab.h
15 15
16RE2C_OPTS = -bi -o src/bin/azy_parser.y 16RE2C_OPTS = -bi -o src/bin/azy_parser.y
17 17
18azy_parser = src/bin/azy_parser$(EXEEXT_FOR_BUILD) 18bin_PROGRAMS += src/bin/azy_parser
19 19
20bin_PROGRAMS += azy_parser 20src_bin_azy_parser_SOURCES = \
21
22azy_parser_SOURCES = \
23src/bin/azy/azy.h \ 21src/bin/azy/azy.h \
24src/bin/azy/azy.c \ 22src/bin/azy/azy.c \
25src/bin/azy/azy_parser_main.c \ 23src/bin/azy/azy_parser_main.c \
@@ -27,12 +25,12 @@ src/bin/azy/azy_parser_lib.h \
27src/bin/azy/azy_parser_lib.c \ 25src/bin/azy/azy_parser_lib.c \
28src/bin/azy_parser.y 26src/bin/azy_parser.y
29 27
30azy_parser_CPPFLAGS = \ 28src_bin_azy_parser_CPPFLAGS = \
31$(BIN_CPPFLAGS) \ 29$(BIN_CPPFLAGS) \
32$(AZY_CFLAGS) \ 30$(AZY_CFLAGS) \
33-I$(top_srcdir)/src/bin/azy 31-I$(top_srcdir)/src/bin/azy
34 32
35azy_parser_LDADD = \ 33src_bin_azy_parser_LDADD = \
36$(AZY_LIBS) \ 34$(AZY_LIBS) \
37$(top_builddir)/src/lib/libmaelstrom.la 35$(top_builddir)/src/lib/libmaelstrom.la
38 36