[Libreoffice-commits] core.git: Branch 'aoo/trunk' - basebmp/test basegfx/test codemaker/test

Damjan Jovanovic damjan at apache.org
Sat Aug 29 03:08:22 PDT 2015


 basebmp/test/makefile.mk             |    3 ---
 basegfx/test/makefile.mk             |    6 ------
 codemaker/test/cppumaker/makefile.mk |    5 -----
 3 files changed, 14 deletions(-)

New commits:
commit 04f4d5281028a167c57d25ceb50696368f6e5ba7
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Sat Aug 29 09:04:40 2015 +0000

    $(SLOFILES) is unnecessary for applications, and other
    
    makefiles simplifications for recently ported tests.

diff --git a/basebmp/test/makefile.mk b/basebmp/test/makefile.mk
index c951586..5b04090 100644
--- a/basebmp/test/makefile.mk
+++ b/basebmp/test/makefile.mk
@@ -108,9 +108,6 @@ APP1TEST  = enabled
 #APP2DEF=	$(MISC)$/$(TARGET).def
 #.ENDIF
 
-#------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-SLOFILES=$(APP1OBJS)
 
 # --- Targets ------------------------------------------------------
 
diff --git a/basegfx/test/makefile.mk b/basegfx/test/makefile.mk
index f85d14a..c0c714c 100644
--- a/basegfx/test/makefile.mk
+++ b/basegfx/test/makefile.mk
@@ -61,17 +61,11 @@ APP1STDLIBS= \
                 $(CPPULIB)       \
                 $(GTESTLIB)
 
-APP1IMPLIB= i$(APP1TARGET)
 APP1RPATH = NONE
-DEF1NAME    =$(APP1TARGET)
 APP1TEST = enabled
 
 # END ------------------------------------------------------------------
 
-#------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-SLOFILES=$(APP1OBJS)
-
 # --- Targets ------------------------------------------------------
 
 .ENDIF # "$(ENABLE_UNIT_TESTS)" != "YES"
diff --git a/codemaker/test/cppumaker/makefile.mk b/codemaker/test/cppumaker/makefile.mk
index de48805..d2aabf6 100644
--- a/codemaker/test/cppumaker/makefile.mk
+++ b/codemaker/test/cppumaker/makefile.mk
@@ -40,13 +40,8 @@ INCPRE += $(MISC)$/$(TARGET)$/inc
 APP1TARGET = $(TARGET)
 APP1OBJS = $(SLO)$/test_codemaker_cppumaker.obj
 APP1STDLIBS = $(CPPULIB) $(GTESTLIB) $(SALLIB) $(TESTSHL2LIB)
-APP1VERSIONMAP = version.map
-APP1IMPLIB = i$(APP1TARGET)
-DEF1NAME = $(APP1TARGET)
 APP1TEST = enabled
 
-SLOFILES = $(APP1OBJS)
-
 .INCLUDE: target.mk
 
 $(APP1OBJS): $(MISC)$/$(TARGET).cppumaker.flag


More information about the Libreoffice-commits mailing list