split smoketest module to fix build

+ move the library and other build stuff to a new "smoketest" module
+ keep "smoketestoo_native" only for installing and running the tests
+ restore the targets in top level make

1 files changed, 3 insertions, 24 deletions

diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk
index bbfa24d6f417..90adceb0477b 100755
--- a/smoketestoo_native/makefile.mk
+++ b/smoketestoo_native/makefile.mk
@@ -27,31 +27,12 @@ PRJ = .
 PRJNAME = smoketestoo_native
 TARGET = smoketest
 
-ENABLE_EXCEPTIONS = TRUE
-VISIBILITY_HIDDEN = TRUE
-
-ABORT_ON_ASSERTION = TRUE
-
 .INCLUDE: settings.mk
 
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-SLOFILES = $(SHL1OBJS)
-
-SHL1IMPLIB = i$(SHL1TARGET)
-SHL1TARGET = smoketest
-SHL1OBJS = $(SLO)/smoketest.obj
-SHL1RPATH = NONE
-SHL1STDLIBS = $(CPPUHELPERLIB) $(CPPULIB) $(CPPUNITLIB) $(SALLIB) $(UNOTESTLIB)
-SHL1USE_EXPORTS = name
-DEF1NAME = $(SHL1TARGET)
-
 .INCLUDE: target.mk
-.IF "$(RUN_SMOKETEST)" == "YES"
 .INCLUDE: installationtest.mk
-.END
 
-.IF "$(depend)" == "" && "$(RUN_SMOKETEST)" == "YES"
+.IF "$(depend)" == ""
 # disable smoketest when cross-compiling for now; we can use wine at some stage (?)
 .IF "$(CROSS_COMPILING)" != "YES"
 ALLTAR : cpptest
@@ -60,10 +41,8 @@ ALLTAR :
 .END
 .END
 
-cpptest : $(SHL1TARGETN)
-
-TEST_ARGUMENTS = smoketest.doc=$(BIN)/smoketestdoc.sxw
-CPPTEST_LIBRARY = $(SHL1TARGETN)
+TEST_ARGUMENTS = smoketest.doc=$(OUTDIR)/bin/smoketestdoc.sxw
+CPPTEST_LIBRARY = $(OUTDIR)/lib/$(DLLPRE)smoketest$(DLLPOST)
 
 .IF "$(OS)" != "WNT" || "$(CROSS_COMPILING)" == "YES"
 .IF "$(DISABLE_LINKOO)" == "TRUE"