Author: arist
Date: Wed Nov 14 23:56:58 2012
New Revision: 1409578
URL: http://svn.apache.org/viewvc?rev=1409578&view=rev
Log:
gnumake4_129_80b1d47ae710.patch
# HG changeset patch
# User Michael Stahl <m...@openoffice.org>
# Date 1302888426 0
# Node ID 80b1d47ae710fadb7f1ff3a10ec9da712f036562
# Parent 647359b293db5e3b31b795bb3719488e8721dc2b
gnumake4: dbaccess: fix non-WNT error
Modified:
incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_sdbt.mk
incubator/ooo/branches/gbuild/main/dbaccess/Executable_odbcconfig.mk
incubator/ooo/branches/gbuild/main/dbaccess/Module_dbaccess.mk
Modified: incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_sdbt.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_sdbt.mk?rev=1409578&r1=1409577&r2=1409578&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_sdbt.mk
(original)
+++ incubator/ooo/branches/gbuild/main/dbaccess/AllLangResTarget_sdbt.mk Wed
Nov 14 23:56:58 2012
@@ -36,7 +36,7 @@ $(eval $(call gb_SrsTarget_SrsTarget,dba
$(eval $(call gb_SrsTarget_set_include,dbaccess/sdbt,\
$$(INCLUDE) \
-I$(OUTDIR)/inc \
- -I$(SRCDIR)/dbaccess\source\sdbtools\inc \
+ -I$(SRCDIR)/dbaccess/source/sdbtools/inc \
-I$(SRCDIR)/dbaccess/inc \
))
Modified: incubator/ooo/branches/gbuild/main/dbaccess/Executable_odbcconfig.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/dbaccess/Executable_odbcconfig.mk?rev=1409578&r1=1409577&r2=1409578&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/Executable_odbcconfig.mk
(original)
+++ incubator/ooo/branches/gbuild/main/dbaccess/Executable_odbcconfig.mk Wed
Nov 14 23:56:58 2012
@@ -24,7 +24,6 @@
# for a copy of the LGPLv3 License.
#
#*************************************************************************
-ifeq ($(GUI),WNT)
$(eval $(call gb_Executable_Executable,odbcconfig))
@@ -58,5 +57,4 @@ $(eval $(call gb_Executable_add_exceptio
dbaccess/win32/source/odbcconfig/odbcconfig \
))
-endif
# vim: set noet sw=4 ts=4:
Modified: incubator/ooo/branches/gbuild/main/dbaccess/Module_dbaccess.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/dbaccess/Module_dbaccess.mk?rev=1409578&r1=1409577&r2=1409578&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/dbaccess/Module_dbaccess.mk (original)
+++ incubator/ooo/branches/gbuild/main/dbaccess/Module_dbaccess.mk Wed Nov 14
23:56:58 2012
@@ -39,12 +39,17 @@ $(eval $(call gb_Module_add_targets,dbac
Library_dbmm\
Library_dbui\
Library_sdbt\
- Executable_odbcconfig \
Package_inc \
Package_uiconfig \
Package_xml \
))
+ifeq ($(GUI),WNT)
+$(eval $(call gb_Module_add_targets,dbaccess,\
+ Executable_odbcconfig \
+))
+endif
+
$(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\
JunitTest_dbaccess_complex \
JunitTest_dbaccess_unoapi \
