diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2013-02-25 15:38:59 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2013-02-25 15:55:01 +0100 |
| commit | e487f8798bba6acdef2c504a7a293c52380b5f4d (patch) | |
| tree | d5c72e580dee050e126f0ac71862ddb7a53a8f5d | |
| parent | c1dda9595db38ddbb0632c775b4cc02a806550fd (diff) | |
fdo#60924: move odbcbase from scp2 to gbuild
Change-Id: I9e26a6a32a70275174c83d109256dde5c718e42b
| -rw-r--r-- | Repository.mk | 6 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/Repository.mk b/Repository.mk index c659d5ffa222..5450b7eac1c5 100644 --- a/Repository.mk +++ b/Repository.mk @@ -234,10 +234,11 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,OOO, \ ctl \ cui \ dba \ - dbmm \ - sdbt \ dbase \ + dbmm \ file \ + sdbt \ + odbcbase \ )) $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ abp \ @@ -257,7 +258,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ evtatt \ forui \ odbc \ - odbcbase \ oox \ ooxml \ sdbc \ diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index a81f336cdf5f..ca6df881ddb0 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -201,9 +201,6 @@ End #endif #endif -STD_LIB_FILE( gid_File_Lib_Odbcbase,odbcbase) - - File gid_File_Lib_Dbpool LIB_FILE_BODY; Styles = (PACKED); |