Added uninstall target

svn path=/trunk/mcs/; revision=19177

diff --git a/mcs/Makefile b/mcs/Makefile
index cbc7d15733e134c05524267fcb136c99ea03d875..95600a6364cabb5058c5bcd10fe1265a475e895d 100644 (file)
--- a/mcs/Makefile
+++ b/mcs/Makefile
@@ -9,6 +9,8 @@ all: platform-check profile-check all-recursive #all-local
 
 install: platform-check profile-check install-recursive #install-local
 
+uninstall: platform-check profile-check uninstall-recursive #uninstall-local
+
 test: platform-check profile-check test-recursive #test-local
 
 run-test: run-test-recursive #run-test-local
@@ -71,8 +73,8 @@ distcheck:
        $(MAKE) dist-tarball || exit 1 ; \
        mv $(package) Distcheck-MCS ; \
        (cd Distcheck-MCS && \
-           make prefix=$(prefix) && make test && make install DESTDIR="$$destdir" && \
-           make clean && make dist || exit 1) || exit 1 ; \
+           $(MAKE) prefix=$(prefix) && $(MAKE) test && $(MAKE) install DESTDIR="$$destdir" && \
+           $(MAKE) clean && $(MAKE) dist || exit 1) || exit 1 ; \
        mv Distcheck-MCS $(package) ; \
        tar tzf $(package)/$(package).tar.gz |sed -e 's,/$$,,' |sort >distdist.list ; \
        rm $(package)/$(package).tar.gz ; \

diff --git a/mcs/build/Makefile b/mcs/build/Makefile
index dce9013108242c26e646ce210d7465bc18fcd016..a2182bdc29f3da6b8b6503b86d8a41fba7fc02fe 100644 (file)
--- a/mcs/build/Makefile
+++ b/mcs/build/Makefile
@@ -2,7 +2,7 @@ thisdir = build
 SUBDIRS = 
 include ../build/rules.make
 
-all-local install-local test-local run-test-local clean-local:
+all-local install-local test-local run-test-local clean-local uninstall-local:
 
 DISTFILES = \
        README.makefiles                \

diff --git a/mcs/build/executable.make b/mcs/build/executable.make
index f08c4f65a092a849e27284340b2b4e7ee8f8d4ec..156134b28ead93b8392d4f529cb509a69b0ebf59 100644 (file)
--- a/mcs/build/executable.make
+++ b/mcs/build/executable.make
@@ -23,6 +23,9 @@ install-local: $(PROGRAM)
        $(MKINSTALLDIRS) $(DESTDIR)$(prefix)/bin
        $(INSTALL_BIN) $(PROGRAM) $(DESTDIR)$(prefix)/bin
 
+uninstall-local:
+       -rm -f $(DESTDIR)$(prefix)/bin/$(base_prog)
+
 clean-local:
        -rm -f *.exe $(BUILT_SOURCES) $(CLEAN_FILES) $(pdb) $(stampfile) $(makefrag)
 ifdef PLATFORM_CHANGE_SEPARATOR_CMD

diff --git a/mcs/build/library.make b/mcs/build/library.make
index c1fd6436c5c2231f58db3c864464f8f8cf8fe25a..a4c776f564a65017604669c20f919b65437932a0 100644 (file)
--- a/mcs/build/library.make
+++ b/mcs/build/library.make
@@ -35,6 +35,9 @@ install-local: $(the_lib)
        $(MKINSTALLDIRS) $(DESTDIR)$(prefix)/lib
        $(INSTALL_LIB) $(the_lib) $(DESTDIR)$(prefix)/lib
 
+uninstall-local:
+       -rm -f $(DESTDIR)$(prefix)/lib/$(LIBRARY)
+
 clean-local:
        -rm -f $(the_lib) $(makefrag) $(test_lib) \
               $(test_makefrag) $(test_response) \

diff --git a/mcs/build/rules.make b/mcs/build/rules.make
index 759573072826111e65efb88184c147b449bc089d..8f3d2ac7c06c7133a461044deb8416af26ef3b9d 100644 (file)
--- a/mcs/build/rules.make
+++ b/mcs/build/rules.make
@@ -13,7 +13,7 @@
 dots := $(shell echo $(thisdir) |sed -e 's,[^./][^/]*,..,g')
 topdir := $(dots)
 
-VERSION = 0.26.99
+VERSION = 0.28.99
 
 USE_MCS_FLAGS = $(LOCAL_MCS_FLAGS) $(PLATFORM_MCS_FLAGS) $(PROFILE_MCS_FLAGS) $(MCS_FLAGS)
 USE_CFLAGS = $(LOCAL_CFLAGS) $(CFLAGS)
@@ -120,6 +120,8 @@ run-test: run-test-recursive test-local run-test-local
 
 clean: clean-recursive clean-local
 
+uninstall: uninstall-recursive uninstall-local
+
 endif
 
 # Can only do this from the top dir

diff --git a/mcs/class/I18N/Makefile b/mcs/class/I18N/Makefile
index 37e55f8e12284edf596495b471e1755bd260ea24..71a63e55d7dcbea10cf87b263dbe323f8f5ed34c 100644 (file)
--- a/mcs/class/I18N/Makefile
+++ b/mcs/class/I18N/Makefile
@@ -10,6 +10,6 @@ DISTFILES = \
        tools/ucm2cp.c  \
        tools/uni2tab.c
 
-all-local install-local clean-local test-local run-test-local:
+all-local install-local clean-local test-local run-test-local uninstall-local:
 
 dist-local: dist-default

diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index 72b4dde6870e943bb9055ae81a8421893da77e89..31fe86b6bb18a44c75990e25be2973efea3cfa24 100644 (file)
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -83,7 +83,7 @@ DISTFILES = \
        doc/notes               \
        notes/BitVecto32.txt
 
-all-local install-local test-local run-test-local clean-local:
+all-local install-local test-local run-test-local clean-local uninstall-local:
 
 dist-local: dist-default
        -mkdir $(distdir)/lib

diff --git a/mcs/class/Mono.Security.Tls/Makefile b/mcs/class/Mono.Security.Tls/Makefile
index 4a2c6adeece5a65ff58bbbfde2342d899f6b39e6..2565127eb318a705439bb2274f2c9e545aed1abb 100644 (file)
--- a/mcs/class/Mono.Security.Tls/Makefile
+++ b/mcs/class/Mono.Security.Tls/Makefile
@@ -11,6 +11,9 @@ install:
        $(MKINSTALLDIRS) $(DESTDIR)$(prefix)/lib
        $(INSTALL_LIB) $(LIBRARY) $(DESTDIR)$(prefix)/lib
 
+uninstall:
+       -rm -f $(DESTDIR)$(prefix)/lib/$(LIBRARY)
+
 test:
 
 run-test:

diff --git a/mcs/class/Npgsql/Makefile b/mcs/class/Npgsql/Makefile
index 32570cfa5247615943cf083cb42492c98b7c3648..9fb7d5451292328bf9720141805f96130849f04e 100755 (executable)
--- a/mcs/class/Npgsql/Makefile
+++ b/mcs/class/Npgsql/Makefile
@@ -59,3 +59,6 @@ all: $(RESX_RES) $(the_lib)
 clean: clean-recursive clean-local
 
 install: install-recursive install-local
+
+uninstall: uninstall-recursive uninstall-local
+

diff --git a/mcs/class/System.Web/Test/Makefile b/mcs/class/System.Web/Test/Makefile
index 4f9c28f3587dffe45b2d1e868e1d0658e94b7ed5..6c5aa5f29ed3130ba766f0a16df7d8e64933cf12 100644 (file)
--- a/mcs/class/System.Web/Test/Makefile
+++ b/mcs/class/System.Web/Test/Makefile
@@ -2,7 +2,7 @@ thisdir = class/System.Web/Test
 SUBDIRS = TestMonoWeb
 include ../../../build/rules.make
 
-all-local install-local clean-local test-local run-test-local:
+all-local install-local clean-local test-local run-test-local uninstall-local:
 
 DISTFILES = DataBinderTests.cs $(wildcard *.aspx)
 

diff --git a/mcs/class/System.Web/Test/TestMonoWeb/Makefile b/mcs/class/System.Web/Test/TestMonoWeb/Makefile
index 96ac026685265eb3eb31a14d5607a45df6974026..20dac100f5cafa2d6b9657532ea692c3e6a2a6eb 100644 (file)
--- a/mcs/class/System.Web/Test/TestMonoWeb/Makefile
+++ b/mcs/class/System.Web/Test/TestMonoWeb/Makefile
@@ -6,7 +6,7 @@ LOCAL_MCS_FLAGS = /nowarn:0168 /nowarn:0162 /unsafe \
  /noconfig /r:System.dll /r:System.Web.dll \
  /r:System.Drawing.dll /r:System.Xml.dll
 
-all-local install-local:
+all-local install-local uninstall-local:
 
 # it doesn't compile for me.
 # test-local: TestMonoWeb.exe

diff --git a/mcs/class/System.Windows.Forms/SWFTest/Makefile b/mcs/class/System.Windows.Forms/SWFTest/Makefile
index 876fb6da70b9ea999dd1b4107a220764ba90ee79..eb5b23a00122d78ea493c61653147901a4e01788 100644 (file)
--- a/mcs/class/System.Windows.Forms/SWFTest/Makefile
+++ b/mcs/class/System.Windows.Forms/SWFTest/Makefile
@@ -12,7 +12,7 @@ test-local: SWFTest.exe
 # Fixme: does the program run itself and exit automatically?
 # We want run-test to work without supervision.
 
-run-test-local install-local:
+run-test-local install-local uninstall-local:
 
 DISTFILES = App.ico AssemblyInfo.cs changelog Form1.cs \
     Form1.resx SWFTest.csproj SWFTest.csproj.user

diff --git a/mcs/class/corlib/Makefile b/mcs/class/corlib/Makefile
index f08032e87f7873c98953ed7c03f7268fe3143553..3c762f6e69aa7f517413cc1eb634322c7aac3d97 100644 (file)
--- a/mcs/class/corlib/Makefile
+++ b/mcs/class/corlib/Makefile
@@ -60,10 +60,13 @@ plattest_flags = /debug+ /debug:full /nowarn:0618 /nowarn:0672 /r:$(PLATFORM_COR
 
 all-local: $(corlib)
 
-install-local: $(corlib)
+install-local: $(corlib) $(makefrag)
        $(MKINSTALLDIRS) $(DESTDIR)$(prefix)/lib
        $(INSTALL_LIB) $(corlib) $(DESTDIR)$(prefix)/lib
 
+uninstall-local:
+       -rm -f $(DESTDIR)$(prefix)/lib/corlib.dll
+
 clean-local:
        -rm -f $(corlib) $(cmplib) $(testlib) $(reslib) $(plattestlib) TestResult.xml \
               $(response) $(makefrag) $(stampfile) \

diff --git a/mcs/docs/Makefile b/mcs/docs/Makefile
index 1c9b5f80a33531f6ccb3b8480986127dc496adc0..c2a692d5fcc4c24fc03a5e6f6e0147723601d27d 100644 (file)
--- a/mcs/docs/Makefile
+++ b/mcs/docs/Makefile
@@ -4,6 +4,6 @@ include ../build/rules.make
 
 DISTFILES = clr-abi.txt compiler control-flow-analysis.txt order.txt
 
-all-local install-local clean-local test-local run-test-local:
+all-local install-local clean-local test-local run-test-local uninstall-local:
 
 dist-local: dist-default

diff --git a/mcs/errors/Makefile b/mcs/errors/Makefile
index 90b6126af6de2bbf93ab8ce52717e96a3c922028..f10e5f5ec3221ecf98e00dc9d5e9f00d5ec09b01 100644 (file)
--- a/mcs/errors/Makefile
+++ b/mcs/errors/Makefile
@@ -74,5 +74,5 @@ clean-local:
 
 dist-local: dist-default
 
-install-local:
+install-local uninstall-local:
 

diff --git a/mcs/jay/Makefile b/mcs/jay/Makefile
index 930d5a0f5d7a6645a6a1248f9652334ed3700ea6..8df0b920e969029ecbeef14f0a67a4855aec6594 100644 (file)
--- a/mcs/jay/Makefile
+++ b/mcs/jay/Makefile
@@ -24,6 +24,12 @@ install-local: jay
        done
        $(INSTALL_DATA) jay.1 $(DESTDIR)$(prefix)/man/man1
 
+uninstall-local:
+       -rm -f $(DESTDIR)$(prefix)/bin/jay
+       for datafile in $(datafiles) ; do \
+          rm -f $(DESTDIR)$(prefix)/share/jay/$$datafile ; \
+       done
+
 clean-local:
        rm -f jay *.o *.exe *.pdb
 

diff --git a/mcs/mcs/Makefile b/mcs/mcs/Makefile
index 5e9ae4e6cf1004bcc2f7b15c50f6ef1fdb295b82..0b573fa7727ebd6b1e63137e19b65e66b90970d9 100644 (file)
--- a/mcs/mcs/Makefile
+++ b/mcs/mcs/Makefile
@@ -57,6 +57,9 @@ install-local: mcs.exe
        $(MKINSTALLDIRS) $(DESTDIR)$(prefix)/bin
        $(INSTALL_BIN) mcs.exe $(DESTDIR)$(prefix)/bin
 
+uninstall-local:
+       -rm -f $(DESTDIR)$(prefix)/bin/mcs.exe
+
 test-local run-test-local:
 
 clean-local:

diff --git a/mcs/nunit20/Makefile b/mcs/nunit20/Makefile
index c6e6806f66e0f23ab6e6314c5be545eaacf6bd17..a49d45fdb70ad71d9a83e9e6f853759363417a1a 100644 (file)
--- a/mcs/nunit20/Makefile
+++ b/mcs/nunit20/Makefile
@@ -4,7 +4,7 @@ include ../build/rules.make
 
 DISTFILES = license.rtf nunit-console.sln nunit-console.suo README
 
-all-local install-local test-local run-test-local clean-local:
+all-local install-local test-local run-test-local clean-local uninstall-local:
 
 dist-local: dist-default
 

diff --git a/mcs/tests/Makefile b/mcs/tests/Makefile
index 5eb24b9dd396f8bcfbd7724d43a8dd7abd3e5258..14a2cc667cfb2f89903604452545c5663b1ee1c7 100644 (file)
--- a/mcs/tests/Makefile
+++ b/mcs/tests/Makefile
@@ -54,7 +54,7 @@ WINDOWS_SOURCES = \
 TEST_NOPASS = \
        test-28  test-45  test-53  test-91  test-102 test-106 test-107 test-120 test-122 test-132 test-133 test-66 test-177
 
-all-local install-local:
+all-local install-local uninstall-local:
 
 # casts
 

diff --git a/mcs/tools/Makefile b/mcs/tools/Makefile
index fcb1da67fc8452ca9eb5cd73630f20ac634bf361..3cdc2ad2a044c00b1a429f36908e072bd5d2018a 100644 (file)
--- a/mcs/tools/Makefile
+++ b/mcs/tools/Makefile
@@ -35,6 +35,11 @@ install-local: all-local
           $(INSTALL_BIN) $$t $(DESTDIR)$(prefix)/bin ; \
        done
 
+uninstall-local:
+       for t in $(MONO_TOOLS) ; do \
+          rm -f $(DESTDIR)$(prefix)/bin/$$t ; \
+       done
+
 test-local run-test-local:
 
 clean-local:

diff --git a/mcs/tools/security/Makefile b/mcs/tools/security/Makefile
index 8fbca0c2e27cab844ded8183431bc2bba11c10e6..ceae890513a515f4ce858130ed6466a52bcf622a 100644 (file)
--- a/mcs/tools/security/Makefile
+++ b/mcs/tools/security/Makefile
@@ -25,6 +25,11 @@ install-local: $(SECURITY_PROGRAMS)
            $(INSTALL_BIN) $$p $(DESTDIR)$(prefix)/bin ; \
        done
 
+uninstall-local:
+       for p in $(SECURITY_PROGRAMS) ; do \
+           rm -f $(DESTDIR)$(prefix)/bin/$$p ; \
+       done
+
 test-local:
 
 run-test-local: