Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-11 16:32:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move LIBJAR definitions around so that NT builds.

Browse Source
This commit is contained in:
relyea%netscape.com 2003-01-29 23:37:10 +00:00
parent 3fe942eddf
commit 510d42958f
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -161,6 +161,10 @@ EXTRA_LIBS += \
wsock32.lib \
winmm.lib \
$(NULL)
JAR_LIBS = $(DIST)/lib/jar.lib \
$(DIST)/lib/zlib.lib \
$(NULL)
else
# $(PROGRAM) has explicit dependencies on $(EXTRA_LIBS)
@ -189,15 +193,6 @@ EXTRA_SHARED_LIBS += -B/usr/ccs/bin/
endif
endif
ifeq ($(OS_ARCH), WINNT)
JAR_LIBS = $(DIST)/lib/jar.lib \
$(DIST)/lib/zlib.lib \
$(NULL)
else
JAR_LIBS = $(DIST)/lib/$(LIB_PREFIX)jar.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)zlib.$(LIB_SUFFIX) \
$(NULL)
endif
# $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
# $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX.
@ -210,6 +205,10 @@ EXTRA_SHARED_LIBS += \
-lplds4 \
-lnspr4 \
$(NULL)
JAR_LIBS = $(DIST)/lib/$(LIB_PREFIX)jar.$(LIB_SUFFIX) \
$(DIST)/lib/$(LIB_PREFIX)zlib.$(LIB_SUFFIX) \
$(NULL)
endif
endif