Completing merge

Makefile_arm

@@ -15,9 +15,9 @@ GPREFIX=
 GDSLFLAGS=
 
 GDSL_BASIS_HL=specifications/basis/prelude.ml specifications/basis/bbtree.ml
-GDSL_RREIL_HL=specifications/rreil/rreil.ml specifications/rreil/rreil-examples.ml specifications/rreil/rreil-cif.ml specifications/rreil/rreil-pretty.ml specifications/rreil/fmap.ml specifications/rreil/rreil-opt.ml specifications/rreil/rreil-translator.ml
-GDSL_ASM_HL=specifications/asm/asm.ml specifications/asm/asm-pretty.ml specifications/asm/asm-cif.ml
-GDSL_OPT_HL=specifications/rreil/rreil-liveness.ml specifications/rreil/rreil-cleanup.ml
+GDSL_RREIL_HL=#specifications/rreil/rreil.ml specifications/rreil/rreil-examples.ml specifications/rreil/rreil-cif.ml specifications/rreil/rreil-pretty.ml specifications/rreil/fmap.ml specifications/rreil/rreil-opt.ml specifications/rreil/rreil-translator.ml
+GDSL_ASM_HL=#specifications/asm/asm.ml specifications/asm/asm-pretty.ml specifications/asm/asm-cif.ml
+GDSL_OPT_HL=#specifications/rreil/rreil-liveness.ml specifications/rreil/rreil-cleanup.ml
 
 GDSL_ARM7_HL=specifications/arm7/arm7.ml specifications/arm7/arm7-pretty.ml # specifications/avr/avr-traverse.ml specifications/avr/avr-pretty.ml specifications/avr/avr-asm.ml
 GDSL_ARM7_TRANS_HL= #specifications/avr/avr-rreil-pretty.ml specifications/avr/avr-rreil-registermapping.ml specifications/avr/avr-rreil-translator.ml specifications/avr/avr-liveness.ml

Makefile_manual

@@ -1,6 +1,6 @@
 include config.mk
 
-archs:=x86 avr mips
+archs:=x86 avr mips arm
 
 $(archs):
 	$(MAKE) -f Makefile_$@