Author: ydario
Date: Fri Feb 22 18:12:01 2013
New Revision: 1449154
URL: http://svn.apache.org/r1449154
Log:
i118923 - OS/2 port: use short names for mysql&odbc libraries.
Modified:
openoffice/trunk/main/connectivity/source/drivers/mysql/makefile.mk
openoffice/trunk/main/connectivity/source/drivers/odbc/makefile.mk
openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp
Modified: openoffice/trunk/main/connectivity/source/drivers/mysql/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/source/drivers/mysql/makefile.mk?rev=1449154&r1=1449153&r2=1449154&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/source/drivers/mysql/makefile.mk
(original)
+++ openoffice/trunk/main/connectivity/source/drivers/mysql/makefile.mk Fri Feb
22 18:12:01 2013
@@ -55,7 +55,11 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component
# --- Library -----------------------------------
+.IF "$(GUI)" == "OS2"
+REALNAME:=$(MYSQL_TARGET)
+.ELSE
REALNAME:=$(MYSQL_TARGET).uno
+.ENDIF
SHL1TARGET=$(REALNAME)$(DLLPOSTFIX)
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
Modified: openoffice/trunk/main/connectivity/source/drivers/odbc/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/source/drivers/odbc/makefile.mk?rev=1449154&r1=1449153&r2=1449154&view=diff
==============================================================================
--- openoffice/trunk/main/connectivity/source/drivers/odbc/makefile.mk
(original)
+++ openoffice/trunk/main/connectivity/source/drivers/odbc/makefile.mk Fri Feb
22 18:12:01 2013
@@ -55,7 +55,11 @@ SLOFILES=\
# --- ODBC Library -----------------------------------
+.IF "$(GUI)" == "OS2"
+REALNAME:=$(ODBC_TARGET)
+.ELSE
REALNAME:=$(ODBC_TARGET).uno
+.ENDIF
SHL1TARGET=$(REALNAME)$(DLLPOSTFIX)
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
Modified: openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp?rev=1449154&r1=1449153&r2=1449154&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp Fri Feb 22
18:12:01 2013
@@ -1058,8 +1058,13 @@ End
#endif
#endif
+#if defined(OS2)
+STD_LIB_FILE(gid_File_Lib_Mysql,mysql)
+STD_LIB_FILE(gid_File_Lib_Odbc,odbc)
+#else
STD_LIB_FILE(gid_File_Lib_Mysql,mysql.uno)
STD_LIB_FILE(gid_File_Lib_Odbc,odbc.uno)
+#endif
// STD_LIB_FILE( gid_File_Lib_Ofa , ofa)
