diff options
| author | David Tardon <dtardon@redhat.com> | 2012-10-12 06:50:23 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-10-12 06:50:23 +0200 |
| commit | df2ea4409945051733979b156f9cf9f52b35b0c5 (patch) | |
| tree | 1a47d6876bb11b14503fe1298acc5f49aa990b33 /jpeg | |
| parent | de8808f03719f793da5452e2ccdabfbf81492ac8 (diff) | |
deliver jpeg headers too
jpeg is used by dmake module gdk-pixbuf, so the delivery cannot be
bypassed yet.
Change-Id: I92d71c6807535b8f4fff75d62fc417d437792e33
Diffstat (limited to 'jpeg')
| -rw-r--r-- | jpeg/ExternalPackage_jpeg.mk | 19 | ||||
| -rw-r--r-- | jpeg/Module_jpeg.mk | 1 | ||||
| -rw-r--r-- | jpeg/UnpackedTarball_jpeg.mk | 7 |
3 files changed, 20 insertions, 7 deletions
diff --git a/jpeg/ExternalPackage_jpeg.mk b/jpeg/ExternalPackage_jpeg.mk new file mode 100644 index 000000000000..c451ed58c923 --- /dev/null +++ b/jpeg/ExternalPackage_jpeg.mk @@ -0,0 +1,19 @@ +# -*- 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 fea0f0bbdff7..806d577b7bce 100644 --- a/jpeg/Module_jpeg.mk +++ b/jpeg/Module_jpeg.mk @@ -12,6 +12,7 @@ $(eval $(call gb_Module_Module,jpeg)) ifeq ($(SYSTEM_JPEG),NO) $(eval $(call gb_Module_add_targets,jpeg,\ + ExternalPackage_jpeg \ UnpackedTarball_jpeg \ StaticLibrary_jpeg \ )) diff --git a/jpeg/UnpackedTarball_jpeg.mk b/jpeg/UnpackedTarball_jpeg.mk index 2b504f6d0213..19e4dd7930f8 100644 --- a/jpeg/UnpackedTarball_jpeg.mk +++ b/jpeg/UnpackedTarball_jpeg.mk @@ -23,11 +23,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,jpeg,\ )) endif -$(eval $(call gb_UnpackedTarball_mark_output_files,jpeg,\ - jconfig.h \ - jerror.h \ - jmorecfg.h \ - jpeglib.h \ -)) - # vim: set noet sw=4 ts=4: |