Merge pull request #1843 from info-lvsys/patch-1

[mono.git] / mcs / build / executable.make

diff --git a/mcs/build/executable.make b/mcs/build/executable.make
index 2bf3eb9d5c32e26ee0b05fe993aa3b08f6ebf1d2..7ac3b33846239297cc064116a273e3035c542d00 100644 (file)
--- a/mcs/build/executable.make
+++ b/mcs/build/executable.make
@@ -11,8 +11,6 @@ ifndef base_prog_config
 base_prog_config := $(wildcard $(base_prog).config)
 endif
 
-executable_CLEAN_FILES = *.exe $(PROGRAM) $(PROGRAM).mdb $(BUILT_SOURCES)
-
 ifeq (cat,$(PLATFORM_CHANGE_SEPARATOR_CMD))
 response = $(sourcefile)
 else
@@ -36,10 +34,10 @@ endif
 the_lib = $(the_libdir)$(base_prog)
 build_lib = $(build_libdir)$(base_prog)
 
+executable_CLEAN_FILES += $(the_lib)   $(the_lib).so   $(the_lib).mdb   $(the_lib:.exe=.pdb)
+executable_CLEAN_FILES += $(build_lib) $(build_lib).so $(build_lib).mdb $(build_lib:.exe=.pdb)
+
 makefrag = $(depsdir)/$(PROFILE)_$(base_prog).makefrag
-pdb = $(patsubst %.exe,%.pdb,$(PROGRAM))
-mdb = $(patsubst %.exe,%.mdb,$(PROGRAM))
-executable_CLEAN_FILES += $(makefrag) $(pdb) $(mdb)
 
 all-local: $(the_lib) $(PROGRAM_config)
 
@@ -151,11 +149,12 @@ csproj-local:
        config_file=`basename $(PROGRAM) .exe`-$(PROFILE).input; \
        echo $(thisdir):$$config_file >> $(topdir)/../msvc/scripts/order; \
        (echo $(is_boot); \
-       echo $(MCS);    \
-       echo $(USE_MCS_FLAGS) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS); \
+       echo $(USE_MCS_FLAGS) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) $(patsubst %,-r:%,$(LIB_REFS)); \
        echo $(PROGRAM); \
        echo $(BUILT_SOURCES_cmdline); \
        echo $(build_lib); \
+       echo $(FRAMEWORK_VERSION); \
+       echo $(PROFILE); \
        echo $(response)) > $(topdir)/../msvc/scripts/inputs/$$config_file
 
 
@@ -167,3 +166,6 @@ $(makefrag): $(topdir)/build/executable.make $(depsdir)/.stamp
 doc-update-local:
        @:
 
+# Need to be here so it comes after the definition of DEP_DIRS/DEP_LIBS
+gen-deps:
+       @echo "$(DEPS_TARGET_DIR): $(DEP_DIRS) $(DEP_LIBS)" >> $(DEPS_FILE)