summaryrefslogtreecommitdiffstats
path: root/libcpu
diff options
context:
space:
mode:
Diffstat (limited to 'libcpu')
-rw-r--r--libcpu/ChangeLog4
-rw-r--r--libcpu/Makefile.am8
2 files changed, 11 insertions, 1 deletions
diff --git a/libcpu/ChangeLog b/libcpu/ChangeLog
index 7fe43455..9235b1b1 100644
--- a/libcpu/ChangeLog
+++ b/libcpu/ChangeLog
@@ -1,3 +1,7 @@
+2017-02-21 Ulf Hermann <[email protected]>
+
+ * Makefile.am: Link gendis agaist libgnu.a if requested.
+
2017-04-20 Ulf Hermann <[email protected]>
* Makefile.am: Add EXEEXT to gendis.
diff --git a/libcpu/Makefile.am b/libcpu/Makefile.am
index 31fc906b..30a67997 100644
--- a/libcpu/Makefile.am
+++ b/libcpu/Makefile.am
@@ -80,11 +80,17 @@ i386_lex_no_Werror = yes
libeu = ../lib/libeu.a
+if USE_GNULIB
+libgnu = ../libgnu/libgnu.a
+else
+libgnu =
+endif
+
i386_lex_CFLAGS = -Wno-unused-label -Wno-unused-function -Wno-sign-compare
i386_parse.o: i386_parse.c i386.mnemonics
i386_parse_CFLAGS = -DNMNES="`wc -l < i386.mnemonics`"
i386_lex.o: i386_parse.h
-i386_gendis_LDADD = $(libeu) -lm
+i386_gendis_LDADD = $(libeu) $(libgnu) -lm
i386_parse.h: i386_parse.c ;