diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2005-01-28 21:57:05 +0000 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2005-01-28 21:57:05 +0000 |
| commit | 0b00cd4edc87f82fddde3a089d16f2e416305209 (patch) | |
| tree | f47e944cfa83dcd946fad259f2f37e1499785ac3 /lib/ldaputil | |
| parent | b323e287076458e646831a3b5cec0262ac60c5fd (diff) | |
| download | ds-0b00cd4edc87f82fddde3a089d16f2e416305209.tar.gz ds-0b00cd4edc87f82fddde3a089d16f2e416305209.tar.xz ds-0b00cd4edc87f82fddde3a089d16f2e416305209.zip | |
remove references to ldapserver from makefiles; use BUILD_ROOT instead of MCOM_ROOT and NSROOT; BUILD_ROOT is now the ldapserver directory rather than its parent
Diffstat (limited to 'lib/ldaputil')
| -rw-r--r-- | lib/ldaputil/Makefile | 7 | ||||
| -rw-r--r-- | lib/ldaputil/utest/Makefile | 8 |
2 files changed, 7 insertions, 8 deletions
diff --git a/lib/ldaputil/Makefile b/lib/ldaputil/Makefile index c6c95400..131a9905 100644 --- a/lib/ldaputil/Makefile +++ b/lib/ldaputil/Makefile @@ -8,12 +8,12 @@ # # Makefile for libldapu.a (ldaputil library) # -MCOM_ROOT=../../.. +BUILD_ROOT=../.. MODULE=LibLdapUtil OBJDEST=$(OBJDIR)/lib/ldaputil -include ../../nsconfig.mk +include $(BUILD_ROOT)/nsconfig.mk ifeq ($(ARCH), WINNT) LIBS=$(OBJDIR)/lib/libldapu.lib @@ -24,8 +24,7 @@ endif LOCAL_DEPS = $(LDAPSDK_DEP) -MCC_INCLUDE=-I$(NSROOT)/include \ - -I$(MCOM_ROOT)/include \ +MCC_INCLUDE=-I$(BUILD_ROOT)/include \ $(DBM_INCLUDE) $(LDAPSDK_INCLUDE) \ $(SECURITY_INCLUDE) $(NSPR_INCLUDE) diff --git a/lib/ldaputil/utest/Makefile b/lib/ldaputil/utest/Makefile index e6f2e5c6..bb545d9b 100644 --- a/lib/ldaputil/utest/Makefile +++ b/lib/ldaputil/utest/Makefile @@ -8,16 +8,16 @@ # # Makefile for ldaputil unit test. # -MCOM_ROOT=../../../.. +BUILD_ROOT=../../.. MODULE=LibLdapUtil OBJDEST=. UTESTDEST=utest -include ../../../nsconfig.mk +include $(BUILD_ROOT)/nsconfig.mk MODULE_CFLAGS=-I$(NSROOT)/include - + include $(INCLUDE_DEPENDS) TESTFLAGS = -DUTEST -DDBG_PRINT -DDONT_USE_LDAP_SSL @@ -95,7 +95,7 @@ PLUGIN_INC = ./include $(PLUGIN_INC): mkdir -p include -certmap.h: ../../../include/ldaputil/extcmap.h +certmap.h: $(BUILD_ROOT)/include/ldaputil/extcmap.h \rm -rf $(PLUGIN_INC)/$@ cp $^ $(PLUGIN_INC)/$@ |