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 070d78e530 Cleanup Make files
070d78e530 is described below
commit 070d78e5305d1cd150138ac74b5805375b53ac08
Author: mseidel <msei...@apache.org>
AuthorDate: Wed Feb 15 02:01:21 2023 +0100
Cleanup Make files
(cherry picked from commit 3562d4444a8a7e945006ebf04b89c574cbbe70dc)
---
main/drawinglayer/Module_drawinglayer.mk | 10 +++++-----
main/oox/Module_oox.mk | 10 +++++-----
main/rsc/Package_inc.mk | 10 +++++-----
main/solenv/gbuild/extensions/post_PackModule.mk | 12 ++++++------
main/solenv/gbuild/extensions/post_SetupLocal.mk | 8 ++++----
main/solenv/gbuild/extensions/pre_SharedLangList.mk | 10 +++++-----
main/starmath/Module_starmath.mk | 10 +++++-----
main/svgio/Module_svgio.mk | 16 +++++++++-------
main/sw/Module_sw.mk | 10 +++++-----
9 files changed, 49 insertions(+), 47 deletions(-)
diff --git a/main/drawinglayer/Module_drawinglayer.mk
b/main/drawinglayer/Module_drawinglayer.mk
index 495da78c6f..912b2e6409 100644
--- a/main/drawinglayer/Module_drawinglayer.mk
+++ b/main/drawinglayer/Module_drawinglayer.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,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.
-#
+#
#**************************************************************
@@ -28,4 +28,4 @@ $(eval $(call gb_Module_add_targets,drawinglayer,\
Package_inc \
))
-# vim: set noet ts=4 sw=4:
+# vim: set noet sw=4 ts=4:
diff --git a/main/oox/Module_oox.mk b/main/oox/Module_oox.mk
index 50a3f10844..bcf89c4e7f 100644
--- a/main/oox/Module_oox.mk
+++ b/main/oox/Module_oox.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,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.
-#
+#
###############################################################
@@ -30,4 +30,4 @@ $(eval $(call gb_Module_add_targets,oox,\
Package_generated \
))
-# vim: set noet ts=4 sw=4:
+# vim: set noet sw=4 ts=4:
diff --git a/main/rsc/Package_inc.mk b/main/rsc/Package_inc.mk
index bf24f85e74..8aee672a16 100644
--- a/main/rsc/Package_inc.mk
+++ b/main/rsc/Package_inc.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,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.
-#
+#
#**************************************************************
@@ -24,4 +24,4 @@
$(eval $(call gb_Package_Package,rsc_inc,$(SRCDIR)/rsc/inc))
$(eval $(call gb_Package_add_file,rsc_inc,inc/rsc/rscsfx.hxx,rsc/rscsfx.hxx))
-# vim: set noet ts=4 sw=4:
+# vim: set noet sw=4 ts=4:
diff --git a/main/solenv/gbuild/extensions/post_PackModule.mk
b/main/solenv/gbuild/extensions/post_PackModule.mk
index b964b38473..b4ab93cdc9 100644
--- a/main/solenv/gbuild/extensions/post_PackModule.mk
+++ b/main/solenv/gbuild/extensions/post_PackModule.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,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.
-#
+#
#**************************************************************
@@ -54,5 +54,5 @@ endef
cleanpackmodule : clean
$(eval $(call gb_PackModule_setcleanpackmodulecommand))
$(COMMAND)
-
-# vim: set noet ts=4 sw=4:
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/solenv/gbuild/extensions/post_SetupLocal.mk
b/main/solenv/gbuild/extensions/post_SetupLocal.mk
index 1a96a26c00..5c2eb90d5d 100644
--- a/main/solenv/gbuild/extensions/post_SetupLocal.mk
+++ b/main/solenv/gbuild/extensions/post_SetupLocal.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,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.
-#
+#
#**************************************************************
diff --git a/main/solenv/gbuild/extensions/pre_SharedLangList.mk
b/main/solenv/gbuild/extensions/pre_SharedLangList.mk
index 2672b478a0..53b3f43d2c 100644
--- a/main/solenv/gbuild/extensions/pre_SharedLangList.mk
+++ b/main/solenv/gbuild/extensions/pre_SharedLangList.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,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.
-#
+#
#**************************************************************
@@ -31,4 +31,4 @@ else
gb_WITH_LANG=$(completelangiso)
endif
-# vim: set noet ts=4 sw=4:
+# vim: set noet sw=4 ts=4:
diff --git a/main/starmath/Module_starmath.mk b/main/starmath/Module_starmath.mk
index b4ef24b414..0f8e9c048e 100644
--- a/main/starmath/Module_starmath.mk
+++ b/main/starmath/Module_starmath.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,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.
-#
+#
###############################################################
@@ -36,4 +36,4 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,starmath,\
))
endif
-# vim: set noet ts=4 sw=4:
+# vim: set noet sw=4 ts=4:
diff --git a/main/svgio/Module_svgio.mk b/main/svgio/Module_svgio.mk
index 4ca9474263..ae0920a57f 100644
--- a/main/svgio/Module_svgio.mk
+++ b/main/svgio/Module_svgio.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,23 +7,25 @@
# * 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,svgio))
$(eval $(call gb_Module_add_targets,svgio,\
- Library_svgio \
- Package_inc \
+ Library_svgio \
+ Package_inc \
))
-# vim: set noet ts=4 sw=4:
+# vim: set noet sw=4 ts=4:
diff --git a/main/sw/Module_sw.mk b/main/sw/Module_sw.mk
index 83e7ec5c92..5465500bca 100644
--- a/main/sw/Module_sw.mk
+++ b/main/sw/Module_sw.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,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.
-#
+#
#**************************************************************
@@ -50,4 +50,4 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
))
endif
-# vim: set noet ts=4 sw=4:
+# vim: set noet sw=4 ts=4:
