[Libreoffice-commits] core.git: xmlscript/Module_xmlscript.mk xmlscript/Package_dtd.mk xmlscript/Package_inc.mk

Bjoern Michaelsen bjoern.michaelsen at canonical.com
Tue Apr 16 11:08:12 PDT 2013


 xmlscript/Module_xmlscript.mk |    1 +
 xmlscript/Package_dtd.mk      |   17 +++++++++++++++++
 xmlscript/Package_inc.mk      |    7 -------
 3 files changed, 18 insertions(+), 7 deletions(-)

New commits:
commit f4ebb99de6e93f6d38e7b0486d66e99a196b1f6e
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Tue Apr 16 20:04:19 2013 +0200

    separate inc and dtd packages in xmlscript for global header move
    
    Change-Id: I3e00e33d4e684b18d4e30e115db69fbface76982

diff --git a/xmlscript/Module_xmlscript.mk b/xmlscript/Module_xmlscript.mk
index 5c74712..f0bf26d 100644
--- a/xmlscript/Module_xmlscript.mk
+++ b/xmlscript/Module_xmlscript.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_Module_Module,xmlscript))
 
 $(eval $(call gb_Module_add_targets,xmlscript,\
     Library_xmlscript \
+    Package_dtd \
     Package_inc \
 ))
 
diff --git a/xmlscript/Package_dtd.mk b/xmlscript/Package_dtd.mk
new file mode 100644
index 0000000..60e8871
--- /dev/null
+++ b/xmlscript/Package_dtd.mk
@@ -0,0 +1,17 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,xmlscript_dtd,$(SRCDIR)/xmlscript))
+
+$(eval $(call gb_Package_add_file,xmlscript_dtd,bin/dialog.dtd,dtd/dialog.dtd))
+$(eval $(call gb_Package_add_file,xmlscript_dtd,bin/libraries.dtd,dtd/libraries.dtd))
+$(eval $(call gb_Package_add_file,xmlscript_dtd,bin/library.dtd,dtd/library.dtd))
+$(eval $(call gb_Package_add_file,xmlscript_dtd,bin/module.dtd,dtd/module.dtd))
+
+# vim: set noet sw=4 ts=4:
diff --git a/xmlscript/Package_inc.mk b/xmlscript/Package_inc.mk
index 3be4832..ca3dae9 100644
--- a/xmlscript/Package_inc.mk
+++ b/xmlscript/Package_inc.mk
@@ -9,7 +9,6 @@
 
 $(eval $(call gb_Package_Package,xmlscript_inc,$(SRCDIR)/xmlscript))
 
-# headers
 $(eval $(call gb_Package_add_file,xmlscript_inc,inc/xmlscript/xmlscriptdllapi.h,inc/xmlscript/xmlscriptdllapi.h))
 $(eval $(call gb_Package_add_file,xmlscript_inc,inc/xmlscript/xml_helper.hxx,inc/xmlscript/xml_helper.hxx))
 $(eval $(call gb_Package_add_file,xmlscript_inc,inc/xmlscript/xmldlg_imexp.hxx,inc/xmlscript/xmldlg_imexp.hxx))
@@ -17,10 +16,4 @@ $(eval $(call gb_Package_add_file,xmlscript_inc,inc/xmlscript/xmllib_imexp.hxx,i
 $(eval $(call gb_Package_add_file,xmlscript_inc,inc/xmlscript/xmlmod_imexp.hxx,inc/xmlscript/xmlmod_imexp.hxx))
 $(eval $(call gb_Package_add_file,xmlscript_inc,inc/xmlscript/xmlns.h,inc/xmlscript/xmlns.h))
 
-# dtds
-$(eval $(call gb_Package_add_file,xmlscript_inc,bin/dialog.dtd,dtd/dialog.dtd))
-$(eval $(call gb_Package_add_file,xmlscript_inc,bin/libraries.dtd,dtd/libraries.dtd))
-$(eval $(call gb_Package_add_file,xmlscript_inc,bin/library.dtd,dtd/library.dtd))
-$(eval $(call gb_Package_add_file,xmlscript_inc,bin/module.dtd,dtd/module.dtd))
-
 # vim: set noet sw=4 ts=4:


More information about the Libreoffice-commits mailing list