34 files changed, 64 insertions, 34 deletions
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index b24eb7b9849e..820675c0cff1 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po      postprocess     ::      accessibility BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm DESKTOP:extensions extras DESKTOP:fpicker HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent ODK:odk officecfg psprint_config remotebridges scaddins scp2 DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt smoketestoo_native tail_build NULL
+po      postprocess     ::      accessibility BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm DESKTOP:extensions extras DESKTOP:fpicker HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent ODK:odk officecfg psprint_config remotebridges scaddins scp2 DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt smoketest tail_build NULL
 po	postprocess			    	usr1	-	all	po_mkout NULL
 po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
 po	postprocess\packconfig		nmake	-	all	po_packconfig po_checkxml NULL
diff --git a/smoketestoo_native/com/sun/star/comp/smoketest/MANIFEST.MF b/smoketest/com/sun/star/comp/smoketest/MANIFEST.MF
index 09e2f42ca0f6..09e2f42ca0f6 100755
--- a/smoketestoo_native/com/sun/star/comp/smoketest/MANIFEST.MF
+++ b/smoketest/com/sun/star/comp/smoketest/MANIFEST.MF
diff --git a/smoketestoo_native/com/sun/star/comp/smoketest/TestExtension.idl b/smoketest/com/sun/star/comp/smoketest/TestExtension.idl
index 83c370e11a18..83c370e11a18 100644
--- a/smoketestoo_native/com/sun/star/comp/smoketest/TestExtension.idl
+++ b/smoketest/com/sun/star/comp/smoketest/TestExtension.idl
diff --git a/smoketestoo_native/com/sun/star/comp/smoketest/TestExtension.java b/smoketest/com/sun/star/comp/smoketest/TestExtension.java
index c08c719116ae..c08c719116ae 100755
--- a/smoketestoo_native/com/sun/star/comp/smoketest/TestExtension.java
+++ b/smoketest/com/sun/star/comp/smoketest/TestExtension.java
diff --git a/smoketestoo_native/com/sun/star/comp/smoketest/delzip b/smoketest/com/sun/star/comp/smoketest/delzip
index 636fda90bfcb..636fda90bfcb 100755
--- a/smoketestoo_native/com/sun/star/comp/smoketest/delzip
+++ b/smoketest/com/sun/star/comp/smoketest/delzip
diff --git a/smoketestoo_native/com/sun/star/comp/smoketest/makefile.mk b/smoketest/com/sun/star/comp/smoketest/makefile.mk
index 937f377acd79..937f377acd79 100755
--- a/smoketestoo_native/com/sun/star/comp/smoketest/makefile.mk
+++ b/smoketest/com/sun/star/comp/smoketest/makefile.mk
diff --git a/smoketestoo_native/com/sun/star/comp/smoketest/manifest.xml b/smoketest/com/sun/star/comp/smoketest/manifest.xml
index fcedabf96b4b..fcedabf96b4b 100755
--- a/smoketestoo_native/com/sun/star/comp/smoketest/manifest.xml
+++ b/smoketest/com/sun/star/comp/smoketest/manifest.xml
diff --git a/smoketestoo_native/data/Events.xml b/smoketest/data/Events.xml
index 414f2c48e884..414f2c48e884 100644
--- a/smoketestoo_native/data/Events.xml
+++ b/smoketest/data/Events.xml
diff --git a/smoketestoo_native/data/Global.xml b/smoketest/data/Global.xml
index 8c549f824be2..8c549f824be2 100644
--- a/smoketestoo_native/data/Global.xml
+++ b/smoketest/data/Global.xml
diff --git a/smoketestoo_native/data/OptionsDlg.xml b/smoketest/data/OptionsDlg.xml
index 5da93552f476..5da93552f476 100644
--- a/smoketestoo_native/data/OptionsDlg.xml
+++ b/smoketest/data/OptionsDlg.xml
diff --git a/smoketestoo_native/data/Test_10er.xml b/smoketest/data/Test_10er.xml
index 54ee0769a5b8..54ee0769a5b8 100644
--- a/smoketestoo_native/data/Test_10er.xml
+++ b/smoketest/data/Test_10er.xml
diff --git a/smoketestoo_native/data/Test_DB.xml b/smoketest/data/Test_DB.xml
index 52ea5d9be934..52ea5d9be934 100644
--- a/smoketestoo_native/data/Test_DB.xml
+++ b/smoketest/data/Test_DB.xml
diff --git a/smoketestoo_native/data/Test_Ext.xml b/smoketest/data/Test_Ext.xml
index ac39f4816d7b..ac39f4816d7b 100644
--- a/smoketestoo_native/data/Test_Ext.xml
+++ b/smoketest/data/Test_Ext.xml
diff --git a/smoketestoo_native/data/content.xml b/smoketest/data/content.xml
index 60559afac4ab..60559afac4ab 100644
--- a/smoketestoo_native/data/content.xml
+++ b/smoketest/data/content.xml
diff --git a/smoketestoo_native/data/dialog-lb.xml b/smoketest/data/dialog-lb.xml
index 973dfe688828..973dfe688828 100644
--- a/smoketestoo_native/data/dialog-lb.xml
+++ b/smoketest/data/dialog-lb.xml
diff --git a/smoketestoo_native/data/dialog-lc.xml b/smoketest/data/dialog-lc.xml
index e3a5a0e326e4..e3a5a0e326e4 100644
--- a/smoketestoo_native/data/dialog-lc.xml
+++ b/smoketest/data/dialog-lc.xml
diff --git a/smoketestoo_native/data/makefile.mk b/smoketest/data/makefile.mk
index 6cf2706b52b2..6cf2706b52b2 100644
--- a/smoketestoo_native/data/makefile.mk
+++ b/smoketest/data/makefile.mk
diff --git a/smoketestoo_native/data/manifest.xml b/smoketest/data/manifest.xml
index 48fc9ce900a0..48fc9ce900a0 100644
--- a/smoketestoo_native/data/manifest.xml
+++ b/smoketest/data/manifest.xml
diff --git a/smoketestoo_native/data/meta.xml b/smoketest/data/meta.xml
index 43f14295e2b3..43f14295e2b3 100644
--- a/smoketestoo_native/data/meta.xml
+++ b/smoketest/data/meta.xml
diff --git a/smoketestoo_native/data/script-lb.xml b/smoketest/data/script-lb.xml
index fc4f6c6370ba..fc4f6c6370ba 100644
--- a/smoketestoo_native/data/script-lb.xml
+++ b/smoketest/data/script-lb.xml
diff --git a/smoketestoo_native/data/script-lc.xml b/smoketest/data/script-lc.xml
index e3a5a0e326e4..e3a5a0e326e4 100644
--- a/smoketestoo_native/data/script-lc.xml
+++ b/smoketest/data/script-lc.xml
diff --git a/smoketestoo_native/data/settings.xml b/smoketest/data/settings.xml
index cd4524b741ff..cd4524b741ff 100644
--- a/smoketestoo_native/data/settings.xml
+++ b/smoketest/data/settings.xml
diff --git a/smoketestoo_native/data/styles.xml b/smoketest/data/styles.xml
index 3f8d75fa6db3..3f8d75fa6db3 100644
--- a/smoketestoo_native/data/styles.xml
+++ b/smoketest/data/styles.xml
diff --git a/smoketestoo_native/losmoketest b/smoketest/losmoketest
index b3faee16b817..b3faee16b817 100755
--- a/smoketestoo_native/losmoketest
+++ b/smoketest/losmoketest
diff --git a/smoketestoo_native/losmoketest.py b/smoketest/losmoketest.py
index 4c8699763fb3..4c8699763fb3 100755
--- a/smoketestoo_native/losmoketest.py
+++ b/smoketest/losmoketest.py
diff --git a/smoketestoo_native/losmoketest.readme b/smoketest/losmoketest.readme
index 88091339d8d6..88091339d8d6 100644
--- a/smoketestoo_native/losmoketest.readme
+++ b/smoketest/losmoketest.readme
diff --git a/smoketest/makefile.mk b/smoketest/makefile.mk
new file mode 100755
index 000000000000..0549eff0bd37
--- /dev/null
+++ b/smoketest/makefile.mk
@@ -0,0 +1,49 @@
+#*************************************************************************
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#***********************************************************************/
+
+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)
+
+ALLTAR : $(SHL1TARGETN)
diff --git a/smoketest/prj/build.lst b/smoketest/prj/build.lst
new file mode 100644
index 000000000000..abec637a7f52
--- /dev/null
+++ b/smoketest/prj/build.lst
@@ -0,0 +1,4 @@
+smt smoketest :: codemaker javaunohelper soltools test unoil NULL
+smt smoketest\com\sun\star\comp\smoketest nmake - all smoketest_com_sun_star_comp_smoketest NULL
+smt smoketest\data nmake - all smoketest_data NULL
+smt smoketest nmake - all smoketest_mk smoketest_com_sun_star_comp_smoketest smoketest_data NULL
diff --git a/smoketest/prj/d.lst b/smoketest/prj/d.lst
new file mode 100644
index 000000000000..4da25c205f22
--- /dev/null
+++ b/smoketest/prj/d.lst
@@ -0,0 +1,4 @@
+..\losmoketest %_DEST%\bin\losmoketest
+..\%__SRC%\bin\smoketestdoc.sxw %_DEST%\bin\smoketestdoc.sxw
+..\%__SRC%\bin\TestExtension.oxt %_DEST%\bin\TestExtension.oxt
+..\%__SRC%\lib\libsmoketest.* %_DEST%\lib\libsmoketest.*
diff --git a/smoketestoo_native/smoketest.cxx b/smoketest/smoketest.cxx
index b0a709761f2f..b0a709761f2f 100644
--- a/smoketestoo_native/smoketest.cxx
+++ b/smoketest/smoketest.cxx
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"
diff --git a/smoketestoo_native/prj/build.lst b/smoketestoo_native/prj/build.lst
index 45439a1f0e87..9a43f63286fd 100644
--- a/smoketestoo_native/prj/build.lst
+++ b/smoketestoo_native/prj/build.lst
@@ -1,4 +1,2 @@
-smtoon smoketestoo_native :: codemaker javaunohelper soltools test unoil NULL
-smtoon smoketestoo_native\com\sun\star\comp\smoketest nmake - all smoketestoonative_com_sun_star_comp_smoketest NULL
-smtoon smoketestoo_native\data nmake - all smoketestoonative_data NULL
-smtoon smoketestoo_native nmake - all smoketestoonative_mk smoketestoonative_com_sun_star_comp_smoketest smoketestoonative_data NULL
+smtoon smoketestoo_native :: instsetoo_native NULL
+smtoon smoketestoo_native nmake - all smtoon_mkout NULL
diff --git a/smoketestoo_native/prj/d.lst b/smoketestoo_native/prj/d.lst
index 92eb2818fd2c..e69de29bb2d1 100644
--- a/smoketestoo_native/prj/d.lst
+++ b/smoketestoo_native/prj/d.lst
@@ -1,3 +0,0 @@
-..\losmoketest %_DEST%\bin\losmoketest
-..\%__SRC%\bin\smoketestdoc.sxw %_DEST%\bin\smoketestdoc.sxw
-..\%__SRC%\lib\libsmoketest.* %_DEST%\lib\libsmoketest.*
diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk b/solenv/gbuild/extensions/post_BuildplTargets.mk
index b0af960ee2e8..553257945f3a 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -55,8 +55,7 @@ endef
 .PHONY: smoketestoo_native instsetoo_native cross-build-toolset dev-install all build findunusedcode
 
 smoketestoo_native: $(WORKDIR)/bootstrap  $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | instsetoo_native
-	$(eval export RUN_SMOKETEST := YES)
-	$(call gb_BuildplTarget_command,$@,$(if $(filter instsetoo_native,$(gb_BuildplTarget_COMPLETEDTARGETS)),--from smoketestoo_native,--all))
+	$(call gb_BuildplTarget_command,$@,$(if $(filter instsetoo_native,$(gb_BuildplTarget_COMPLETEDTARGETS)),--from instsetoo_native,--all))
 
 instsetoo_native: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset)
 	$(call gb_BuildplTarget_command,$@,--all)