vigra: convert to gbuild

Change-Id: Ie5f050bf5f672a35d9629dcfb039d9fff7470cab

6 files changed, 48 insertions, 83 deletions

diff --git a/vigra/Makefile b/vigra/Makefile
new file mode 100644
index 000000000000..ccb1c85a04da
--- /dev/null
+++ b/vigra/Makefile
@@ -0,0 +1,7 @@
+# -*- 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/vigra/Module_vigra.mk b/vigra/Module_vigra.mk
new file mode 100644
index 000000000000..af2369f31323
--- /dev/null
+++ b/vigra/Module_vigra.mk
@@ -0,0 +1,20 @@
+# -*- 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,vigra))
+
+ifeq ($(SYSTEM_VIGRA),NO)
+
+$(eval $(call gb_Module_add_targets,vigra,\
+	UnpackedTarball_vigra \
+))
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/vigra/UnpackedTarball_vigra.mk b/vigra/UnpackedTarball_vigra.mk
new file mode 100644
index 000000000000..72e6209253af
--- /dev/null
+++ b/vigra/UnpackedTarball_vigra.mk
@@ -0,0 +1,21 @@
+# -*- 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,vigra))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,vigra,$(VIGRA_TARBALL)))
+
+$(eval $(call gb_UnpackedTarball_add_patches,vigra,\
+	vigra/vigra1.4.0.patch \
+	$(if $(filter GCC,$(COM)), \
+		vigra/vigra1.4.0-unused-parameters.patch) \
+	vigra/vigra1.4.0-enumwarn.patch \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/vigra/makefile.mk b/vigra/makefile.mk
deleted file mode 100644
index ff351732fd87..000000000000
--- a/vigra/makefile.mk
+++ /dev/null
@@ -1,80 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-# dmake create_clean -- just unpacks
-# dmake patch -- unpacks and applies patch file
-# dmake create_patch -- creates a patch file
-
-PRJ=.
-
-PRJNAME=vigra
-TARGET=vigra
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-.IF "$(SYSTEM_VIGRA)" == "YES"
-all:
-    @echo "An already available installation of vigra should exist on your system."        
-    @echo "Therefore the version provided here does not need to be built in addition."
-.ELSE
-
-# --- Files --------------------------------------------------------
-
-TARFILE_NAME=vigra1.4.0
-TARFILE_MD5=ea91f2fb4212a21d708aced277e6e85a
-PATCH_FILES=$(TARFILE_NAME).patch
-
-# Help static analysis tools (see SAL_UNUSED_PARAMETER in sal/types.h):
-.IF "$(COM)" == "GCC"
-PATCH_FILES += vigra1.4.0-unused-parameters.patch
-.END
-
-# At least GCC 4.7 treats more correctly now the type of enumerators prior to
-# the closing brace of the enum-specifier (see [dcl.enum] in the C++ 2003
-# Standard), leading to "comparison between <enum1> and <enum2> [-Werror=enum-
-# compare]" and "enumeral mismatch in conditional expression [-Werror]"
-# warnings (included upstream as <https://github.com/ukoethe/vigra/commit/
-# e0dcd31c76bb13c98920e21544b309ca47bb3c5c> "added explicit cast (gcc 4.7
-# compatibility patch by Stephan Bergmann)"):
-PATCH_FILES += vigra1.4.0-enumwarn.patch
-
-CONFIGURE_DIR=
-CONFIGURE_ACTION=
-
-BUILD_DIR=
-BUILD_ACTION=
-BUILD_FLAGS=
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : set_ext.mk
-.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
-
-.ENDIF
diff --git a/vigra/prj/d.lst b/vigra/prj/d.lst
index ddf8fafb24a1..e69de29bb2d1 100644
--- a/vigra/prj/d.lst
+++ b/vigra/prj/d.lst
@@ -1,3 +0,0 @@
-mkdir: %_DEST%\inc\vigra
-
-..\%__SRC%\misc\build\vigra1.4.0\include\vigra\*.hxx %_DEST%\inc\vigra\*.hxx
diff --git a/vigra/prj/dmake b/vigra/prj/dmake
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/vigra/prj/dmake
+++ /dev/null