diff options
| -rw-r--r-- | doc/texi/building/chapter.via.terminal.texi | 8 | ||||
| -rw-r--r-- | make/include/main.rules | 5 | ||||
| -rw-r--r-- | test/module.defs | 2 | ||||
| -rw-r--r-- | test/module.rules | 10 |
4 files changed, 17 insertions, 8 deletions
diff --git a/doc/texi/building/chapter.via.terminal.texi b/doc/texi/building/chapter.via.terminal.texi index 88cb3b483..4f299f179 100644 --- 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 e7511a263..4625ae9db 100644 --- 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 a0ab7d000..af42f13c7 100644 --- 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 2a18db9b4..9a47aa172 100644 --- 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 |