* COMException.cs: Added missing colon in ToString.

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

diff --git a/mcs/build/executable.make b/mcs/build/executable.make
index 1ad575b5b263452954c28336393c70da3166cc35..f3113385a5ccf9c7cd8eeb44b56a3e17ce7246c2 100644 (file)
--- a/mcs/build/executable.make
+++ b/mcs/build/executable.make
@@ -2,9 +2,13 @@
 #
 # The rules for building a program.
 
-base_prog = $(shell basename $(PROGRAM))
+base_prog = $(notdir $(PROGRAM))
+prog_dir := $(filter-out . ./, $(dir $(PROGRAM)))
 sourcefile = $(base_prog).sources
+base_prog_config := $(wildcard $(base_prog).config.$(PROFILE))
+ifndef base_prog_config
 base_prog_config := $(wildcard $(base_prog).config)
+endif
 ifdef base_prog_config
 PROGRAM_config := $(PROGRAM).config
 endif
@@ -18,39 +22,48 @@ response = $(depsdir)/$(base_prog).response
 executable_CLEAN_FILES += $(response)
 endif
 
-makefrag = $(depsdir)/$(base_prog).makefrag
+ifdef KEEP_OUTPUT_FILE_COPY
+       COPY_CMD = cp
+else
+       COPY_CMD = mv
+endif
+
+makefrag = $(depsdir)/$(PROFILE)_$(base_prog).makefrag
 pdb = $(patsubst %.exe,%.pdb,$(PROGRAM))
 mdb = $(patsubst %.exe,%.mdb,$(PROGRAM))
 executable_CLEAN_FILES += $(makefrag) $(pdb) $(mdb)
 
 all-local: $(PROGRAM) $(PROGRAM_config)
 
+install-local: all-local
+test-local: all-local
+uninstall-local:
+
 ifdef NO_INSTALL
 install-local uninstall-local:
        @:
 else
 
 ifndef PROGRAM_INSTALL_DIR
-PROGRAM_INSTALL_DIR = $(prefix)/bin
+PROGRAM_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
 endif
 
-
 install-local: $(PROGRAM) $(PROGRAM_config)
        $(MKINSTALLDIRS) $(DESTDIR)$(PROGRAM_INSTALL_DIR)
        $(INSTALL_BIN) $(PROGRAM) $(DESTDIR)$(PROGRAM_INSTALL_DIR)
-       -$(INSTALL_BIN) $(PROGRAM).mdb $(DESTDIR)$(PROGRAM_INSTALL_DIR)
+       test ! -f $(PROGRAM).mdb || $(INSTALL_BIN) $(PROGRAM).mdb $(DESTDIR)$(PROGRAM_INSTALL_DIR)
 ifdef PROGRAM_config
        $(INSTALL_DATA) $(PROGRAM_config) $(DESTDIR)$(PROGRAM_INSTALL_DIR)
 endif
 
 uninstall-local:
-       -rm -f $(DESTDIR)$(PROGRAM_INSTALL_DIR)/$(base_prog) $(DESTDIR)$(PROGRAM_INSTALL_DIR)/$(base_prog).mdb
+       -rm -f $(DESTDIR)$(PROGRAM_INSTALL_DIR)/$(base_prog) $(DESTDIR)$(PROGRAM_INSTALL_DIR)/$(base_prog).mdb $(DESTDIR)$(PROGRAM_INSTALL_DIR)/$(base_prog).config
 endif
 
 clean-local:
        -rm -f $(executable_CLEAN_FILES) $(CLEAN_FILES)
 
-test-local: $(PROGRAM)
+test-local:
        @:
 run-test-local:
        @:
@@ -61,19 +74,30 @@ DISTFILES = $(sourcefile) $(base_prog_config) $(EXTRA_DISTFILES)
 
 dist-local: dist-default
        for f in `cat $(sourcefile)` ; do \
-           dest=`dirname $(distdir)/$$f` ; \
-           $(MKINSTALLDIRS) $$dest && cp -p $$f $$dest || exit 1 ; \
-       done
+         case $$f in \
+         ../*) : ;; \
+         *) dest=`dirname $$f` ; \
+            case $$subs in *" $$dest "*) : ;; *) subs=" $$dest$$subs" ; $(MKINSTALLDIRS) $(distdir)/$$dest ;; esac ; \
+            cp -p $$f $(distdir)/$$dest || exit 1 ;; \
+         esac ; done ; \
+       for d in . $$subs ; do \
+         case $$d in .) : ;; *) test ! -f $$d/ChangeLog || cp -p $$d/ChangeLog $(distdir)/$$d ;; esac ; done
 
 ifndef PROGRAM_COMPILE
 PROGRAM_COMPILE = $(CSCOMPILE)
 endif
 
-$(PROGRAM): $(BUILT_SOURCES) $(EXTRA_SOURCES) $(response)
-       $(PROGRAM_COMPILE) /target:exe /out:$(base_prog) $(BUILT_SOURCES) $(EXTRA_SOURCES) @$(response)
+ifdef prog_dir
+$(prog_dir)/.stamp:
+       $(MKINSTALLDIRS) $(@D)
+       touch $@
+endif
+
+$(PROGRAM): $(BUILT_SOURCES) $(EXTRA_SOURCES) $(response) $(prog_dir:=/.stamp)
+       $(PROGRAM_COMPILE) -target:exe -out:$(base_prog) $(BUILT_SOURCES) $(EXTRA_SOURCES) @$(response)
 ifneq ($(base_prog),$(PROGRAM))
-       mv $(base_prog) $(PROGRAM)
-       -mv $(base_prog).mdb $(PROGRAM).mdb
+       $(COPY_CMD) $(base_prog) $(PROGRAM)
+       test ! -f $(base_prog).mdb || $(COPY_CMD) $(base_prog).mdb $(PROGRAM).mdb
 endif
 
 ifdef PROGRAM_config
@@ -97,4 +121,8 @@ endif
 -include $(makefrag)
 
 all-local: $(makefrag)
-$(makefrag): $(topdir)/build/executable.make
+
+ifneq ($(response),$(sourcefile))
+$(response): $(topdir)/build/executable.make $(depsdir)/.stamp
+endif
+$(makefrag): $(topdir)/build/executable.make $(depsdir)/.stamp