Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 78081 - don't export intermediate libraries - initial makefile changes to switch from $(DIST)/lib to in-tree library locations - blanket-r=mento

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@192711 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
benjamin%smedbergs.us
2006-03-21 18:39:56 +00:00
parent 1bc8828ac6
commit 859a1b1ca3
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/extensions/sql/build/src/Makefile.in
View File

@@ -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