diff options
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) |