mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-11 18:24:02 +00:00
Bug 78081 - don't export intermediate libraries - initial makefile changes to switch from $(DIST)/lib to in-tree library locations - blanket-r=mento
This commit is contained in:
parent
a8adc18592
commit
62564c6c35
@ -58,7 +58,7 @@ CPPSRCS = \
|
||||
mozSqlModule.cpp
|
||||
|
||||
SHARED_LIBRARY_LIBS = \
|
||||
$(DIST)/lib/$(LIB_PREFIX)sqlbase_s.$(LIB_SUFFIX)
|
||||
../../base/src/$(LIB_PREFIX)sqlbase_s.$(LIB_SUFFIX)
|
||||
|
||||
EXTRA_DSO_LDOPTS = \
|
||||
$(MOZ_UNICHARUTIL_LIBS) \
|
||||
@ -67,19 +67,19 @@ EXTRA_DSO_LDOPTS = \
|
||||
|
||||
ifdef MOZ_ENABLE_PGSQL
|
||||
DEFINES += -DMOZ_ENABLE_PGSQL
|
||||
SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)sqlpgsql_s.$(LIB_SUFFIX)
|
||||
SHARED_LIBRARY_LIBS += ../../pgsql/src/$(LIB_PREFIX)sqlpgsql_s.$(LIB_SUFFIX)
|
||||
EXTRA_DSO_LDOPTS += -L$(MOZ_PGSQL_LIBS) -lpq
|
||||
endif
|
||||
|
||||
ifdef MOZ_ENABLE_SQLITE
|
||||
DEFINES += -DMOZ_ENABLE_SQLITE
|
||||
SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)sqlsqlite_s.$(LIB_SUFFIX)
|
||||
SHARED_LIBRARY_LIBS += ../../sqlite/src/$(LIB_PREFIX)sqlsqlite_s.$(LIB_SUFFIX)
|
||||
EXTRA_DSO_LDOPTS += -L$(MOZ_SQLITE_LIBS) -lsqlite3
|
||||
endif
|
||||
|
||||
ifdef MOZ_ENABLE_MYSQL
|
||||
DEFINES += -DMOZ_ENABLE_MYSQL
|
||||
SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)sqlmysql_s.$(LIB_SUFFIX)
|
||||
SHARED_LIBRARY_LIBS += ../../mysql/src/$(LIB_PREFIX)sqlmysql_s.$(LIB_SUFFIX)
|
||||
EXTRA_DSO_LDOPTS += -L$(MOZ_MYSQL_LIBS) -lmysqlclient -lz
|
||||
endif
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user