[Libreoffice-commits] .: dbaccess/AllLangResTarget_sdbt.mk dbaccess/Library_sdbt.mk dbaccess/Module_dbaccess.mk

Michael Meeks mmeeks at kemper.freedesktop.org
Tue Apr 19 08:19:52 PDT 2011


 dbaccess/AllLangResTarget_sdbt.mk |    3 +++
 dbaccess/Library_sdbt.mk          |    9 +++++----
 dbaccess/Module_dbaccess.mk       |    1 +
 3 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 58c52536cc8ecae3acd2d4a8902a1f7267bd7533
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Tue Apr 19 16:17:24 2011 +0100

    fix sdbt compilation with gnumake

diff --git a/dbaccess/AllLangResTarget_sdbt.mk b/dbaccess/AllLangResTarget_sdbt.mk
index 208e188..20ba240 100644
--- a/dbaccess/AllLangResTarget_sdbt.mk
+++ b/dbaccess/AllLangResTarget_sdbt.mk
@@ -37,6 +37,9 @@ $(eval $(call gb_SrsTarget_SrsTarget,dbaccess/sdbt))
 
 $(eval $(call gb_SrsTarget_set_include,dbaccess/sdbt,\
     $$(INCLUDE) \
+    -I$(WORKDIR)/inc/dbaccess \
+    -I$(realpath $(SRCDIR)/dbaccess/inc) \
+    -I$(realpath $(SRCDIR)/dbaccess/source/sdbtools/inc) \
     -I$(OUTDIR)/inc \
 ))
 
diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk
index 5868f47..a93bc25 100644
--- a/dbaccess/Library_sdbt.mk
+++ b/dbaccess/Library_sdbt.mk
@@ -35,11 +35,12 @@ $(eval $(call gb_Library_add_precompiled_header,sdbt,$(SRCDIR)/dbaccess/inc/pch/
 
 $(eval $(call gb_Library_set_include,sdbt,\
     $$(INCLUDE) \
-    -I$(realpath $(SRCDIR)/dbaccess/inc/pch) \
-    -I$(realpath $(SRCDIR)/dbaccess/source/inc) \
-    -I$(realpath $(SRCDIR)/dbaccess/source/sdbtools/inc) \
-    -I$(OUTDIR)/inc/offuh \
+	-I$(realpath $(SRCDIR)/dbaccess/inc) \
+	-I$(realpath $(SRCDIR)/dbaccess/inc/pch) \
+	-I$(realpath $(SRCDIR)/dbaccess/source/inc/) \
+	-I$(realpath $(SRCDIR)/dbaccess/source/sdbtools/inc) \
     -I$(OUTDIR)/inc \
+    -I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,sdbt,\
diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index c63cb92..7042c49 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -32,6 +32,7 @@ $(eval $(call gb_Module_add_targets,dbaccess,\
     AllLangResTarget_dba \
     AllLangResTarget_dbmm \
     AllLangResTarget_dbu \
+    AllLangResTarget_sdbt \
     $(if $(filter WNT,$(GUI)),Executable_odbcconfig) \
     Library_adabasui \
     Library_dba \


More information about the Libreoffice-commits mailing list