[Fedora-directory-commits] ldapserver/httpd/src unixso.mk,1.7,1.8

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/ldapserver/httpd/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22035/ldapserver/httpd/src

Modified Files:
	unixso.mk 
Log Message:
Bug(s) fixed: 169663
Bug Description: Build Cleanup - open source AS, other components;
remove Fortezza; etc.
Reviewed by: Noriko, Nathan, Rob C. (Thanks!)
Fix Description: This allows us to build DS entirely outside of the
firewall with entirely open source components, including setuputil,
adminutil, adminserver, and java components.  I still need to address
some issues around nsperl, perldap, dsmlgw, xmltools, and general ease
of build.  This also gets rid of the crufty Fortezza build stuff and
addresses some other minor build issues.
Platforms tested: RHEL4
Flag Day: yes, but the internal builds should not be affected
Doc impact: wiki
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none



Index: unixso.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/httpd/src/unixso.mk,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- unixso.mk	10 May 2005 23:17:04 -0000	1.7
+++ unixso.mk	3 Oct 2005 19:53:41 -0000	1.8
@@ -107,9 +107,6 @@
 #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 @@
 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