[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - postprocess/CustomTarget_registry.mk
David Ostrovsky
david at ostrovsky.org
Mon Jul 22 07:49:13 PDT 2013
postprocess/CustomTarget_registry.mk | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 7d61c222ff1fded3524351bf6b16e34736ac17fa
Author: David Ostrovsky <david at ostrovsky.org>
Date: Thu Jul 18 20:53:59 2013 +0200
fdo#65761 yet another gbuildification bug
Change-Id: I88bdd3f0e1cc49b21579043ceaf42616fe2f2493
Reviewed-on: https://gerrit.libreoffice.org/4973
Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
Tested-by: Fridrich Strba <fridrich at documentfoundation.org>
Reviewed-on: https://gerrit.libreoffice.org/5033
Reviewed-by: Thorsten Behrens <tbehrens at suse.com>
Reviewed-by: Petr Mladek <pmladek at suse.cz>
Tested-by: Petr Mladek <pmladek at suse.cz>
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index 38758b2..27825f3 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -60,15 +60,6 @@ ifeq (DBCONNECTIVITY,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
postprocess_FILES_calc += \
$(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-calc.xcu
postprocess_DRIVERS += calc
-ifeq (WNT,$(OS))
-ifeq ($(WITH_MOZAB4WIN),YES)
-postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-mozab.xcu
-postprocess_DRIVERS += mozab
-endif
-else ifeq (DESKTOP,$(filter DESKTOP,$(BUILD_TYPE)))
-postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-mork.xcu
-postprocess_DRIVERS += mork
-endif
endif
postprocess_DEPS_cjk := main
@@ -291,6 +282,15 @@ postprocess_FILES_main += \
$(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-mysql.xcu \
$(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-odbc.xcu
postprocess_DRIVERS += dbase flat mysql odbc
+ifeq (WNT,$(OS))
+ifeq ($(WITH_MOZAB4WIN),YES)
+postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-mozab.xcu
+postprocess_DRIVERS += mozab
+endif
+else ifeq (DESKTOP,$(filter DESKTOP,$(BUILD_TYPE)))
+postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/DataAccess/Drivers-mork.xcu
+postprocess_DRIVERS += mork
+endif
endif
ifeq (MACOSX,$(OS))
postprocess_FILES_main += \
More information about the Libreoffice-commits
mailing list