diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-09-13 23:44:32 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-09-15 10:56:22 +0200 |
| commit | 38abb6aafa56dd8cb1ed2f5a09d3ea4023b4e16b (patch) | |
| tree | 196ea4bf69813c6800c54a0a0300ad1224f7f7ce /RepositoryExternal.mk | |
| parent | consistent naming of externals: jpeg-turbo->libjpeg-turbo (diff) | |
| download | core-38abb6aafa56dd8cb1ed2f5a09d3ea4023b4e16b.tar.gz core-38abb6aafa56dd8cb1ed2f5a09d3ea4023b4e16b.zip | |
consistent naming of externals: cmis -> libcmis
Change-Id: If710b416111dd26a67693d9f6d7d194ea607069b
Reviewed-on: https://gerrit.libreoffice.org/42292
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 2e5d5556b9e9..469ff43944e8 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -686,31 +686,31 @@ endef endif # SYSTEM_BOOST -ifneq ($(SYSTEM_CMIS),) +ifneq ($(SYSTEM_LIBCMIS),) -define gb_LinkTarget__use_cmis +define gb_LinkTarget__use_libcmis $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ - $(CMIS_CFLAGS) \ + $(LIBCMIS_CFLAGS) \ ) -$(call gb_LinkTarget_add_libs,$(1),$(CMIS_LIBS)) +$(call gb_LinkTarget_add_libs,$(1),$(LIBCMIS_LIBS)) endef -else # !SYSTEM_CMIS +else # !SYSTEM_LIBCMIS -define gb_LinkTarget__use_cmis +define gb_LinkTarget__use_libcmis $(call gb_LinkTarget_set_include,$(1),\ - -I$(call gb_UnpackedTarball_get_dir,cmis)/src \ + -I$(call gb_UnpackedTarball_get_dir,libcmis)/src \ $$(INCLUDE) \ ) $(call gb_LinkTarget_use_static_libraries,$(1),\ - cmislib \ + libcmis \ ) endef -endif # SYSTEM_CMIS +endif # SYSTEM_LIBCMIS ifeq ($(ENABLE_JAVA),TRUE) |