From 0b00cd4edc87f82fddde3a089d16f2e416305209 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Fri, 28 Jan 2005 21:57:05 +0000 Subject: 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 --- include/Makefile | 6 +++--- include/base/Makefile | 6 +++--- include/public/Makefile | 6 +++--- include/public/base/Makefile | 6 +++--- include/public/nsacl/Makefile | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) (limited to 'include') diff --git a/include/Makefile b/include/Makefile index 40e9f063..611f77a1 100644 --- a/include/Makefile +++ b/include/Makefile @@ -7,10 +7,10 @@ # # Makefile for netsite.h -MCOM_ROOT = ../.. +BUILD_ROOT = .. MODULE=netsiteInclude -include ../nsdefs.mk +include $(BUILD_ROOT)/nsdefs.mk HDRDEST=$(OBJDIR)/include @@ -42,7 +42,7 @@ all: stuff nspr strip: depend: -include ../nsconfig.mk +include $(BUILD_ROOT)/nsconfig.mk ifeq ($(NSAPI_CAPABLE), true) diff --git a/include/base/Makefile b/include/base/Makefile index 9f2f6a35..01044386 100644 --- a/include/base/Makefile +++ b/include/base/Makefile @@ -7,10 +7,10 @@ # # Makefile for netsite.h -MCOM_ROOT = ../../.. +BUILD_ROOT = ../.. MODULE=netsiteIncludeBase -include ../../nsdefs.mk +include $(BUILD_ROOT)/nsdefs.mk HDRDEST=$(OBJDIR)/include/base @@ -34,7 +34,7 @@ $(HDRDEST): strip: depend: -include ../../nsconfig.mk +include $(BUILD_ROOT)/nsconfig.mk $(HDRDEST)/%.h: %.h cat $(PREFIX) $< > $(HDRDEST)/$*.h diff --git a/include/public/Makefile b/include/public/Makefile index 9d291cae..787fadfd 100644 --- a/include/public/Makefile +++ b/include/public/Makefile @@ -7,10 +7,10 @@ # # Makefile for netsite.h -MCOM_ROOT = ../../.. +BUILD_ROOT = ../.. MODULE=netsiteInclude -include ../../nsdefs.mk +include $(BUILD_ROOT)/nsdefs.mk HDRDEST=$(OBJDIR)/include @@ -29,7 +29,7 @@ all: stuff strip: depend: -include ../../nsconfig.mk +include $(BUILD_ROOT)/nsconfig.mk ifeq ($(NSAPI_CAPABLE), true) diff --git a/include/public/base/Makefile b/include/public/base/Makefile index 15fa95e3..940ffd8d 100644 --- a/include/public/base/Makefile +++ b/include/public/base/Makefile @@ -7,10 +7,10 @@ # # Makefile for netsite.h -MCOM_ROOT = ../../../.. +BUILD_ROOT = ../../.. MODULE=netsiteIncludeBase -include ../../../nsdefs.mk +include $(BUILD_ROOT)/nsdefs.mk HDRDEST=$(OBJDIR)/include/base @@ -34,7 +34,7 @@ $(HDRDEST): strip: depend: -include ../../../nsconfig.mk +include $(BUILD_ROOT)/nsconfig.mk $(HDRDEST)/%.h: %.h cat $(PREFIX) $< > $(HDRDEST)/$*.h diff --git a/include/public/nsacl/Makefile b/include/public/nsacl/Makefile index e55a0d9d..00e83fec 100644 --- a/include/public/nsacl/Makefile +++ b/include/public/nsacl/Makefile @@ -7,10 +7,10 @@ # # Makefile for include/public/nsacl public header files -MCOM_ROOT = ../../../.. +BUILD_ROOT = ../../.. MODULE=netsiteIncludeNsacl -include ../../../nsdefs.mk +include $(BUILD_ROOT)/nsdefs.mk HDRDEST=$(OBJDIR)/include/nsacl @@ -32,7 +32,7 @@ $(HDRDEST): strip: depend: -include ../../../nsconfig.mk +include $(BUILD_ROOT)/nsconfig.mk $(HDRDEST)/%.h: %.h cat $(PREFIX) $< > $(HDRDEST)/$*.h -- cgit