diff options
| author | Tor Lillqvist <tml@iki.fi> | 2011-05-17 02:22:19 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@filifjonkan.site> | 2011-05-17 02:22:19 +0300 |
| commit | 84fbaed77de78c37ddae2da17f182aa148ef5776 (patch) | |
| tree | a14630c11e9306f074a4d8c9f42dd8f843b0a3aa /Makefile.in | |
| parent | 85d44913abdca42d32bb98e435221227d447fe65 (diff) | |
More cross-compiling work
AC_SUBST also EXEEXT_FOR_BUILD and use that in Makefile.in.
As winemv.set.sh is now called WindowsMSVCEnv.Set.sh, with capital E
and S like all the others, we can simplify the glob pattern for the
Set.sh file.
Don't attempt to download and/or run unpackers for dependencies
relevant only when using MSVC if using MinGW.
Misc other Windows host vs. build fixes.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/Makefile.in b/Makefile.in index 54e93cfae54b..9b9dcbf138cc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -8,14 +8,14 @@ else GBUILD_OPT:=--gmake endif -all: Makefile dmake/dmake@EXEEXT@ src.downloaded +all: Makefile dmake/dmake@EXEEXT_FOR_BUILD@ src.downloaded - @. ./*[Ee]nv.[Ss]et.sh && \ + @. ./*Env.Set.sh && \ cd instsetoo_native && \ build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ install: - @. ./*[Ee]nv.[Ss]et.sh && \ + @. ./*Env.Set.sh && \ echo "Installing in $${prefix:-@prefix@}..." && \ ooinstall "$${prefix:-@prefix@}" && \ echo "" && \ @@ -23,27 +23,27 @@ install: echo "$${prefix:-@prefix@}/program/soffice" dev-install: - @. ./*[Ee]nv.[Ss]et.sh && \ + @. ./*Env.Set.sh && \ ooinstall -l @abs_builddir@/install && \ echo "" && \ echo "Developer installation finished, you can now execute:" && \ echo "@abs_builddir@/install/program/soffice" -distclean: dmake/dmake@EXEEXT@ - @. ./*[Ee]nv.[Ss]et.sh && \ +distclean: dmake/dmake@EXEEXT_FOR_BUILD@ + @. ./*Env.Set.sh && \ dmake distclean -clean: dmake/dmake@EXEEXT@ - @. ./*[Ee]nv.[Ss]et.sh && \ +clean: dmake/dmake@EXEEXT_FOR_BUILD@ + @. ./*Env.Set.sh && \ dmake clean && \ if [ -n "$$USE_GMAKE" ] ; then make -f GNUmakefile.mk -sr clean ; fi -dmake/dmake@EXEEXT@: - @. ./*[Ee]nv.[Ss]et.sh && \ +dmake/dmake@EXEEXT_FOR_BUILD@: + @. ./*Env.Set.sh && \ ./bootstrap src.downloaded: ooo.lst download - @. ./*[Ee]nv.[Ss]et.sh && \ + @. ./*Env.Set.sh && \ $$SRC_ROOT/download $$SRC_ROOT/ooo.lst && touch $@ fetch: src.downloaded @@ -51,20 +51,20 @@ fetch: src.downloaded Makefile: configure.in set_soenv.in Makefile.in ./autogen.sh -check: Makefile dmake/dmake@EXEEXT@ fetch - @. ./*[Ee]nv.[Ss]et.sh && \ +check: Makefile dmake/dmake@EXEEXT_FOR_BUILD@ fetch + @. ./*Env.Set.sh && \ cd smoketestoo_native && \ export SAL_USE_VCLPLUGIN="svp" && \ build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ id: - @. ./*[Ee]nv.[Ss]et.sh && \ + @. ./*Env.Set.sh && \ create-ids tags: - @. ./*[Ee]nv.[Ss]et.sh && \ + @. ./*Env.Set.sh && \ create-tags docs: - @. ./*[Ee]nv.[Ss]et.sh && \ + @. ./*Env.Set.sh && \ mkdocs.sh $$SRC_ROOT/docs $$SOLARENV/inc/doxygen.cfg |