From 37539f4e15056a7ee29d2a34eb41da2a97839d59 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Mon, 3 Oct 2005 19:54:06 +0000
Subject: 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

---
 lib/libadmin/Makefile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'lib/libadmin')

diff --git a/lib/libadmin/Makefile b/lib/libadmin/Makefile
index 83f2471b..8de6d744 100644
--- a/lib/libadmin/Makefile
+++ b/lib/libadmin/Makefile
@@ -44,10 +44,10 @@ BUILD_ROOT=../..
 MODULE=LibAdmin
 MODULE_CFLAGS=-DENCRYPT_PASSWORDS -DUSE_ADMSERV
 
-include $(BUILD_ROOT)/nsdefs.mk
-
 OBJDEST=$(OBJDIR)/lib/libadmin
 
+include $(BUILD_ROOT)/nsconfig.mk
+
 ifeq ($(ARCH), WINNT)
 LIBS=$(OBJDIR)/lib/libadmin.lib
 else
@@ -69,8 +69,6 @@ all: $(OBJDEST) $(LIBS)
 #$(LIBS): $(addprefix $(BUILD_ROOT)/include/libadmin/, \
 #                     hadm_msgs.i la_msgs.i)
 
-include $(BUILD_ROOT)/nsconfig.mk
-
 MCC_INCLUDE += $(ADMINUTIL_INCLUDE)
 
 #ifeq ($(ARCH), HPUX)
-- 
cgit