ios: convert usage of OUTDIR

... not sure if it's always correct but...

Change-Id: Iccb21bace96825cbf502ae37fc513bbe76d261e3

6 files changed, 7 insertions, 13 deletions

diff --git a/ios/CustomTarget_LibreOffice_app.mk b/ios/CustomTarget_LibreOffice_app.mk
index 9ba7decfb496..7ec50345bc8f 100644
--- a/ios/CustomTarget_LibreOffice_app.mk
+++ b/ios/CustomTarget_LibreOffice_app.mk
@@ -53,9 +53,9 @@ $(SCRIPT_OUTPUT_FILE_0) : $(call gb_Executable_get_target,LibreOffice)
 #
 # Copy rdb files
 #
-	cp $(OUTDIR)/bin/offapi.rdb $(appdir)
-	cp $(OUTDIR)/bin/udkapi.rdb $(appdir)
-	cp $(OUTDIR)/bin/oovbaapi.rdb $(appdir)
+	cp $(INSTDIR)/ure/share/misc/types.rdb $(appdir)
+	cp $(INSTDIR)/program/types/offapi.rdb $(appdir)
+	cp $(INSTDIR)/program/types/oovbaapi.rdb $(appdir)
 	cp $(INSTDIR)/program/services/services.rdb $(appdir)
 	cp $(INSTDIR)/ure/share/misc/services.rdb $(appdir)/ure
 #
diff --git a/ios/CustomTarget_MobileLibreOffice_app.mk b/ios/CustomTarget_MobileLibreOffice_app.mk
index 64b66a1648cb..300d67fd269d 100644
--- a/ios/CustomTarget_MobileLibreOffice_app.mk
+++ b/ios/CustomTarget_MobileLibreOffice_app.mk
@@ -48,7 +48,6 @@ MobileLibreOffice_setup:
 	# Libs #
 	# Create the link flags in the xcconfig for Xcode linkage
 	for path in $(INSTDIR)/program \
-				$(WORKDIR)/Headers/Library \
 				$(WORKDIR)/LinkTarget/StaticLibrary \
 				$(WORKDIR)/UnpackedTarball/*/.libs \
 				$(WORKDIR)/UnpackedTarball/*/src/.libs \
diff --git a/ios/Executable_LibreOffice.mk b/ios/Executable_LibreOffice.mk
index 2db76dc11644..05477b983d28 100644
--- a/ios/Executable_LibreOffice.mk
+++ b/ios/Executable_LibreOffice.mk
@@ -42,7 +42,6 @@ $(eval $(call gb_Executable_add_objcobjects,LibreOffice,\
 # variable for that list? (To be used for Android builds, too.)
 
 $(WORKDIR)/LinkTarget/Executable/LibreOffice : \
-    $(wildcard $(OUTDIR)/lib/lib*.a) \
     $(wildcard $(INSTDIR)/$(LIBO_LIB_FOLDER)/lib*.a) \
     $(wildcard $(WORKDIR)/LinkTarget/StaticLibrary/lib*.a)
 
diff --git a/ios/lo.xcconfig.in b/ios/lo.xcconfig.in
index 3bdc79aacbb8..91278bc0c053 100644
--- a/ios/lo.xcconfig.in
+++ b/ios/lo.xcconfig.in
@@ -14,7 +14,6 @@
 
 LO_BUILDDIR = @BUILDDIR@
 LO_INSTDIR = @INSTDIR@
-LO_OUTDIR = @OUTDIR@
 LO_SRCDIR = @SRC_ROOT@
 LO_WORKDIR = @WORKDIR@
 
diff --git a/ios/qa/sc/Makefile b/ios/qa/sc/Makefile
index 5eb1cb3a33b1..0e7dc783b2d5 100644
--- a/ios/qa/sc/Makefile
+++ b/ios/qa/sc/Makefile
@@ -39,7 +39,7 @@ SRCS = filters-test.m
 
 CFLAGS = $(SOLARINC)
 
-LIBS = -Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a $(foreach LIB, bin/cppunit/cppunittester lib/bootstrap.uno lib/configmgr.uno lib/expwrap.uno lib/fastsax.uno lib/i18npool.uno lib/introspection.uno lib/reflection.uno lib/stocservices.uno lib/unobootstrapprotector lib/unoexceptionprotector, -Wl,$(OUTDIR)/$(LIB).a) $(SOLARLIB) -lanalysislo -lavmedialo -lbasegfxlo -lcanvastoolslo -llcms2 -lcollator_data -lcomphelpgcc3 -lcppcanvaslo -lcppunit -lcrypto -ldatelo -ldict_ja -ldict_zh -ldrawinglayerlo -leditenglo -lexpat_xmlparse -lexpat_xmltok -lfilterconfiglo -lforlo -lforuilo -lfwelo -lfwilo -lfwklo -lgcc3_uno -li18nlangtaggcc3 -li18nutilgcc3 -licudata -licui18n -licuuc -lindex_data -ljpeg -ljvmfwk -llnglo -llocaledata_en -llocaledata_es -llocaledata_euro -llocaledata_others -lmsfilterlo -looxlo -lpackage2 -lreg -lsal_textenc -lsalcpprt -lsaxlo -lscfiltlo -lsclo -lsfxlo -lsotlo -lstore -lsvllo -lsvtlo -lsvxlo -lsvxcorelo -ltest -ltextconv_dict -ltklo -ltllo -lucb1 -lucbhelper4gcc3 -lucpfile1 -lunoxmllo -luno_cppuhelpergcc3 -luno_cppu -luno_sal -luno_salhelpergcc3 -lunotest -lutllo -lvcllo -lxmlscriptlo -lxml2 -lxmlreader -lxolo -lxstor -lz $(addprefix -framework , $(gb_Library__FRAMEWORKS)) -liconv -lobjc
+LIBS = -Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a $(foreach LIB, bin/cppunit/cppunittester lib/bootstrap.uno lib/configmgr.uno lib/expwrap.uno lib/fastsax.uno lib/i18npool.uno lib/introspection.uno lib/reflection.uno lib/stocservices.uno lib/unobootstrapprotector lib/unoexceptionprotector, $(SOLARLIB) -lanalysislo -lavmedialo -lbasegfxlo -lcanvastoolslo -llcms2 -lcollator_data -lcomphelpgcc3 -lcppcanvaslo -lcppunit -lcrypto -ldatelo -ldict_ja -ldict_zh -ldrawinglayerlo -leditenglo -lexpat_xmlparse -lexpat_xmltok -lfilterconfiglo -lforlo -lforuilo -lfwelo -lfwilo -lfwklo -lgcc3_uno -li18nlangtaggcc3 -li18nutilgcc3 -licudata -licui18n -licuuc -lindex_data -ljpeg -ljvmfwk -llnglo -llocaledata_en -llocaledata_es -llocaledata_euro -llocaledata_others -lmsfilterlo -looxlo -lpackage2 -lreg -lsal_textenc -lsalcpprt -lsaxlo -lscfiltlo -lsclo -lsfxlo -lsotlo -lstore -lsvllo -lsvtlo -lsvxlo -lsvxcorelo -ltest -ltextconv_dict -ltklo -ltllo -lucb1 -lucbhelper4gcc3 -lucpfile1 -lunoxmllo -luno_cppuhelpergcc3 -luno_cppu -luno_sal -luno_salhelpergcc3 -lunotest -lutllo -lvcllo -lxmlscriptlo -lxml2 -lxmlreader -lxolo -lxstor -lz $(addprefix -framework , $(gb_Library__FRAMEWORKS)) -liconv -lobjc
 
 all: $(APPDIR)/$(APP) stuff
 
@@ -73,14 +73,12 @@ stuff:
 # hmm, once again, a hodgepodge of stuff, I don't really know which
 # files of which are actually needed...
 	mkdir -p $(APPDIR)/registry/res
-	cp $(OUTDIR)/xml/*.xcd $(APPDIR)/registry
 	mv $(APPDIR)/registry/fcfg_langpack_en-US.xcd $(APPDIR)/registry/res
-	cp -R $(OUTDIR)/xml/registry/* $(APPDIR)/registry
 #
 # .rdb files
-	cp $(OUTDIR)/bin/udkapi.rdb $(OUTDIR)/bin/types.rdb $(OUTDIR)/xml/ure/services.rdb $(APPDIR)
+	cp $(INSTDIR)/ure/share/misc/types.rdb $(INSTDIR)/program/types/offapi.rdb $(INSTDIR)/program/services/services.rdb $(APPDIR)
 	mkdir -p $(APPDIR)/ure
-	cp $(OUTDIR)/bin/ure/types.rdb $(APPDIR)/ure
+	cp $(INSTDIR)/ure/share/misc/types.rdb $(APPDIR)/ure
 #
 # a bunch of .component files
 	for F in framework/util/fwk i18npool/util/i18npool sfx2/util/sfx ucb/source/core/ucb1 ucb/source/ucp/file/ucpfile1 unoxml/source/service/unoxml configmgr/source/configmgr basic/util/sb chart2/source/controller/chartcontroller chart2/source/chartcore comphelper/util/comphelp eventattacher/source/evtatt filter/source/config/cache/filterconfig1 oox/util/oox package/source/xstor/xstor package/util/package2 sax/source/expatwrap/expwrap sax/source/fastparser/fastsax sc/util/sc sc/util/scfilt scaddins/source/analysis/analysis scaddins/source/datefunc/date sot/util/sot svl/util/svl toolkit/util/tk ucb/source/ucp/tdoc/ucptdoc1 unotools/util/utl unoxml/source/rdf/unordf; do \
@@ -94,7 +92,7 @@ stuff:
 # ResMgrContainer::init() in tools/source/rc/resmgr.cxx, so let's use
 # that.
 	mkdir -p $(APPDIR)/program/resource
-	for F in $(OUTDIR)/bin/*.res; do \
+	for F in $(INSTDIR)/program/resource/*.res; do \
 		cp $$F $(APPDIR)/program/resource; \
 	done
 #
diff --git a/ios/qa/sc/filters-test.m b/ios/qa/sc/filters-test.m
index 84e5bf5f10e7..b664a39547eb 100644
--- a/ios/qa/sc/filters-test.m
+++ b/ios/qa/sc/filters-test.m
@@ -82,7 +82,6 @@ didFinishLaunchingWithOptions: (NSDictionary *) launchOptions
     // See unotest/source/cpp/bootstrapfixturebase.cxx
     const char *app_root = [[[NSBundle mainBundle] bundlePath] UTF8String];
     setenv("SRC_ROOT", app_root, 1);
-    setenv("OUTDIR_FOR_BUILD", app_root, 1);
 
     setenv("SAL_LOG", "yes", 1);