X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2FMakefile.am;h=2f760792a510e13512f905ef39e1034a57f111e0;hb=56a1881bff83365978e7eb30d18da8809b56c1e2;hp=95867a3e4ca4fe233f645b950b6b8e59fbd8fac8;hpb=f99af5280e2b96da9d14e62508b6ef9641627d55;p=mono.git diff --git a/mono/metadata/Makefile.am b/mono/metadata/Makefile.am index 95867a3e4ca..2f760792a51 100644 --- a/mono/metadata/Makefile.am +++ b/mono/metadata/Makefile.am @@ -63,10 +63,6 @@ if PLATFORM_ANDROID platform_sources += ../../support/libm/complex.c endif -# -# libtool is not capable of creating static/shared versions of the same -# convenience lib, so we have to do it ourselves -# if SUPPORT_SGEN if DISABLE_EXECUTABLES shared_sgen_libraries = libmonoruntimesgen.la @@ -75,7 +71,7 @@ if SHARED_MONO shared_sgen_libraries = libmonoruntimesgen.la endif endif -sgen_libraries = $(shared_sgen_libraries) libmonoruntimesgen-static.la +sgen_libraries = $(shared_sgen_libraries) endif if SUPPORT_BOEHM @@ -86,7 +82,7 @@ if SHARED_MONO shared_boehm_libraries = libmonoruntime.la endif endif -boehm_libraries = $(shared_boehm_libraries) libmonoruntime-static.la +boehm_libraries = $(shared_boehm_libraries) endif if DISABLE_EXECUTABLES @@ -317,16 +313,6 @@ libmonoruntimesgen_la_SOURCES = $(common_sources) $(gc_dependent_sources) $(sgen libmonoruntimesgen_la_CFLAGS = $(SGEN_DEFINES) libmonoruntimesgen_la_LIBADD = libmonoruntime-config.la -libmonoruntime_static_la_SOURCES = $(libmonoruntime_la_SOURCES) -libmonoruntime_static_la_LDFLAGS = -static -libmonoruntime_static_la_CFLAGS = $(BOEHM_DEFINES) -libmonoruntime_static_la_LIBADD = $(bundle_obj) libmonoruntime-config.la - -libmonoruntimesgen_static_la_SOURCES = $(libmonoruntimesgen_la_SOURCES) -libmonoruntimesgen_static_la_LDFLAGS = -static -libmonoruntimesgen_static_la_CFLAGS = $(SGEN_DEFINES) -libmonoruntimesgen_static_la_LIBADD = libmonoruntime-config.la - libmonoruntimeincludedir = $(includedir)/mono-$(API_VER)/mono/metadata libmonoruntimeinclude_HEADERS = \