diff options
author | David Tardon <dtardon@redhat.com> | 2011-05-30 18:47:50 +0200 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2011-06-17 14:32:44 +0200 |
commit | d40a3fdbcbf14b74837cb3f16dc937e7ad6fb65e (patch) | |
tree | 9260794798b378f59a9e473829b3a320fd2c2810 /dbaccess | |
parent | Merge remote-tracking branch 'origin/libreoffice-3-4' (diff) | |
download | core-d40a3fdbcbf14b74837cb3f16dc937e7ad6fb65e.tar.gz core-d40a3fdbcbf14b74837cb3f16dc937e7ad6fb65e.zip |
remove all traces of offuh from makefiles
Diffstat (limited to 'dbaccess')
-rw-r--r-- | dbaccess/Executable_odbcconfig.mk | 6 | ||||
-rw-r--r-- | dbaccess/Library_adabasui.mk | 6 | ||||
-rw-r--r-- | dbaccess/Library_dba.mk | 6 | ||||
-rw-r--r-- | dbaccess/Library_dbaxml.mk | 6 | ||||
-rw-r--r-- | dbaccess/Library_dbmm.mk | 6 | ||||
-rw-r--r-- | dbaccess/Library_dbu.mk | 6 | ||||
-rw-r--r-- | dbaccess/Library_sdbt.mk | 6 |
7 files changed, 35 insertions, 7 deletions
diff --git a/dbaccess/Executable_odbcconfig.mk b/dbaccess/Executable_odbcconfig.mk index 9afc9ac40c5a..bb2febd1e54d 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 ee5ae6a71e62..0e5b7bbe191c 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 fdd57547acd8..748c209ba06d 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 e0a190898c24..477f86b53db6 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 db6b152b2d4f..023157ddae65 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 7f8c6db47b3c..61910cfa7456 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 a93bc256bdc0..5338fcf56997 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,\ |