wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge backout

Browse Source
This commit is contained in:
Josh Aas 2009-12-13 07:58:47 -05:00
commit 05a2ae61e3
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
security/nss/cmd/platlibs.mk
View File

@ -92,7 +92,6 @@ ifdef USE_STATIC_LIBS
# can't do this in manifest.mn because OS_ARCH isn't defined there. # can't do this in manifest.mn because OS_ARCH isn't defined there.
ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH))) ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
SQLITE = $(LIB_PREFIX)sqlite3.$(LIB_SUFFIX)
DEFINES += -DNSS_USE_STATIC_LIBS DEFINES += -DNSS_USE_STATIC_LIBS
# $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS) # $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
@ -130,7 +129,7 @@ EXTRA_LIBS += \
$(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX) \ $(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX) \
$(PKIXLIB) \ $(PKIXLIB) \
$(DBMLIB) \ $(DBMLIB) \
$(DIST)/lib/$(SQLITE) \ $(DIST)/lib/$(LIB_PREFIX)sqlite3.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \ $(DIST)/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \
$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.$(LIB_SUFFIX) \
$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.$(LIB_SUFFIX) \

9
security/nss/lib/softoken/config.mk
View File

@ -53,12 +53,11 @@ RES = $(OBJDIR)/$(LIBRARY_NAME).res
RESNAME = $(LIBRARY_NAME).rc RESNAME = $(LIBRARY_NAME).rc
ifdef NS_USE_GCC ifdef NS_USE_GCC
SQLITE = -lsqlite3
EXTRA_SHARED_LIBS += \ EXTRA_SHARED_LIBS += \
-L$(DIST)/lib \ -L$(DIST)/lib \
-L$(NSSUTIL_LIB_DIR) \ -L$(NSSUTIL_LIB_DIR) \
-lnssutil3 \ -lnssutil3 \
$(SQLITE) \ -lsqlite3 \
-L$(NSPR_LIB_DIR) \ -L$(NSPR_LIB_DIR) \
-lplc4 \ -lplc4 \
-lplds4 \ -lplds4 \
@ -66,9 +65,8 @@ EXTRA_SHARED_LIBS += \
$(NULL) $(NULL)
else # ! NS_USE_GCC else # ! NS_USE_GCC
SQLITE = sqlite3.lib
EXTRA_SHARED_LIBS += \ EXTRA_SHARED_LIBS += \
$(DIST)/lib/$(SQLITE) \ $(DIST)/lib/sqlite3.lib \
$(DIST)/lib/nssutil3.lib \ $(DIST)/lib/nssutil3.lib \
$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.lib \ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plc4.lib \
$(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.lib \ $(NSPR_LIB_DIR)/$(NSPR31_LIB_PREFIX)plds4.lib \
@ -81,12 +79,11 @@ else
# $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS) # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
# $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX. # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
SQLITE = -lsqlite3
EXTRA_SHARED_LIBS += \ EXTRA_SHARED_LIBS += \
-L$(DIST)/lib \ -L$(DIST)/lib \
-L$(NSSUTIL_LIB_DIR) \ -L$(NSSUTIL_LIB_DIR) \
-lnssutil3 \ -lnssutil3 \
$(SQLITE) \ -lsqlite3 \
-L$(NSPR_LIB_DIR) \ -L$(NSPR_LIB_DIR) \
-lplc4 \ -lplc4 \
-lplds4 \ -lplds4 \