[Libreoffice-commits] .: 2 commits - sal/qa

[Caolán McNamara]

 sal/qa/ByteSequence/makefile.mk  |    8 +-------
 sal/qa/OStringBuffer/makefile.mk |   13 +------------
 2 files changed, 2 insertions(+), 19 deletions(-)

New commits:
commit 4b8166b889e0873ea50c8b5f0f37a4f4f41ae279
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Feb 11 14:36:20 2011 +0000

    cppunit: enable this test

diff --git a/sal/qa/OStringBuffer/makefile.mk b/sal/qa/OStringBuffer/makefile.mk
index d46168d..297221b 100644
--- a/sal/qa/OStringBuffer/makefile.mk
+++ b/sal/qa/OStringBuffer/makefile.mk
@@ -25,10 +25,6 @@
 #
 #*************************************************************************
 
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
 PRJ=..$/..
 
 PRJNAME=sal
@@ -47,11 +43,6 @@ CXXFLAGS+= $(LFS_CFLAGS)
 
 CFLAGSCXX += $(CPPUNIT_CFLAGS)
 
-#------------------------------- All object files -------------------------------
-# do this here, so we get right dependencies
-# SLOFILES= \
-#	  $(SLO)$/OStringBuffer.obj
-
 #----------------------------------- OStringBuffer -----------------------------------
 
 SHL1OBJS= \
@@ -75,6 +66,4 @@ SLOFILES=$(SHL1OBJS)
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
-
-.END
+.INCLUDE: $(PRJ)$/qa$/cppunit_local.mk
commit ea6a3b90a687ceade6384983ead40375732c8216
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Feb 11 14:28:50 2011 +0000

    cppunit: enable this test

diff --git a/sal/qa/ByteSequence/makefile.mk b/sal/qa/ByteSequence/makefile.mk
index 9f7bfcf..b033e31 100644
--- a/sal/qa/ByteSequence/makefile.mk
+++ b/sal/qa/ByteSequence/makefile.mk
@@ -25,10 +25,6 @@
 #
 #***********************************************************************/
 
-.IF "$(OOO_SUBSEQUENT_TESTS)" == ""
-nothing .PHONY:
-.ELSE
-
 PRJ = ../..
 PRJNAME = sal
 TARGET = qa_ByteSequence
@@ -50,6 +46,4 @@ DEF1NAME = $(SHL1TARGET)
 SLOFILES = $(SHL1OBJS)
 
 .INCLUDE: target.mk
-.INCLUDE: _cppunit.mk
-
-.END
+.INCLUDE: $(PRJ)$/qa$/cppunit_local.mk