[Libreoffice-commits] .: solenv/gbuild

[François Tigeot]

 solenv/gbuild/gbuild.mk                    |    2 -
 solenv/gbuild/platform/dragonfly-INTEL.mk  |   37 ------------------------
 solenv/gbuild/platform/dragonfly-X86_64.mk |   43 -----------------------------
 solenv/gbuild/platform/dragonfly.mk        |   43 +++++++++++++++++++++++++++++
 4 files changed, 44 insertions(+), 81 deletions(-)

New commits:
commit 07465c15d92fae5d33cdc650822f42e9bccefabd
Author: Francois Tigeot <ftigeot at wolfpond.org>
Date:   Fri Mar 25 16:54:09 2011 +0100

    Consolidate all platform/dragonfly-*.mk in a single file.

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 4b26763..3802f5e 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -160,7 +160,7 @@ include $(GBUILDDIR)/platform/freebsd-$(CPUNAME).mk
 else ifeq ($(OS),NETBSD)
 include $(GBUILDDIR)/platform/netbsd-$(CPUNAME).mk
 else ifeq ($(OS),DRAGONFLY)
-include $(GBUILDDIR)/platform/dragonfly-$(CPUNAME).mk
+include $(GBUILDDIR)/platform/dragonfly.mk
 else ifeq ($(OS),SOLARIS)
 include $(GBUILDDIR)/platform/solaris.mk
 else
diff --git a/solenv/gbuild/platform/dragonfly-INTEL.mk b/solenv/gbuild/platform/dragonfly-INTEL.mk
deleted file mode 100755
index 99d821b..0000000
--- a/solenv/gbuild/platform/dragonfly-INTEL.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-#*************************************************************************
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (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.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#        Caolán McNamara <caolanm at redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Caolán McNamara <caolanm at redhat.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-#*************************************************************************
-
-#please make generic modifications to unxgcc.mk
-gb_CPUDEFS := -DX86
-gb_Library_DLLPOSTFIX := df
-gb_COMPILERDEFAULTOPTFLAGS := -Os
-
-include $(GBUILDDIR)/platform/unxgcc.mk
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/dragonfly-X86_64.mk b/solenv/gbuild/platform/dragonfly-X86_64.mk
deleted file mode 100644
index 77e6540..0000000
--- a/solenv/gbuild/platform/dragonfly-X86_64.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#*************************************************************************
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (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.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#        Caolán McNamara <caolanm at redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Caolán McNamara <caolanm at redhat.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-#*************************************************************************
-
-#please make generic modifications to unxgcc.mk
-
-ifeq ($(CPUNAME),INTEL)
-gb_CPUDEFS := -DX86
-else
-gb_CPUDEFS := -D$(CPUNAME)
-endif
-
-gb_Library_DLLPOSTFIX := df
-gb_COMPILERDEFAULTOPTFLAGS := -O -g
-
-include $(GBUILDDIR)/platform/unxgcc.mk
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/dragonfly.mk b/solenv/gbuild/platform/dragonfly.mk
new file mode 100644
index 0000000..77e6540
--- /dev/null
+++ b/solenv/gbuild/platform/dragonfly.mk
@@ -0,0 +1,43 @@
+#*************************************************************************
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (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.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#        Caolán McNamara <caolanm at redhat.com> (Red Hat, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Caolán McNamara <caolanm at redhat.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+#*************************************************************************
+
+#please make generic modifications to unxgcc.mk
+
+ifeq ($(CPUNAME),INTEL)
+gb_CPUDEFS := -DX86
+else
+gb_CPUDEFS := -D$(CPUNAME)
+endif
+
+gb_Library_DLLPOSTFIX := df
+gb_COMPILERDEFAULTOPTFLAGS := -O -g
+
+include $(GBUILDDIR)/platform/unxgcc.mk
+
+# vim: set noet sw=4: