[Libreoffice-commits] .: cppu/util

Christian Lohmaier cloph at kemper.freedesktop.org
Mon Jun 13 13:27:45 PDT 2011


 cppu/util/makefile.mk |   12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

New commits:
commit 2d92003ad88bd2795bcdf4d17551a6a1118faf1b
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Mon Jun 13 22:21:17 2011 +0200

    get rid of "SHL2TARGETN redefined after use" warning - 2nd try
    
    this time run git add before commiting to commit the locally tested
    version, and not some intermediate crap that was added in between

diff --git a/cppu/util/makefile.mk b/cppu/util/makefile.mk
index d12f887..e4d6c29 100644
--- a/cppu/util/makefile.mk
+++ b/cppu/util/makefile.mk
@@ -71,7 +71,6 @@ DEF1NAME=$(SHL1TARGET)
 
 
 SHL2TARGET  := $(NAMEpurpenv_helper)
-SHL2DEPN    := $(SHL1TARGETN)
 DEF2NAME    := $(SHL2TARGET)
 .IF "$(GUI)$(COM)"=="WNTGCC"
 SHL2VERSIONMAP:=uno_purpenvhelper$(COMID).map
@@ -91,12 +90,7 @@ SHL2OBJS    := \
 
 
 # --- Targets ------------------------------------------------------
-
-.PHONY: ALLTAR
-
-
-ALLTAR:   $(SHL2TARGETN)
-    $(MAKE) $(MAKECMDGOALS) -f extra.mk
-
-
 .INCLUDE :	target.mk
+
+ALLTAR:
+	$(MAKE) $(MAKECMDGOALS) -f extra.mk


More information about the Libreoffice-commits mailing list