diff options
Diffstat (limited to 'lcms2')
-rw-r--r-- | lcms2/ExternalPackage_lcms2.mk | 32 | ||||
-rw-r--r-- | lcms2/ExternalProject_lcms2.mk | 45 | ||||
-rw-r--r-- | lcms2/Makefile | 7 | ||||
-rw-r--r-- | lcms2/Module_lcms2.mk | 20 | ||||
-rw-r--r-- | lcms2/UnpackedTarball_lcms2.mk | 20 | ||||
-rw-r--r-- | lcms2/makefile.mk | 115 | ||||
-rw-r--r-- | lcms2/prj/build.lst | 3 | ||||
-rw-r--r-- | lcms2/prj/d.lst | 11 | ||||
-rw-r--r-- | lcms2/prj/dmake | 0 |
9 files changed, 128 insertions, 125 deletions
diff --git a/lcms2/ExternalPackage_lcms2.mk b/lcms2/ExternalPackage_lcms2.mk deleted file mode 100644 index 628930f321e3..000000000000 --- a/lcms2/ExternalPackage_lcms2.mk +++ /dev/null @@ -1,32 +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,lcms2,lcms2)) -$(eval $(call gb_ExternalPackage_use_external_project,lcms2,lcms2)) - -$(eval $(call gb_ExternalPackage_add_file,lcms2,inc/lcms2/lcms2.h,include/lcms2.h)) - -ifeq ($(OS),MACOSX) -$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.dylib,src/.libs/liblcms2.2.dylib)) -else ifeq ($(filter-out IOS ANDROID,$(OS)),) -$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.a,src/.libs/liblcms2.a)) -else ifeq ($(OS),WNT) -ifeq ($(COM),GCC) -$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.dll.a,src/.libs/liblcms2.dll.a)) -$(eval $(call gb_ExternalPackage_add_file,lcms2,bin/liblcms2.dll,src/.libs/liblcms2.dll)) -else ifeq ($(COM),MSC) -$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/lcms2.lib,bin/lcms2.lib)) -$(eval $(call gb_ExternalPackage_add_file,lcms2,bin/lcms2.dll,bin/lcms2.dll)) -endif -else -$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.so,src/.libs/liblcms2.so)) -$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.so.2,src/.libs/liblcms2.so.2)) -$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.so.2.0.4,src/.libs/liblcms2.so.2.0.4)) -endif -# vim: set noet sw=4 ts=4: diff --git a/lcms2/ExternalProject_lcms2.mk b/lcms2/ExternalProject_lcms2.mk deleted file mode 100644 index ef677f2c72bf..000000000000 --- a/lcms2/ExternalProject_lcms2.mk +++ /dev/null @@ -1,45 +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_ExternalProject_ExternalProject,lcms2)) - -$(eval $(call gb_ExternalProject_use_unpacked,lcms2,lcms2)) - -$(eval $(call gb_ExternalProject_use_package,lcms2,hunspell)) - -$(eval $(call gb_ExternalProject_register_targets,lcms2,\ - build \ -)) - -ifeq ($(COM),MSC) - -ifeq ($(filter-out 14 13,$(COMEX)),) -$(call gb_ExternalProject_get_state_target,lcms2,build): - cd $(EXTERNAL_WORKDIR)/Projects/VC2010/lcms2_DLL \ - && MSBuild.exe lcms2_DLL.vcxproj /p:Configuration=Release /p:Platform=Win32 /p:TargetName=lcms2 \ - $(if $(filter 14,$(COMEX)),/p:PlatformToolset=v110) \ - && touch $@ -else -$(call gb_ExternalProject_get_state_target,lcms2,build): - cd $(EXTERNAL_WORKDIR)/VC2008/lcms2_DLL \ - && $(COMPATH)/vcpackages/vcbuild.exe lcms2_DLL.vcproj "Release|Win32" \ - && touch $@ -endif -else -$(call gb_ExternalProject_get_state_target,lcms2,build): - cd $(EXTERNAL_WORKDIR) \ - && ./configure --without-jpeg --without-tiff --with-pic \ - $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - CPPFLAGS=" $(SOLARINC)" \ - $(if $(filter IOS ANDROID,$(OS)),--disable-shared, --enable-shared --disable-static) \ - && cd src \ - && $(MAKE) \ - && touch $@ -endif -# vim: set noet sw=4 ts=4: diff --git a/lcms2/Makefile b/lcms2/Makefile deleted file mode 100644 index ccb1c85a04da..000000000000 --- a/lcms2/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- - -module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) - -include $(module_directory)/../solenv/gbuild/partial_build.mk - -# vim: set noet sw=4 ts=4: diff --git a/lcms2/Module_lcms2.mk b/lcms2/Module_lcms2.mk deleted file mode 100644 index 898af93bce76..000000000000 --- a/lcms2/Module_lcms2.mk +++ /dev/null @@ -1,20 +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_Module_Module,lcms2)) - -ifeq ($(SYSTEM_LCMS2),NO) -$(eval $(call gb_Module_add_targets,lcms2,\ - UnpackedTarball_lcms2 \ - ExternalPackage_lcms2 \ - ExternalProject_lcms2 \ -)) -endif - -# vim: set noet sw=4 ts=4: diff --git a/lcms2/UnpackedTarball_lcms2.mk b/lcms2/UnpackedTarball_lcms2.mk deleted file mode 100644 index 4d6cfda74a48..000000000000 --- a/lcms2/UnpackedTarball_lcms2.mk +++ /dev/null @@ -1,20 +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_UnpackedTarball_UnpackedTarball,lcms2)) - -$(eval $(call gb_UnpackedTarball_set_tarball,lcms2,$(LCMS2_TARBALL))) -$(eval $(call gb_UnpackedTarball_set_patchlevel,lcms2,3)) - -$(eval $(call gb_UnpackedTarball_add_patches,lcms2,\ - lcms2/lcms2.patch \ - lcms2/lcms2-2.4-windows.patch \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk new file mode 100644 index 000000000000..01011f204c1c --- /dev/null +++ b/lcms2/makefile.mk @@ -0,0 +1,115 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=. + +PRJNAME=lcms2 +TARGET=so_lcms2 + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk + +# --- Files -------------------------------------------------------- + +TARFILE_NAME=lcms2-2.4 +TARFILE_MD5=861ef15fa0bc018f9ddc932c4ad8b6dd + +PATCH_FILES = lcms2.patch + +.IF "$(SYSTEM_LCMS2)" == "YES" +@all: + @echo "Using system littlecms2..." +.ENDIF + +.IF "$(GUI)$(COM)"=="WNTMSC" + +PATCH_FILES += lcms2-2.4-windows.patch + +CONFIGURE_DIR=. + +CONFIGURE_ACTION = + +.IF "$(CCNUMVER)" >= "001700000000" +BUILD_DIR=Projects/VC2010/lcms2_DLL +BUILD_ACTION=MSBuild.exe lcms2_DLL.vcxproj /p:Configuration=Release /p:Platform=Win32 /p:TargetName=lcms2 /p:PlatformToolset=v110 +.ELIF "$(CCNUMVER)" >= "001600000000" +BUILD_DIR=Projects/VC2010/lcms2_DLL +BUILD_ACTION=MSBuild.exe lcms2_DLL.vcxproj /p:Configuration=Release /p:Platform=Win32 /p:TargetName=lcms2 +.ELSE +BUILD_DIR=Projects/VC2008/lcms2_DLL +BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe lcms2_DLL.vcproj "Release|Win32" +.ENDIF + +.ELSE #"$(GUI)$(COM)"!="WNTMSC" + +CONFIGURE_DIR=. +BUILD_DIR=src + +CONFIGURE_ACTION = CPPFLAGS="$(SOLARINC)" ./configure --without-jpeg --without-tiff --with-pic --enable-shared --disable-static + +.IF "$(CROSS_COMPILING)" == "YES" +CONFIGURE_ACTION += --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) +.ENDIF + +.IF "$(OS)" == "MACOSX" +CONFIGURE_FLAGS += \ + --prefix=/@.__________________________________________________$(EXTRPATH) +.END + +.IF "$(OS)" == "IOS" || "$(OS)" == "ANDROID" +CONFIGURE_ACTION += --disable-shared +.ENDIF + +BUILD_ACTION = $(GNUMAKE) -j$(PARALLELISM) + +.ENDIF # "$(GUI)$(COM)"=="WNTMSC" + +OUT2INC+=include$/lcms2*.h + +.IF "$(OS)"=="MACOSX" +OUT2LIB+=src$/.libs$/liblcms2.*.dylib +.ELIF "$(OS)"=="IOS" || "$(OS)" == "ANDROID" +OUT2LIB+=src$/.libs$/liblcms2.a +.ELIF "$(OS)"=="WNT" +.IF "$(COM)"=="GCC" +OUT2LIB+=src$/.libs$/liblcms2.dll.a +OUT2BIN+=src$/.libs$/*.dll +.ELSE +OUT2LIB+=bin$/lcms2.lib +OUT2BIN+=bin$/lcms2.dll +.ENDIF +.ELSE +OUT2LIB+=src$/.libs$/liblcms2.so* +.ENDIF + +# --- Targets ------------------------------------------------------ + +.INCLUDE : set_ext.mk +.INCLUDE : target.mk +.INCLUDE : tg_ext.mk + diff --git a/lcms2/prj/build.lst b/lcms2/prj/build.lst index e9c203e5b484..551f0f385474 100644 --- a/lcms2/prj/build.lst +++ b/lcms2/prj/build.lst @@ -1,2 +1,3 @@ lcms lcms2 : soltools ZLIB:zlib NULL -lcms lcms2/prj nmake - all lcms_prj NULL +lcms lcms2 usr1 - all lcms_mkout NULL +lcms lcms2 nmake - all lcms_libwpd NULL diff --git a/lcms2/prj/d.lst b/lcms2/prj/d.lst index e69de29bb2d1..b79227eff87f 100644 --- a/lcms2/prj/d.lst +++ b/lcms2/prj/d.lst @@ -0,0 +1,11 @@ +mkdir: %_DEST%\inc\lcms2 +..\%__SRC%\inc\*.h %_DEST%\inc\lcms2\*.h +..\%__SRC%\lib\liblcms2.so.2 %_DEST%\lib\liblcms2.so.2 +..\%__SRC%\lib\liblcms2.a %_DEST%\lib\liblcms2.a +symlink: %_DEST%\lib\liblcms2.so.2 %_DEST%\lib\liblcms2.so +..\%__SRC%\lib\liblcms2.2.dylib %_DEST%\lib\liblcms2.2.dylib +symlink: %_DEST%\lib\liblcms2.2.dylib %_DEST%\lib\liblcms2.dylib +..\%__SRC%\lib\liblcms2.so %_DEST%\lib\liblcms2.so +..\%__SRC%\lib\*.lib %_DEST%\lib +..\%__SRC%\lib\liblcms2.dll.a %_DEST%\lib\liblcms2.dll.a +..\%__SRC%\bin\*.dll %_DEST%\bin diff --git a/lcms2/prj/dmake b/lcms2/prj/dmake new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/lcms2/prj/dmake |