BuildSystem:

- added global uninstall target; the inverse of install
- $PREFIX/bin/HandBrakeCLI longer paritipates in clean
- added target test.uninstall to remove $PREFIX/bin/HandBrakeCLI

git-svn-id: svn://localhost/HandBrake/trunk@2212 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/doc/texi/building/chapter.via.terminal.texi b/doc/texi/building/chapter.via.terminal.texi
index 88cb3b4..4f299f1 100644 (file)
--- a/doc/texi/building/chapter.via.terminal.texi
+++ b/doc/texi/building/chapter.via.terminal.texi
@@ -92,12 +92,16 @@ Alias for @samp{make build}.
 @item make build
 Build main product. All necessary dependencies are also built if required.
 
+@item make clean
+Clean all build output excluding contrib modules. Configuration is retained.
+
 @item make install
 Perform final product(s) install.
 This will install build products to a standard directory or one specified via @command{configure --prefix} option.
 
-@item make clean
-Clean all build output excluding contrib modules. Configuration is retained.
+@item make uninstall
+Perform final product(s) uninstall.
+This will uninstall any products which may have been previously installed.
 
 @item make xclean
 Clean all build output including contrib modules. Configuration is retained.

diff --git a/make/include/main.rules b/make/include/main.rules
index e7511a2..4625ae9 100644 (file)
--- a/make/include/main.rules
+++ b/make/include/main.rules
@@ -15,11 +15,12 @@ endif
 
 ###############################################################################
 
-.PHONY: build install clean xclean doc report
+.PHONY: build clean install uninstall xclean doc report
 
 build:
-install:
 clean:
+install:
+uninstall:
 xclean: contrib.xclean clean
 doc:
 report:: report.main report.modules

diff --git a/test/module.defs b/test/module.defs
index a0ab7d0..af42f13 100644 (file)
--- a/test/module.defs
+++ b/test/module.defs
@@ -28,9 +28,9 @@ endif
 
 TEST.out += $(TEST.c.o)
 TEST.out += $(TEST.exe)
-TEST.out += $(TEST.install.exe)
 
 BUILD.out += $(TEST.out)
+BUILD.out += $(TEST.install.exe)
 
 ###############################################################################
 

diff --git a/test/module.rules b/test/module.rules
index 2a18db9..9a47aa1 100644 (file)
--- a/test/module.rules
+++ b/test/module.rules
@@ -21,12 +21,16 @@ clean: test.clean
 
 ###############################################################################
 
-## avoid installing CLI on darwin
+## skip install/uninstall on darwin
 ifneq ($(BUILD.system),darwin)
 
-install: test.install
-
 test.install: | $(dir $(TEST.install.exe))
        $(CP.exe) $(TEST.exe) $(TEST.install.exe)
 
+test.uninstall:
+       $(RM.exe) -f $(TEST.install.exe)
+
+install: test.install
+uninstall: test.uninstall
+
 endif