[Libreoffice-commits] .: dbaccess/Executable_odbcconfig.mk dbaccess/Library_adabasui.mk dbaccess/Library_dba.mk dbaccess/Library_dbaxml.mk dbaccess/Library_dbmm.mk dbaccess/Library_dbu.mk dbaccess/Library_sdbt.mk reportdesign/Library_rpt.mk reportdesign/Library_rptui.mk reportdesign/Library_rptxml.mk

David Tardon dtardon at kemper.freedesktop.org
Sat Jun 18 02:31:48 PDT 2011 

 dbaccess/Executable_odbcconfig.mk |    6 +++++-
 dbaccess/Library_adabasui.mk      |    6 +++++-
 dbaccess/Library_dba.mk           |    6 +++++-
 dbaccess/Library_dbaxml.mk        |    6 +++++-
 dbaccess/Library_dbmm.mk          |    6 +++++-
 dbaccess/Library_dbu.mk           |    6 +++++-
 dbaccess/Library_sdbt.mk          |    6 +++++-
 reportdesign/Library_rpt.mk       |    6 +++++-
 reportdesign/Library_rptui.mk     |    6 +++++-
 reportdesign/Library_rptxml.mk    |    6 +++++-
 10 files changed, 50 insertions(+), 10 deletions(-)

New commits:
commit 59a2878cecfb7da16927fcfd15b5d92df39b51ad
Author: David Tardon <dtardon at redhat.com>
Date:   Mon May 30 18:47:50 2011 +0200

    remove all traces of offuh from makefiles

diff --git a/dbaccess/Executable_odbcconfig.mk b/dbaccess/Executable_odbcconfig.mk
index 9afc9ac..bb2febd 100644
--- a/dbaccess/Executable_odbcconfig.mk
+++ b/dbaccess/Executable_odbcconfig.mk
@@ -34,7 +34,11 @@ $(eval $(call gb_Executable_set_include,odbcconfig,\
 	-I$(realpath $(SRCDIR)/dbaccess/inc) \
 	-I$(realpath $(SRCDIR)/dbaccess/inc/pch) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,odbcconfig,\
+    offapi \
+    udkapi \
 ))
 
 $(eval $(call gb_Executable_add_linked_libs,odbcconfig,\
diff --git a/dbaccess/Library_adabasui.mk b/dbaccess/Library_adabasui.mk
index ee5ae6a..0e5b7bb 100644
--- a/dbaccess/Library_adabasui.mk
+++ b/dbaccess/Library_adabasui.mk
@@ -33,7 +33,6 @@ $(eval $(call gb_Library_set_include,adabasui,\
     $$(INCLUDE) \
     -I$(realpath $(SRCDIR)/dbaccess/inc/pch) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_Library_set_defs,adabasui,\
@@ -41,6 +40,11 @@ $(eval $(call gb_Library_set_defs,adabasui,\
     -DCOMPMOD_NAMESPACE=adabasui \
 ))
 
+$(eval $(call gb_Library_add_api,adabasui,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,adabasui,\
     comphelper \
     cppu \
diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk
index fdd5754..748c209 100644
--- a/dbaccess/Library_dba.mk
+++ b/dbaccess/Library_dba.mk
@@ -40,7 +40,6 @@ $(eval $(call gb_Library_set_include,dba,\
 	-I$(realpath $(SRCDIR)/dbaccess/source/inc) \
 	-I$(realpath $(SRCDIR)/dbaccess/source/core/inc) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_Library_set_defs,dba,\
@@ -48,6 +47,11 @@ $(eval $(call gb_Library_set_defs,dba,\
     -DOOO_DLLIMPLEMENTATION_DBA \
 ))
 
+$(eval $(call gb_Library_add_api,dba,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,dba,\
     comphelper \
     cppu \
diff --git a/dbaccess/Library_dbaxml.mk b/dbaccess/Library_dbaxml.mk
index e0a1908..477f86b 100644
--- a/dbaccess/Library_dbaxml.mk
+++ b/dbaccess/Library_dbaxml.mk
@@ -34,7 +34,11 @@ $(eval $(call gb_Library_set_include,dbaxml,\
     -I$(realpath $(SRCDIR)/dbaccess/inc/pch) \
     -I$(realpath $(SRCDIR)/dbaccess/source/inc) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,dbaxml,\
+    offapi \
+    udkapi \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,dbaxml,\
diff --git a/dbaccess/Library_dbmm.mk b/dbaccess/Library_dbmm.mk
index db6b152..023157d 100644
--- a/dbaccess/Library_dbmm.mk
+++ b/dbaccess/Library_dbmm.mk
@@ -38,7 +38,11 @@ $(eval $(call gb_Library_set_include,dbmm,\
 	-I$(realpath $(SRCDIR)/dbaccess/inc) \
     -I$(realpath $(SRCDIR)/dbaccess/inc/pch) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,dbmm,\
+    offapi \
+    udkapi \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,dbmm,\
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index 7f8c6db..61910cf 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -37,7 +37,11 @@ $(eval $(call gb_Library_set_include,dbu,\
     -I$(realpath $(SRCDIR)/dbaccess/source/ui/inc) \
     -I$(WORKDIR)/inc/dbaccess \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,dbu,\
+    offapi \
+    udkapi \
 ))
 
 $(eval $(call gb_Library_set_defs,dbu,\
diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk
index a93bc25..5338fcf 100644
--- a/dbaccess/Library_sdbt.mk
+++ b/dbaccess/Library_sdbt.mk
@@ -40,7 +40,11 @@ $(eval $(call gb_Library_set_include,sdbt,\
 	-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_api,sdbt,\
+    offapi \
+    udkapi \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,sdbt,\
diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk
index 430f9d2..93e1adb 100644
--- a/reportdesign/Library_rpt.mk
+++ b/reportdesign/Library_rpt.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_Library_set_include,rpt,\
     -I$(realpath $(SRCDIR)/reportdesign/source/inc) \
     -I$(realpath $(SRCDIR)/reportdesign/source/core/inc) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_Library_set_defs,rpt,\
@@ -44,6 +43,11 @@ $(eval $(call gb_Library_set_defs,rpt,\
     -DREPORTDESIGN_DLLIMPLEMENTATION \
 ))
 
+$(eval $(call gb_Library_add_api,rpt,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,rpt,\
     comphelper \
     cppu \
diff --git a/reportdesign/Library_rptui.mk b/reportdesign/Library_rptui.mk
index c532117..7aee950 100644
--- a/reportdesign/Library_rptui.mk
+++ b/reportdesign/Library_rptui.mk
@@ -36,7 +36,11 @@ $(eval $(call gb_Library_set_include,rptui,\
     -I$(realpath $(SRCDIR)/reportdesign/source/inc) \
     -I$(realpath $(SRCDIR)/reportdesign/source/ui/inc) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_add_api,rptui,\
+    offapi \
+    udkapi \
 ))
 
 $(eval $(call gb_Library_add_linked_libs,rptui,\
diff --git a/reportdesign/Library_rptxml.mk b/reportdesign/Library_rptxml.mk
index 8a0b686..ff9eb44 100644
--- a/reportdesign/Library_rptxml.mk
+++ b/reportdesign/Library_rptxml.mk
@@ -35,13 +35,17 @@ $(eval $(call gb_Library_set_include,rptxml,\
     -I$(realpath $(SRCDIR)/reportdesign/inc/pch) \
     -I$(realpath $(SRCDIR)/reportdesign/source/inc) \
     -I$(OUTDIR)/inc \
-    -I$(OUTDIR)/inc/offuh \
 ))
 
 $(eval $(call gb_Library_set_defs,rptxml,\
     $$(DEFS) \
 ))
 
+$(eval $(call gb_Library_add_api,rptxml,\
+    offapi \
+    udkapi \
+))
+
 $(eval $(call gb_Library_add_linked_libs,rptxml,\
     comphelper \
     cppu \

More information about the Libreoffice-commits mailing list