diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2005-10-03 19:54:06 +0000 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2005-10-03 19:54:06 +0000 |
| commit | 37539f4e15056a7ee29d2a34eb41da2a97839d59 (patch) | |
| tree | 4e5f1e11c2282bc10e9ed638edbe3be7af301839 /lib | |
| parent | 244e6b85eae95e2ede5dd769a33e0940c44a22c2 (diff) | |
| download | ds-37539f4e15056a7ee29d2a34eb41da2a97839d59.tar.gz ds-37539f4e15056a7ee29d2a34eb41da2a97839d59.tar.xz ds-37539f4e15056a7ee29d2a34eb41da2a97839d59.zip | |
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base/Makefile | 6 | ||||
| -rw-r--r-- | lib/libadmin/Makefile | 6 | ||||
| -rw-r--r-- | lib/libsi18n/Makefile | 8 |
3 files changed, 7 insertions, 13 deletions
diff --git a/lib/base/Makefile b/lib/base/Makefile index 3a65021b..fb99fdf4 100644 --- a/lib/base/Makefile +++ b/lib/base/Makefile @@ -45,10 +45,10 @@ BUILD_ROOT=../.. MODULE=LibBase -include $(BUILD_ROOT)/nsdefs.mk - OBJDEST=$(OBJDIR)/lib/base +include $(BUILD_ROOT)/nsconfig.mk + ifeq ($(ARCH), WINNT) LIBS=$(OBJDIR)/lib/libbase.lib ifeq ($(BSCINFO), yes) @@ -58,8 +58,6 @@ else LIBS=$(OBJDIR)/lib/libbase.a endif -include $(BUILD_ROOT)/nsconfig.mk - MCC_INCLUDE += $(ADMINUTIL_INCLUDE) LOCAL_DEPS = $(NSPR_DEP) $(ADMINUTIL_DEP) $(SECURITY_DEP) $(DBM_DEP) 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) diff --git a/lib/libsi18n/Makefile b/lib/libsi18n/Makefile index d9432314..408ad20b 100644 --- a/lib/libsi18n/Makefile +++ b/lib/libsi18n/Makefile @@ -42,11 +42,11 @@ BUILD_ROOT=../.. MODULE=LibsI18N -include $(BUILD_ROOT)/nsdefs.mk +OBJDEST=$(OBJDIR)/lib/libsi18n -NSDEFS_PRODUCT = $(NS_PRODUCT) +include $(BUILD_ROOT)/nsconfig.mk -OBJDEST=$(OBJDIR)/lib/libsi18n +NSDEFS_PRODUCT = $(NS_PRODUCT) L10NDIR = $(BUILD_ROOT)/l10n @@ -92,8 +92,6 @@ ifeq ($(BUILD_MODULE), DIRECTORY) gsslapd.h endif -include $(BUILD_ROOT)/nsconfig.mk - MCC_INCLUDE += $(ADMINUTIL_INCLUDE) all: $(OBJDEST) $(LIBS) $(BSCS) $(OBJDEST)/$(StringDatabase) |