diff options
| -rw-r--r-- | connectivity/prj/d.lst | 2 | ||||
| -rw-r--r-- | connectivity/source/drivers/mysql/makefile.mk | 3 | ||||
| -rw-r--r-- | connectivity/source/drivers/odbc/makefile.mk | 4 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 4 |
4 files changed, 8 insertions, 5 deletions
diff --git a/connectivity/prj/d.lst b/connectivity/prj/d.lst index 10d4da635756..6a761078ea23 100644 --- a/connectivity/prj/d.lst +++ b/connectivity/prj/d.lst @@ -1,6 +1,6 @@ ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res -..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so +..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*.so ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib ..\%__SRC%\lib\*.jnilib %_DEST%\lib%_EXT%\*.jnilib ..\%__SRC%\slb\connectivity*.* %_DEST%\lib%_EXT%\connectivity*.* diff --git a/connectivity/source/drivers/mysql/makefile.mk b/connectivity/source/drivers/mysql/makefile.mk index cf5079ee156f..e6509b904245 100644 --- a/connectivity/source/drivers/mysql/makefile.mk +++ b/connectivity/source/drivers/mysql/makefile.mk @@ -55,7 +55,8 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component.map # --- Library ----------------------------------- -SHL1TARGET= $(MYSQL_TARGET)$(DLLPOSTFIX) +REALNAME:=$(MYSQL_TARGET).uno +SHL1TARGET=$(REALNAME)$(DLLPOSTFIX) SHL1OBJS=$(SLOFILES) SHL1STDLIBS=\ $(CPPULIB) \ diff --git a/connectivity/source/drivers/odbc/makefile.mk b/connectivity/source/drivers/odbc/makefile.mk index 5fc3ad0598c5..dca329e608d1 100644 --- a/connectivity/source/drivers/odbc/makefile.mk +++ b/connectivity/source/drivers/odbc/makefile.mk @@ -54,7 +54,9 @@ SLOFILES=\ # --- ODBC Library ----------------------------------- -SHL1TARGET= $(ODBC_TARGET)$(DLLPOSTFIX) + +REALNAME:=$(ODBC_TARGET).uno +SHL1TARGET=$(REALNAME)$(DLLPOSTFIX) SHL1OBJS=$(SLOFILES) SHL1STDLIBS=\ $(ODBCBASELIB) \ diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 013ca0eb0197..759490d77f72 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1058,8 +1058,8 @@ End #endif #endif -STD_LIB_FILE(gid_File_Lib_Mysql,mysql) -STD_LIB_FILE(gid_File_Lib_Odbc,odbc) +STD_LIB_FILE(gid_File_Lib_Mysql,mysql.uno) +STD_LIB_FILE(gid_File_Lib_Odbc,odbc.uno) // STD_LIB_FILE( gid_File_Lib_Ofa , ofa) |