Automake

Makefile.am

@@ -181,7 +181,8 @@ GDSL_AVR = \
 GDSL_AVRSEM = \
 	$(srcdir)/specifications/avr/avr-rreil-translator.ml \
 	$(srcdir)/specifications/avr/avr-rreil-registermapping.ml \
-	$(srcdir)/specifications/avr/avr-rreil-pretty.ml
+	$(srcdir)/specifications/avr/avr-rreil-pretty.ml \
+	$(srcdir)/specifications/avr/avr-liveness.ml
 
 GDSL_RREIL = \
 	$(srcdir)/specifications/rreil/fmap.ml \
@@ -673,7 +674,7 @@ sweep_SOURCES = $(srcdir)/tools/sweep.c
 sweep_CFLAGS = -std=gnu99
 sweep_LDFLAGS = -lelf
 
-if X86_RREIL
+if HAVE_RREIL
 liveness_sweep_SOURCES = $(srcdir)/tools/liveness-sweep.c
 liveness_sweep_CFLAGS = -std=gnu99
 liveness_sweep_LDFLAGS = -lelf

configure.ac

@@ -148,7 +148,7 @@ AM_CONDITIONAL([ENV_GDWRAP], true)
 AM_CONDITIONAL([ENV_READHEX], true)
 AM_COND_IF([HAVE_RREIL], [AM_COND_IF([HAVE_ANON_MEMBERS], [AM_COND_IF([HAVE_POSIX200809_C11], [AM_CONDITIONAL([ENV_RREIL_LIB], true)])])])
 AM_CONDITIONAL([ENV_JRREIL], [test x$has_jni = xyes])
-AM_COND_IF([HAVE_X86], [AM_CONDITIONAL([ENV_X86_LIB], true)])
+AM_COND_IF([X86_RREIL], [AM_CONDITIONAL([ENV_X86_LIB], true)])
 AM_COND_IF([X86_RREIL], [AM_COND_IF([HAVE_ANON_MEMBERS], [AM_COND_IF([HAVE_POSIX200809_C11], [AM_COND_IF([HAVE_STDINT_GCC], [AM_CONDITIONAL([ENV_RREIL_SIM], true)])])])])
 AM_COND_IF([X86_RREIL], [AM_COND_IF([HAVE_ANON_MEMBERS], [AM_COND_IF([HAVE_POSIX200809_C11], [AM_CONDITIONAL([ENV_X86_TESTER], true)])])])
 AM_CONDITIONAL([ENV_X86_GENERATOR], true)