diff options
| author | jan Iversen <jani@libreoffice.org> | 2017-11-23 16:15:10 +0100 |
|---|---|---|
| committer | jan Iversen <jani@libreoffice.org> | 2017-11-24 09:10:22 +0100 |
| commit | 944da4b735d7c88fa7b7c200ea4c75dd1a6aa00e (patch) | |
| tree | c5dec1634fc383ac4c5be8ff7edc6497cd217936 /ios | |
| parent | 79101c50a74d11f793b88d848e9e95a130800f7d (diff) | |
iOS .mk naming conventions.
Updated target names, to allow cross references.
Change-Id: Ie0959876df58657a2303ca2b0865e91a7f5a0eea
Diffstat (limited to 'ios')
| -rw-r--r-- | ios/CustomTarget_iOS_setup.mk | 8 | ||||
| -rw-r--r-- | ios/StaticLibrary_iOSkit.mk | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk index a1ae23e0fa3e..f32e85be3b9f 100644 --- a/ios/CustomTarget_iOS_setup.mk +++ b/ios/CustomTarget_iOS_setup.mk @@ -12,11 +12,11 @@ IOSAPPXC := $(WORKDIR)/ios/loApp.xcconfig #- Top level ----------------------------------------------------------------- -$(eval $(call gb_CustomTarget_CustomTarget,ios/ios_setup)) +$(eval $(call gb_CustomTarget_CustomTarget,ios/iOS_setup)) -$(call gb_CustomTarget_get_target,ios/ios_setup): $(IOSAPPXC) $(IOSGEN)/native-code.h +$(call gb_CustomTarget_get_target,ios/iOS_setup): $(IOSAPPXC) $(IOSGEN)/native-code.h @@ -93,12 +93,12 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_i - #- clean ios ----------------------------------------------------------------- -$(call gb_CustomTarget_get_clean_target,ios/ios_setup): +$(call gb_CustomTarget_get_clean_target,ios/iOS_setup): $(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),ENV,2) rm -rf $(IOSRES) $(IOSGEN)/native-code.h $(IOSAPPXC) rm -rf $(WORKDIR)/ios + # vim: set noet sw=4 ts=4: diff --git a/ios/StaticLibrary_iOSkit.mk b/ios/StaticLibrary_iOSkit.mk index 3653e17d9a72..67f8b086cfcf 100644 --- a/ios/StaticLibrary_iOSkit.mk +++ b/ios/StaticLibrary_iOSkit.mk @@ -17,14 +17,14 @@ # the License at http://www.apache.org/licenses/LICENSE-2.0 . # -$(eval $(call gb_StaticLibrary_StaticLibrary,iOSkit)) +$(eval $(call gb_StaticLibrary_StaticLibrary,iOS_kitBridge)) -$(eval $(call gb_StaticLibrary_set_include,iOSkit,\ +$(eval $(call gb_StaticLibrary_set_include,iOS_kitBridge,\ $$(INCLUDE) \ -I$(SRCDIR)/ios/generated \ )) -$(eval $(call gb_StaticLibrary_add_cobjects,iOSkit,\ +$(eval $(call gb_StaticLibrary_add_cobjects,iOS_kitBridge,\ ios/source/LibreOfficeKit \ )) |