[Libreoffice-commits] .: xmlsecurity/AllLangResTarget.mk xmlsecurity/AllLangResTarget_xsec.mk xmlsecurity/Module_xmlsecurity.mk

Matus Kukan mkukan at kemper.freedesktop.org
Wed Aug 10 06:57:56 PDT 2011


 xmlsecurity/AllLangResTarget.mk      |   45 ------------------------------
 xmlsecurity/AllLangResTarget_xsec.mk |   51 +++++++++++++++++++++++++++++++++++
 xmlsecurity/Module_xmlsecurity.mk    |    1 
 3 files changed, 52 insertions(+), 45 deletions(-)

New commits:
commit ed4393f649b8746d8d9a895b511bcc2f35a62ef5
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Wed Aug 10 15:57:25 2011 +0200

    process also resource files

diff --git a/xmlsecurity/AllLangResTarget.mk b/xmlsecurity/AllLangResTarget.mk
deleted file mode 100644
index 499d38c..0000000
--- a/xmlsecurity/AllLangResTarget.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-# 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 or as specified alternatively below. 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
-#       Matúš Kukan <matus.kukan at gmail.com>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# For minor contributions see the git repository.
-#
-# 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.
-
-$(eval $(call gb_AllLangResTarget_AllLangResTarget,xmlsec))
-
-$(eval $(call gb_AllLangResTarget_add_srs,xmlsec,\
-	xmlsec/res
-))
-
-$(eval $(call gb_SrsTarget_SrsTarget,xmlsec/res))
-
-$(eval $(call gb_SrsTarget_add_files,xmlsec/res,\
-	xmlsecurity/source/dialogs/certificateviewer.src \
-	xmlsecurity/source/dialogs/macrosecurity.src \
-	xmlsecurity/source/dialogs/certificatechooser.src \
-	xmlsecurity/source/dialogs/digitalsignaturesdialog.src \
-	xmlsecurity/source/component/warnbox.src \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/xmlsecurity/AllLangResTarget_xsec.mk b/xmlsecurity/AllLangResTarget_xsec.mk
new file mode 100644
index 0000000..3dd76e1
--- /dev/null
+++ b/xmlsecurity/AllLangResTarget_xsec.mk
@@ -0,0 +1,51 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# 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 or as specified alternatively below. 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
+#       Matúš Kukan <matus.kukan at gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# 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.
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,xmlsec))
+
+$(eval $(call gb_AllLangResTarget_add_srs,xmlsec,\
+	xmlsec/res
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,xmlsec/res))
+
+$(eval $(call gb_SrsTarget_set_include,xmlsec/res,\
+	$$(INCLUDE) \
+	-I$(realpath $(SRCDIR)/xmlsec/inc/xmlsecurity) \
+	-I$(realpath $(SRCDIR)/xmlsec/source/dialogs) \
+))
+
+$(eval $(call gb_SrsTarget_add_files,xmlsec/res,\
+	xmlsecurity/source/dialogs/certificateviewer.src \
+	xmlsecurity/source/dialogs/macrosecurity.src \
+	xmlsecurity/source/dialogs/certificatechooser.src \
+	xmlsecurity/source/dialogs/digitalsignaturesdialog.src \
+	xmlsecurity/source/component/warnbox.src \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/xmlsecurity/Module_xmlsecurity.mk b/xmlsecurity/Module_xmlsecurity.mk
index 87b7848..59a00ac 100644
--- a/xmlsecurity/Module_xmlsecurity.mk
+++ b/xmlsecurity/Module_xmlsecurity.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_Module_Module,xmlsecurity))
 ifeq ($(WITH_MOZILLA),YES)
 
 $(eval $(call gb_Module_add_targets,xmlsecurity,\
+	AllLangResTarget_xsec \
 	Library_xmlsecurity \
 	Library_xsec_fw \
 ))


More information about the Libreoffice-commits mailing list