diff --git a/security/nss/cmd/platlibs.mk b/security/nss/cmd/platlibs.mk index d81670da2c8d..ab8024386bda 100644 --- a/security/nss/cmd/platlibs.mk +++ b/security/nss/cmd/platlibs.mk @@ -92,7 +92,6 @@ ifdef USE_STATIC_LIBS # can't do this in manifest.mn because OS_ARCH isn't defined there. ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH))) -SQLITE = $(LIB_PREFIX)sqlite3.$(LIB_SUFFIX) DEFINES += -DNSS_USE_STATIC_LIBS # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS) @@ -130,7 +129,7 @@ EXTRA_LIBS += \ $(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX) \ $(PKIXLIB) \ $(DBMLIB) \ - $(DIST)/lib/$(SQLITE) \ + $(DIST)/lib/$(LIB_PREFIX)sqlite3.$(LIB_SUFFIX) \ $(DIST)/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \ diff --git a/security/nss/lib/softoken/config.mk b/security/nss/lib/softoken/config.mk index 18ec1d8e05e4..c434af286bab 100644 --- a/security/nss/lib/softoken/config.mk +++ b/security/nss/lib/softoken/config.mk @@ -53,12 +53,11 @@ RES = $(OBJDIR)/$(LIBRARY_NAME).res RESNAME = $(LIBRARY_NAME).rc ifdef NS_USE_GCC -SQLITE = -lsqlite3 EXTRA_SHARED_LIBS += \ -L$(DIST)/lib \ -L$(NSSUTIL_LIB_DIR) \ -lnssutil3 \ - $(SQLITE) \ + -lsqlite3 \ -L$(NSPR_LIB_DIR) \ -lplc4 \ -lplds4 \ @@ -66,9 +65,8 @@ EXTRA_SHARED_LIBS += \ $(NULL) else # ! NS_USE_GCC -SQLITE = sqlite3.lib EXTRA_SHARED_LIBS += \ - $(DIST)/lib/$(SQLITE) \ + $(DIST)/lib/sqlite3.lib \ $(DIST)/lib/nssutil3.lib \ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.lib \ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.lib \ @@ -81,12 +79,11 @@ else # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS) # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX. -SQLITE = -lsqlite3 EXTRA_SHARED_LIBS += \ -L$(DIST)/lib \ -L$(NSSUTIL_LIB_DIR) \ -lnssutil3 \ - $(SQLITE) \ + -lsqlite3 \ -L$(NSPR_LIB_DIR) \ -lplc4 \ -lplds4 \