Simplify, remove lang suffix, remove html and rtf licenses, to use odt.

Conflicts:

	readlicense_oo/odt/makefile.mk

readlicense_oo/html/makefile.mk

@@ -1,47 +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.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=readlicense_oo
-TARGET=html
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-all: $(MISC)$/THIRDPARTYLICENSEREADME.html
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-$(MISC)$/THIRDPARTYLICENSEREADME.html: THIRDPARTYLICENSEREADME.html
-    $(COPY) THIRDPARTYLICENSEREADME.html $@
-

readlicense_oo/makefile.mk

@@ -7,14 +7,14 @@ TARGET=source
 # ------------------------------------------------------------------
 
 .IF "$(GUI)"=="WNT"
-SYSLICBASE=license.txt license.html license.rtf
+SYSLICBASE=license.txt LICENSE.odt
 SYSLICDEST=$(MISC)$/license$/wnt
 .ELSE          # "$(GUI)"=="WNT"
-SYSLICBASE=LICENSE LICENSE.html
+SYSLICBASE=LICENSE LICENSE.odt
 SYSLICDEST=$(MISC)$/license$/unx
 .ENDIF          # "$(GUI)"=="WNT"
 
-SOURCELICENCES=$(foreach,i,$(SYSLICBASE) $(SYSLICDEST)$/$(i:b)_en-US$(i:e))
+SOURCELICENCES=$(foreach,i,$(SYSLICBASE) $(SYSLICDEST)$/$(i:b)$(i:e))
 
 fallbacklicenses=$(foreach,i,{$(subst,$(defaultlangiso), $(alllangiso))} $(foreach,j,$(SYSLICBASE) $(SYSLICDEST)$/$(j:b)_$i$(j:e)))
 
@@ -34,19 +34,22 @@ just_for_nice_optics: $(fallbacklicenses)
     @$(ECHONL)
 
 # for windows, convert linends to DOS
-$(SYSLICDEST)$/license_en-US.% : source$/license$/license_en-US.%
+$(SYSLICDEST)$/license.% : txt$/license.%
     @-$(MKDIRHIER) $(SYSLICDEST)
     $(PERL) -p -e 's/\r?\n$$/\r\n/' < $< > $@
 
 # for others just copy
-$(SYSLICDEST)$/LICENSE_en-US : source$/license$/license_en-US.txt
+$(SYSLICDEST)$/LICENSE : txt$/license.txt
+    @-$(MKDIRHIER) $(SYSLICDEST)
+    $(COPY) $< $@
+$(SYSLICDEST)$/LICENSE.odt : odt$/LICENSE.odt
     @-$(MKDIRHIER) $(SYSLICDEST)
     $(COPY) $< $@
 
-$(SYSLICDEST)$/LICENSE_en-US.html : source$/license$/license_en-US.html
-    @-$(MKDIRHIER) $(SYSLICDEST)
-    $(COPY) $< $@
-
-$(SYSLICDEST)$/LICENSE.odt : source$/license$/license.odt
-    @-$(MKDIRHIER) $(SYSLICDEST)
-    $(COPY) $< $@
+# just copy into misc
+$(MISC)$/LICENSE.odt: LICENSE.odt
+    $(COPY) LICENSE.odt $@
+$(MISC)$/CREDITS.odt: CREDITS.odt
+    $(COPY) CREDITS.odt $@
+$(MISC)$/THIRDPARTYLICENSEREADME.html: THIRDPARTYLICENSEREADME.html
+    $(COPY) THIRDPARTYLICENSEREADME.html $@

readlicense_oo/odt/makefile.mk

@@ -1,48 +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.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=readlicense_oo
-TARGET=odt
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-all: $(MISC)$/LICENSE.odt $(MISC)$/CREDITS.odt
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-$(MISC)$/LICENSE.odt: LICENSE.odt
-    $(COPY) LICENSE.odt $@
-$(MISC)$/CREDITS.odt: CREDITS.odt
-    $(COPY) CREDITS.odt $@

readlicense_oo/prj/build.lst

@@ -1,7 +1,5 @@
-ro  readlicense_oo :    l10n solenv LIBXSLT:libxslt NULL
-ro  readlicense_oo			usr1 - all ro_root NULL
-ro  readlicense_oo\docs\readme			nmake - all ro_readme NULL
-ro  readlicense_oo\html			nmake - all ro_html NULL
-ro  readlicense_oo\odt			nmake - all ro_odt NULL
-ro  readlicense_oo			nmake - all ro_conv NULL
+ro  readlicense_oo : l10n solenv LIBXSLT:libxslt NULL
+ro  readlicense_oo		usr1 - all ro_root NULL
+ro  readlicense_oo\docs\readme	nmake - all ro_readme NULL
+ro  readlicense_oo		nmake - all ro_conv NULL