diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-05-08 17:30:40 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-05-08 17:49:58 +0200 |
| commit | b65859c5c60f1a83c8da8c6dcab0b7c8fc580f13 (patch) | |
| tree | e041f40683dbbd260ecfd4bd7a6ff495b7b55f14 | |
| parent | 416b321666da20857a87b4a8c3991caed1f24587 (diff) | |
jpeg: remove ExternalPackage_jpeg
Change-Id: I09a4b3a3ef816a8bf63d4aa0c7fe7bec2a67dbd8
| -rw-r--r-- | RepositoryExternal.mk | 2 | ||||
| -rw-r--r-- | jpeg/ExternalPackage_jpeg.mk | 19 | ||||
| -rw-r--r-- | jpeg/Module_jpeg.mk | 1 |
3 files changed, 1 insertions, 21 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 6b4c82fea086..f636d7bedcc9 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -395,8 +395,8 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ define gb_LinkTarget__use_jpeg $(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,jpeg) \ $$(INCLUDE) \ - -I$(OUTDIR)/inc/external/jpeg \ ) $(call gb_LinkTarget_use_static_libraries,$(1),\ diff --git a/jpeg/ExternalPackage_jpeg.mk b/jpeg/ExternalPackage_jpeg.mk deleted file mode 100644 index c451ed58c923..000000000000 --- a/jpeg/ExternalPackage_jpeg.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_ExternalPackage_ExternalPackage,jpeg_inc,jpeg)) - -$(eval $(call gb_ExternalPackage_add_unpacked_files,jpeg_inc,inc/external/jpeg,\ - jconfig.h \ - jerror.h \ - jmorecfg.h \ - jpeglib.h \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/jpeg/Module_jpeg.mk b/jpeg/Module_jpeg.mk index 806d577b7bce..fea0f0bbdff7 100644 --- a/jpeg/Module_jpeg.mk +++ b/jpeg/Module_jpeg.mk @@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,jpeg)) ifeq ($(SYSTEM_JPEG),NO) $(eval $(call gb_Module_add_targets,jpeg,\ - ExternalPackage_jpeg \ UnpackedTarball_jpeg \ StaticLibrary_jpeg \ )) |