[Libreoffice-commits] .: jpeg/ExternalPackage_jpeg.mk jpeg/Module_jpeg.mk jpeg/UnpackedTarball_jpeg.mk

[Libreoffice Gerrit user]

 jpeg/ExternalPackage_jpeg.mk |   19 +++++++++++++++++++
 jpeg/Module_jpeg.mk          |    1 +
 jpeg/UnpackedTarball_jpeg.mk |    7 -------
 3 files changed, 20 insertions(+), 7 deletions(-)

New commits:
commit df2ea4409945051733979b156f9cf9f52b35b0c5
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Oct 12 06:50:23 2012 +0200

    deliver jpeg headers too
    
    jpeg is used by dmake module gdk-pixbuf, so the delivery cannot be
    bypassed yet.
    
    Change-Id: I92d71c6807535b8f4fff75d62fc417d437792e33

diff --git a/jpeg/ExternalPackage_jpeg.mk b/jpeg/ExternalPackage_jpeg.mk
new file mode 100644
index 0000000..c451ed5
--- /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 fea0f0b..806d577 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 2b504f6..19e4dd7 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: