X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fbuild%2Fexecutable.make;h=1a9ffab0e7f5d774e95bc328d436941d260fc7c0;hb=256e3ee192da85cf7c09a3890c06f7bc448ac817;hp=29ba89909e6d397d8d2012a09999717af7561526;hpb=1af57bfcb6d04d43043a122a92e4c6d880f9acf0;p=mono.git diff --git a/mcs/build/executable.make b/mcs/build/executable.make index 29ba89909e6..1a9ffab0e7f 100644 --- a/mcs/build/executable.make +++ b/mcs/build/executable.make @@ -42,7 +42,12 @@ executable_CLEAN_FILES += $(build_lib) $(build_lib).so $(build_lib).mdb $(build_ makefrag = $(depsdir)/$(PROFILE)_$(base_prog).makefrag +MCS_REFERENCES = $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE)/%.dll,$(LIB_REFS)) +MCS_REFERENCES += $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE)/%.exe,$(EXE_REFS)) + +ifndef NO_BUILD all-local: $(the_lib) $(PROGRAM_config) +endif install-local: all-local test-local: all-local @@ -61,6 +66,7 @@ install-local: $(MKINSTALLDIRS) $(DESTDIR)$(PROGRAM_INSTALL_DIR) $(INSTALL_BIN) $(the_lib) $(DESTDIR)$(PROGRAM_INSTALL_DIR) test ! -f $(the_lib).mdb || $(INSTALL_BIN) $(the_lib).mdb $(DESTDIR)$(PROGRAM_INSTALL_DIR) + test ! -f $(the_lib:.exe=.pdb) || $(INSTALL_BIN) $(the_lib:.exe=.pdb) $(DESTDIR)$(PROGRAM_INSTALL_DIR) ifdef PROGRAM_config $(INSTALL_DATA) $(PROGRAM_config) $(DESTDIR)$(PROGRAM_INSTALL_DIR) endif @@ -69,7 +75,8 @@ ifdef PLATFORM_AOT_SUFFIX endif uninstall-local: - -rm -f $(DESTDIR)$(PROGRAM_INSTALL_DIR)/$(base_prog) $(DESTDIR)$(PROGRAM_INSTALL_DIR)/$(base_prog).mdb $(DESTDIR)$(PROGRAM_INSTALL_DIR)/$(base_prog).config + -rm -f $(DESTDIR)$(PROGRAM_INSTALL_DIR)/$(base_prog) $(DESTDIR)$(PROGRAM_INSTALL_DIR)/$(base_prog).mdb \ + $(DESTDIR)$(PROGRAM_INSTALL_DIR)/$(base_prog:.exe=.pdb) $(DESTDIR)$(PROGRAM_INSTALL_DIR)/$(base_prog).config endif clean-local: @@ -149,11 +156,17 @@ endif -include $(makefrag) -MCS_REFERENCES = $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE)/%.dll,$(LIB_REFS)) -MCS_REFERENCES += $(patsubst %,-r:$(topdir)/class/lib/$(PROFILE)/%.exe,$(EXE_REFS)) - all-local: $(makefrag) $(extra_targets) +ifdef BUILT_SOURCES +library_CLEAN_FILES += $(BUILT_SOURCES) +ifeq (cat, $(PLATFORM_CHANGE_SEPARATOR_CMD)) +BUILT_SOURCES_cmdline = $(BUILT_SOURCES) +else +BUILT_SOURCES_cmdline = `echo $(BUILT_SOURCES) | $(PLATFORM_CHANGE_SEPARATOR_CMD)` +endif +endif + csproj-local: config_file=`basename $(PROGRAM) .exe`-$(PROFILE).input; \ echo $(thisdir):$$config_file >> $(topdir)/../msvc/scripts/order; \ @@ -164,6 +177,7 @@ csproj-local: echo $(build_lib); \ echo $(FRAMEWORK_VERSION); \ echo $(PROFILE); \ + echo $(RESOURCE_DEFS); \ echo $(response)) > $(topdir)/../msvc/scripts/inputs/$$config_file