jpeg: remove ExternalPackage_jpeg

Change-Id: I09a4b3a3ef816a8bf63d4aa0c7fe7bec2a67dbd8

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),\

jpeg/ExternalPackage_jpeg.mk

-# -*- 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:

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 \
 ))