[Libreoffice-commits] .: 2 commits - basebmp/CppunitTest_basebmp.mk basebmp/Library_basebmp.mk basebmp/Module_basebmp.mk basebmp/Package_inc.mk
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Sat Jun 16 02:45:23 PDT 2012
basebmp/CppunitTest_basebmp.mk | 65 ++++++++++++++---------------------------
basebmp/Library_basebmp.mk | 56 ++++++++---------------------------
basebmp/Module_basebmp.mk | 33 ++++----------------
basebmp/Package_inc.mk | 28 +++--------------
4 files changed, 49 insertions(+), 133 deletions(-)
New commits:
commit eccac35fff3c4d90e2fc60fdd67ed8e7a99aad76
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Jun 16 04:36:43 2012 -0500
basebmp gbuildification
Change-Id: I9b24ff3503b1dc1198aab622e36224e75cb31255
diff --git a/basebmp/CppunitTest_basebmp.mk b/basebmp/CppunitTest_basebmp.mk
new file mode 100644
index 0000000..cbdfef6
--- /dev/null
+++ b/basebmp/CppunitTest_basebmp.mk
@@ -0,0 +1,36 @@
+# -*- 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_CppunitTest_CppunitTest,basebmp_cpputest))
+
+$(eval $(call gb_CppunitTest_set_include,basebmp_cpputest,\
+ -I$(SRCDIR)/basebmp/inc/ \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,basebmp_cpputest,\
+ basebmp \
+ basegfx \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,basebmp_cpputest,\
+ basebmp/test/basictest \
+ basebmp/test/bmpmasktest \
+ basebmp/test/bmptest \
+ basebmp/test/cliptest \
+ basebmp/test/filltest \
+ basebmp/test/linetest \
+ basebmp/test/masktest \
+ basebmp/test/polytest \
+ basebmp/test/tools \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/basebmp/Library_basebmp.mk b/basebmp/Library_basebmp.mk
new file mode 100644
index 0000000..1d92e05
--- /dev/null
+++ b/basebmp/Library_basebmp.mk
@@ -0,0 +1,40 @@
+# -*- 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_Library_Library,basebmp))
+
+$(eval $(call gb_Library_use_package,basebmp,basebmp_inc))
+
+$(eval $(call gb_Library_use_api,basebmp,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_use_libraries,basebmp,\
+ basegfx \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_set_include,basebmp,\
+ -I$(SRCDIR)/basebmp/inc/ \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_defs,basebmp,\
+ -DBASEBMP_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_exception_objects,basebmp,\
+ basebmp/source/bitmapdevice \
+ basebmp/source/debug \
+ basebmp/source/polypolygonrenderer \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/basebmp/Module_basebmp.mk b/basebmp/Module_basebmp.mk
new file mode 100644
index 0000000..f6080f6
--- /dev/null
+++ b/basebmp/Module_basebmp.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_Module_Module,basebmp))
+
+$(eval $(call gb_Module_add_targets,basebmp,\
+ Library_basebmp \
+ Package_inc \
+))
+
+$(eval $(call gb_Module_add_check_targets,basebmp,\
+ CppunitTest_basebmp \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/basebmp/Package_inc.mk b/basebmp/Package_inc.mk
new file mode 100644
index 0000000..1be28fa
--- /dev/null
+++ b/basebmp/Package_inc.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_Package_Package,basebmp_inc,$(SRCDIR)/basebmp/inc))
+
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/bitmapdevice.hxx,basebmp/bitmapdevice.hxx))
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/basebmpdllapi.h,basebmp/basebmpdllapi.h))
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/color.hxx,basebmp/color.hxx))
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/debug.hxx,basebmp/debug.hxx))
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/drawmodes.hxx,basebmp/drawmodes.hxx))
+$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/scanlineformats.hxx,basebmp/scanlineformats.hxx))
+
+# vim: set noet sw=4 ts=4:
commit a96262179e38837717256a05242af0ad04ddabeb
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri Jun 15 19:36:12 2012 -0500
revert gmk4 commit
Change-Id: I386d735645de648b08fa10baec4884d253f5a681
diff --git a/basebmp/CppunitTest_basebmp.mk b/basebmp/CppunitTest_basebmp.mk
deleted file mode 100644
index e1e7f30..0000000
--- a/basebmp/CppunitTest_basebmp.mk
+++ /dev/null
@@ -1,55 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 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.
-#
-#*************************************************************************
-
-$(eval $(call gb_CppunitTest_CppunitTest,basebmp_test))
-
-$(eval $(call gb_CppunitTest_set_include,basebmp_test,\
- -I$(SRCDIR)/basebmp/inc/ \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,basebmp_test, \
- basebmp/test/basictest \
- basebmp/test/bmpmasktest \
- basebmp/test/bmptest \
- basebmp/test/cliptest \
- basebmp/test/filltest \
- basebmp/test/linetest \
- basebmp/test/masktest \
- basebmp/test/polytest \
- basebmp/test/tools \
-))
-
-$(eval $(call gb_CppunitTest_use_libraries,basebmp_test, \
- basebmp \
- basegfx \
- sal \
- $(gb_STDLIBS) \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/basebmp/Library_basebmp.mk b/basebmp/Library_basebmp.mk
deleted file mode 100644
index f747d3d..0000000
--- a/basebmp/Library_basebmp.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 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.
-#
-#*************************************************************************
-
-$(eval $(call gb_Library_Library,basebmp))
-
-$(eval $(call gb_Library_use_package,basebmp,basebmp_inc))
-
-$(eval $(call gb_Library_set_include,basebmp,\
- -I$(SRCDIR)/basebmp/inc/ \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_Library_use_api,basebmp,\
- offapi \
- udkapi \
-))
-
-$(eval $(call gb_Library_add_defs,basebmp,\
- -DBASEBMP_DLLIMPLEMENTATION \
-))
-
-$(eval $(call gb_Library_use_libraries,basebmp,\
- basegfx \
- sal \
- $(gb_STDLIBS) \
-))
-
-ifeq ($(OS),SOLARIS)
-$(eval $(call gb_Library_add_cxxobjects,basebmp, \
- basebmp/source/bitmapdevice \
- basebmp/source/debug \
- basebmp/source/polypolygonrenderer \
- , $(gb_COMPILEROPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) -xalias_level=compatible \
-))
-else
-$(eval $(call gb_Library_add_exception_objects,basebmp,\
- basebmp/source/bitmapdevice \
- basebmp/source/debug \
- basebmp/source/polypolygonrenderer \
-))
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/basebmp/Module_basebmp.mk b/basebmp/Module_basebmp.mk
deleted file mode 100644
index 071bf32..0000000
--- a/basebmp/Module_basebmp.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 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.
-#
-#*************************************************************************
-
-$(eval $(call gb_Module_Module,basebmp))
-
-$(eval $(call gb_Module_add_targets,basebmp,\
- Library_basebmp \
- Package_inc \
-))
-
-$(eval $(call gb_Module_add_check_targets,basebmp,\
- CppunitTest_basebmp \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/basebmp/Package_inc.mk b/basebmp/Package_inc.mk
deleted file mode 100644
index b1298e9..0000000
--- a/basebmp/Package_inc.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 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.
-#
-#*************************************************************************
-
-$(eval $(call gb_Package_Package,basebmp_inc,$(SRCDIR)/basebmp/inc))
-$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/bitmapdevice.hxx,basebmp/bitmapdevice.hxx))
-$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/basebmpdllapi.h,basebmp/basebmpdllapi.h))
-$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/color.hxx,basebmp/color.hxx))
-$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/debug.hxx,basebmp/debug.hxx))
-$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/drawmodes.hxx,basebmp/drawmodes.hxx))
-$(eval $(call gb_Package_add_file,basebmp_inc,inc/basebmp/scanlineformats.hxx,basebmp/scanlineformats.hxx))
-
-# vim: set noet sw=4 ts=4:
More information about the Libreoffice-commits
mailing list