This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new bf2083a787 Minor cleanup
bf2083a787 is described below
commit bf2083a78769a8759f24c4e34bc31aff1175fa7e
Author: mseidel <[email protected]>
AuthorDate: Mon May 20 17:33:42 2024 +0200
Minor cleanup
(cherry picked from commit c622e83ad38c464d4787e61242dd0f6ebdd5f92d)
---
main/packimages/Makefile | 8 ++++----
main/packimages/Module_packimages.mk | 11 ++++-------
main/packimages/Package_packimages.mk | 11 +++++------
3 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/main/packimages/Makefile b/main/packimages/Makefile
index c1d144cbd4..88133e62be 100644
--- a/main/packimages/Makefile
+++ b/main/packimages/Makefile
@@ -1,5 +1,5 @@
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -7,16 +7,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
ifeq ($(strip $(SOLARENV)),)
diff --git a/main/packimages/Module_packimages.mk
b/main/packimages/Module_packimages.mk
index ac44806af8..f760513b2d 100644
--- a/main/packimages/Module_packimages.mk
+++ b/main/packimages/Module_packimages.mk
@@ -1,5 +1,5 @@
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -7,25 +7,22 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
-
-
$(eval $(call gb_Module_Module,packimages))
$(eval $(call gb_Module_add_targets,packimages,\
Package_packimages \
))
-
# vim: set noet sw=4 ts=4:
diff --git a/main/packimages/Package_packimages.mk
b/main/packimages/Package_packimages.mk
index 2c6e8deaa5..24a953fc76 100644
--- a/main/packimages/Package_packimages.mk
+++ b/main/packimages/Package_packimages.mk
@@ -1,5 +1,5 @@
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -7,20 +7,18 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
-
-
$(eval $(call
gb_Package_Package,packimages_packimages,$(WORKDIR)/CustomTarget/packimages,packimages))
# Custom sets, at 24x24 & 16x16 fall-back to industrial preferentially
@@ -121,3 +119,4 @@ $(WORKDIR)/CustomTarget/packimages/classic.flag :
cat $@ || echo "ERROR: unpacking $(CLASSIC_TARBALL) failed"
endif
+# vim: set noet sw=4 ts=4: