summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern Michaelsen <b_michaelsen@openoffice.org>2010-11-22 13:40:19 +0100
committerBjoern Michaelsen <b_michaelsen@openoffice.org>2010-11-22 13:40:19 +0100
commitb47f9bc5078be86b62006563f6c1af36d61b87cb (patch)
tree3f293163c892a26d6533c732ba4e1e9d45eaaf7c
parent940fd9c04e335f93a1ebccb9459d56aa786c37ed (diff)
gnumake2: getting rid of obsolete install and uninstall targets
-rw-r--r--solenv/gbuild/Module.mk5
-rw-r--r--solenv/gbuild/gbuild.mk4
2 files changed, 3 insertions, 6 deletions
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index f4ae3459729e..afc40a835cfe 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -47,7 +47,7 @@ $(call gb_Module_get_target,%) :
mkdir -p $(dir $@) && \
touch $@)
-.PHONY : all clean install uninstall
+.PHONY : all clean
.DEFAULT_GOAL := all
all :
@@ -62,9 +62,6 @@ clean :
$(call gb_Output_announce_title,all cleared.)
$(call gb_Output_announce_bell)
-install : all
-uninstall : clean
-
define gb_Module_Module
gb_Module_ALLMODULES += $(1)
gb_Module_MODULELOCATIONS += $(1):$(dir $(realpath $(lastword $(MAKEFILE_LIST))))
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 0cc6e74260c9..fcf7e02cf952 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -94,8 +94,8 @@ else
gb_ENABLE_PCH := $(false)
endif
-# for clean, uninstall and setuplocal goals we switch off dependencies
-ifneq ($(filter clean uninstall setuplocal removelocal,$(MAKECMDGOALS)),)
+# for clean, setuplocal and removelocal goals we switch off dependencies
+ifneq ($(filter clean setuplocal removelocal,$(MAKECMDGOALS)),)
gb_FULLDEPS := $(false)
else
gb_FULLDEPS := $(true)