diff options
| author | jan Iversen <jani@libreoffice.org> | 2018-01-14 12:24:44 +0100 |
|---|---|---|
| committer | jan Iversen <jani@libreoffice.org> | 2018-01-14 12:25:53 +0100 |
| commit | 35020496e22317715140278a4b4cc974e48889da (patch) | |
| tree | e9d70558385044c33ab94a50a9720d8701f3d7a3 | |
| parent | iOS changed reference to native-code.h (diff) | |
| download | core-35020496e22317715140278a4b4cc974e48889da.tar.gz core-35020496e22317715140278a4b4cc974e48889da.zip | |
iOS, static library depeneds on setup
added dependency to static library
Change-Id: Ib0d7f7eec1f34ff275600cc9e825fa606f1ef40d
| -rw-r--r-- | ios/CustomTarget_iOS_setup.mk | 20 | ||||
| -rw-r--r-- | ios/StaticLibrary_iOSkit.mk | 2 |
2 files changed, 8 insertions, 14 deletions
diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk index 20b58c7623e5..ab303a837efd 100644 --- a/ios/CustomTarget_iOS_setup.mk +++ b/ios/CustomTarget_iOS_setup.mk @@ -17,29 +17,21 @@ $(eval $(call gb_CustomTarget_CustomTarget,ios/iOS_setup)) $(call gb_CustomTarget_get_target,ios/iOS_setup): $(IOSGEN)/native-code.h -#- build --------------------------------------------------------------------- -.PHONY: FORCE -FORCE: +#- Generate dynamic files --------------------------------------------------- +$(IOSGEN)/native-code.h: $(WORKDIR)/ios $(BUILDDIR)/config_host.mk \ + $(SRCDIR)/ios/CustomTarget_iOS_setup.mk \ + $(SRCDIR)/solenv/bin/native-code.py + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2) -$(WORKDIR)/ios: - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRE,2) + # prepare directories mkdir -p $(IOSGEN) $(IOSRES) $(IOSRES)/services \ $(IOSRES)/share/config $(IOSRES)/share/filter $(IOSRES)/program \ $(IOSGEN)/simulator \ $(IOSGEN)/debug \ $(IOSGEN)/release \ $(IOSGEN) $(WORKDIR)/ios; - - - -#- Generate dynamic files --------------------------------------------------- -$(IOSGEN)/native-code.h: $(WORKDIR)/ios $(BUILDDIR)/config_host.mk \ - $(SRCDIR)/ios/CustomTarget_iOS_setup.mk \ - $(SRCDIR)/solenv/bin/native-code.py - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ENV,2) - # generate file with call declarations $(SRCDIR)/solenv/bin/native-code.py \ -C -g core -g writer -g calc -g draw -g edit \ diff --git a/ios/StaticLibrary_iOSkit.mk b/ios/StaticLibrary_iOSkit.mk index f36ef856a8dc..a543e494a344 100644 --- a/ios/StaticLibrary_iOSkit.mk +++ b/ios/StaticLibrary_iOSkit.mk @@ -23,4 +23,6 @@ $(eval $(call gb_StaticLibrary_add_cobjects,iOS_kitBridge,\ ios/source/LibreOfficeKit \ )) +$(call gb_StaticLibrary_get_target,ios/iOS_kitBridge): $(call gb_CustomTarget_get_target,ios/iOS_setup) + # vim: set noet sw=4 ts=4: |