diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-09-13 22:50:14 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-09-15 10:55:59 +0200 |
| commit | 77d297f3e8ff4af58718d166dcbf23c39ce47ca3 (patch) | |
| tree | 57b02931d6ccfbbd1c09fbf5aac7295621a80be5 /RepositoryExternal.mk | |
| parent | 2406e8fa5af19e0a8c97fb2461e3c12bfbfe373c (diff) | |
consistent naming of externals: jpeg-turbo->libjpeg-turbo
Change-Id: I63fcebc36559c2698bbedd3501285a388ce8c257
Reviewed-on: https://gerrit.libreoffice.org/42291
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 2db2ebfb3d81..2e5d5556b9e9 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -376,9 +376,9 @@ endef endif # SYSTEM_ZLIB -ifneq ($(SYSTEM_JPEG),) +ifneq ($(SYSTEM_LIBJPEG),) -define gb_LinkTarget__use_jpeg +define gb_LinkTarget__use_libjpeg $(call gb_LinkTarget_add_libs,$(1),$(LIBJPEG_LIBS)) $(call gb_LinkTarget_set_ldflags,$(1),\ $$(filter-out -L/usr/lib/jvm%,$$(T_LDFLAGS)) \ @@ -386,26 +386,26 @@ $(call gb_LinkTarget_set_ldflags,$(1),\ endef -gb_ExternalProject__use_jpeg := +gb_ExternalProject__use_libjpeg := else -define gb_LinkTarget__use_jpeg +define gb_LinkTarget__use_libjpeg $(call gb_LinkTarget_set_include,$(1),\ $(LIBJPEG_CFLAGS) \ $$(INCLUDE) \ ) $(call gb_LinkTarget_add_libs,$(1),$(LIBJPEG_LIBS)) -$(call gb_LinkTarget_use_external_project,$(1),jpeg-turbo,full) +$(call gb_LinkTarget_use_external_project,$(1),libjpeg-turbo,full) endef -define gb_ExternalProject__use_jpeg -$(call gb_ExternalProject_use_external_project,$(1),jpeg-turbo) +define gb_ExternalProject__use_libjpeg +$(call gb_ExternalProject_use_external_project,$(1),libjpeg-turbo) endef -endif # SYSTEM_JPEG +endif # SYSTEM_LIBJPEG ifneq ($(SYSTEM_MYTHES),) @@ -2777,7 +2777,7 @@ $(call gb_LinkTarget_add_libs,$(1),\ $(call gb_UnpackedTarball_get_dir,poppler)/poppler/.libs/libpoppler$(gb_StaticLibrary_PLAINEXT) \ ) -$(call gb_LinkTarget_use_external,$(1),jpeg) +$(call gb_LinkTarget_use_external,$(1),libjpeg) ifeq ($(OS),MACOSX) $(call gb_LinkTarget_add_libs,$(1),\ |