diff options
Diffstat (limited to 'httpd/src')
| -rw-r--r-- | httpd/src/unixso.mk | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/httpd/src/unixso.mk b/httpd/src/unixso.mk index 5dccb206..802ba500 100644 --- a/httpd/src/unixso.mk +++ b/httpd/src/unixso.mk @@ -107,9 +107,6 @@ SOLINK=-L. -L../../lib -lns-dshttpd$(DLL_PRESUF) #NSPRLINK = -L. -lnspr$(DLL_PRESUF) #NSPRLINK = -L. -ldsnspr$(DLL_PRESUF) ADM_EXTRA := -L. -L../../lib $(LDAPLINK) $(NSPRLINK) $(EXTRA_LIBS) -ifdef FORTEZZA -ADM_EXTRA += $(NSCP_DISTDIR)/lib/libci.$(LIB_SUFFIX) -endif DEF_LIBPATH := .:../../lib:$(DEF_LIBPATH) endif @@ -160,22 +157,10 @@ else LIBSEC1=$(LIBSECOBJS) endif -ifdef PRODUCT_IS_DIRECTORY_SERVER - DAEMONLIB= -else - DAEMONLIB=$(OBJDIR)/lib/libhttpdaemon.a -endif - -DEPLIBS = ${DAEMONLIB} $(OBJDIR)/lib/libsi18n.a $(ADMLIB) $(LDAPSDK_DEP) +DEPLIBS = $(OBJDIR)/lib/libsi18n.a $(ADMLIB) $(LDAPSDK_DEP) -ifdef FORTEZZA -LIBSEC1 += $(NSCP_DISTDIR)/lib/libci.$(LIB_SUFFIX) -endif - -DEPLINK = ${DAEMONLIB} $(OBJDIR)/lib/libsi18n.a -ifneq ($(BUILD_MODULE), HTTP_PERSONAL) +DEPLINK = $(OBJDIR)/lib/libsi18n.a DEPLINK += $(OBJDIR)/lib/libmsgdisp.a -endif DEPLINK += $(SOLINK) $(LDAPLINK) $(NSPRLINK) $(SOLINK2) # Relative to the directory that contains the .so |