strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prefer simple and working solution to obscure and non-working

Browse source 
Change-Id: I5c7d02daced542222c2cb3881fafd2d58fe7f14d
This commit is contained in:
Tor Lillqvist 2013-04-19 09:27:44 +03:00
parent eeab70fd53
commit 685a12ac0e
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefile.in
View file

@ -224,6 +224,9 @@ bootstrap: compilerplugins
#
build: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset)
$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild
ifeq ($(OS),IOS)
$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) ios
endif
build-nocheck: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset)
$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.gbuild build

1
RepositoryModule_host.mk
View file

@ -99,7 +99,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
$(call gb_Helper_optional,DESKTOP,idlc) \
instsetoo_native \
io \
ios \
javaunohelper \
$(call gb_Helper_optional,JFREEREPORT,jfreereport) \
$(call gb_Helper_optional,JPEG,jpeg) \

6
ios/Executable_LibreOffice.mk
View file

@ -34,14 +34,10 @@ $(eval $(call gb_Executable_add_objcobjects,LibreOffice,\
$(call gb_Executable_use_package,LibreOffice,touch_inc)
# Mark the executable as dependingf on AllModulesButInstsetNative so
# that it is built only after all libraries that it links to (which
# might be any of them) have been built.
# Mark the executable as depending on all libraries so that it gets
# rebuilt if any library has been rebuilt. Avoids need for "make
# ios.clean".
$(call gb_LinkTarget_get_target,Executable/LibreOffice) : $(call gb_Postprocess_get_target,AllModulesButInstsetNative) $(wildcard $(OUTDIR)/lib/lib*.a)
$(call gb_LinkTarget_get_target,Executable/LibreOffice) : $(wildcard $(OUTDIR)/lib/lib*.a)
# vim: set ts=4 sw=4 et: