diff options
| author | Ariel Constenla-Haile <arielch@apache.org> | 2012-09-19 18:22:51 +0000 |
|---|---|---|
| committer | Ariel Constenla-Haile <arielch@apache.org> | 2012-09-19 18:22:51 +0000 |
| commit | 0e116cc42be58358648612ece1b7c0a2d6f6112d (patch) | |
| tree | 0e59ff3dce277fd63cb9bfb8df031ed5e7abfbe5 /connectivity/source | |
| parent | 78b2bf15963704fafb823e80bbccb287847fe1db (diff) | |
#i120925# - Prevent library name clash
Notes
Notes:
reject: we didnt drop our lo suffix which avoids this
Diffstat (limited to 'connectivity/source')
| -rw-r--r-- | connectivity/source/drivers/mysql/makefile.mk | 3 | ||||
| -rw-r--r-- | connectivity/source/drivers/odbc/makefile.mk | 4 |
2 files changed, 5 insertions, 2 deletions
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) \ |