Author: damjan Date: Sat Aug 29 09:04:40 2015 New Revision: 1698448 URL: http://svn.apache.org/r1698448 Log: $(SLOFILES) is unnecessary for applications, and other makefiles simplifications for recently ported tests.
Modified: openoffice/trunk/main/basebmp/test/makefile.mk openoffice/trunk/main/basegfx/test/makefile.mk openoffice/trunk/main/codemaker/test/cppumaker/makefile.mk Modified: openoffice/trunk/main/basebmp/test/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basebmp/test/makefile.mk?rev=1698448&r1=1698447&r2=1698448&view=diff ============================================================================== --- openoffice/trunk/main/basebmp/test/makefile.mk (original) +++ openoffice/trunk/main/basebmp/test/makefile.mk Sat Aug 29 09:04:40 2015 @@ -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 ------------------------------------------------------ Modified: openoffice/trunk/main/basegfx/test/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/test/makefile.mk?rev=1698448&r1=1698447&r2=1698448&view=diff ============================================================================== --- openoffice/trunk/main/basegfx/test/makefile.mk (original) +++ openoffice/trunk/main/basegfx/test/makefile.mk Sat Aug 29 09:04:40 2015 @@ -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" Modified: openoffice/trunk/main/codemaker/test/cppumaker/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/codemaker/test/cppumaker/makefile.mk?rev=1698448&r1=1698447&r2=1698448&view=diff ============================================================================== --- openoffice/trunk/main/codemaker/test/cppumaker/makefile.mk (original) +++ openoffice/trunk/main/codemaker/test/cppumaker/makefile.mk Sat Aug 29 09:04:40 2015 @@ -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