Merge pull request #3142 from henricm/fix-for-win-mono_string_to_utf8

[mono.git] / mono / arch / arm / Makefile.am

diff --git a/mono/arch/arm/Makefile.am b/mono/arch/arm/Makefile.am
index 38ab3369c932a43d83b358f68869c1e095e92904..8d2f52782003ea31467289c88cec4ca111c2f4aa 100644 (file)
--- a/mono/arch/arm/Makefile.am
+++ b/mono/arch/arm/Makefile.am
@@ -1,26 +1,18 @@
 
-INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)
+AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
 
-noinst_LTLIBRARIES = libmonoarch-arm.la
-
-BUILT_SOURCES = arm_dpimacros.h arm_fpamacros.h
-
-
-libmonoarch_arm_la_SOURCES = $(BUILT_SOURCES) \
-       tramp.c \
-       arm-codegen.c \
-       arm-codegen.h \
-       arm-dis.c \
-       arm-dis.h
+BUILT_SOURCES = arm_dpimacros.h arm_vfpmacros.h
 
 arm_dpimacros.h: dpiops.sh mov_macros.th dpi_macros.th cmp_macros.th
        (cd $(srcdir); bash ./dpiops.sh) > $@t
        mv $@t $@
 
-arm_fpamacros.h: fpaops.sh fpam_macros.th fpa_macros.th
-       (cd $(srcdir); bash ./fpaops.sh) > $@t
+arm_vfpmacros.h: vfpops.sh vfpm_macros.th vfp_macros.th
+       (cd $(srcdir); bash ./vfpops.sh) > $@t
        mv $@t $@
 
 CLEANFILES = $(BUILT_SOURCES)
 
-EXTRA_DIST = dpiops.sh mov_macros.th dpi_macros.th cmp_macros.th fpam_macros.th fpa_macros.th arm-fpa-codegen.h fpaops.sh
+EXTRA_DIST = arm-codegen.h dpiops.sh mov_macros.th dpi_macros.th cmp_macros.th \
+       vfpm_macros.th vfp_macros.th arm-vfp-codegen.h vfpops.sh
+