From 1990e291b791106db5f2c8aeffc9306c46b496ec Mon Sep 17 00:00:00 2001 From: "seawood%netscape.com" Date: Tue, 8 Jan 2002 06:32:02 +0000 Subject: [PATCH] Fix ldap for win32 gmake build Bug #58981 r=dmose git-svn-id: svn://10.0.0.236/branches/LDAPCSDK_40_BRANCH@111557 18797224-902f-48f8-a5cc-f745e15eee43 --- .../directory/c-sdk/ldap/build/Makefile.in | 18 ++----- .../directory/c-sdk/ldap/build/autoconf.mk.in | 3 ++ .../directory/c-sdk/ldap/include/Makefile.in | 5 -- .../c-sdk/ldap/libraries/Makefile.in | 9 ++-- .../c-sdk/ldap/libraries/libldap/Makefile.in | 52 ++++++++++++++++--- 5 files changed, 56 insertions(+), 31 deletions(-) diff --git a/mozilla/directory/c-sdk/ldap/build/Makefile.in b/mozilla/directory/c-sdk/ldap/build/Makefile.in index d683c1031fd..6eb8f8d50e4 100644 --- a/mozilla/directory/c-sdk/ldap/build/Makefile.in +++ b/mozilla/directory/c-sdk/ldap/build/Makefile.in @@ -8,26 +8,14 @@ CSRCS = dirver.c include autoconf.mk -TARGETS = $(OBJDIR)/dirver$(BIN_SUFFIX) +PROGRAM = dirver$(BIN_SUFFIX) GARBAGE += $(TARGETS) include $(NSPR_TREE)/config/rules.mk -ifeq ($(OS_ARCH), OS2) -$(OBJS) = $(addprefix $(OBJDIR)/, $(CSRCS:.c=.o)) - -$(TARGETS): $(OBJS) - @$(MAKE_OBJDIR) -ifeq ($(MOZ_OS2_TOOLS),VACPP) - $(LINK) /OUT:$@ $(OBJS) $(LDFLAGS) $(OS_LIBS) $(EXTRA_LIBS) -else - $(CC) -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS) -endif -endif - -export:: $(TARGETS) - $(INSTALL) -m 555 $(TARGETS) $(DIST)/bin +export:: $(PROGRAM) + $(INSTALL) -m 555 $(PROGRAM) $(DIST)/bin install:: export diff --git a/mozilla/directory/c-sdk/ldap/build/autoconf.mk.in b/mozilla/directory/c-sdk/ldap/build/autoconf.mk.in index 341aabbd46f..cb1ec737fd1 100644 --- a/mozilla/directory/c-sdk/ldap/build/autoconf.mk.in +++ b/mozilla/directory/c-sdk/ldap/build/autoconf.mk.in @@ -55,3 +55,6 @@ ifeq ($(OS_ARCH),OS2) BIN_SUFFIX = .exe LINK = -ilink endif +ifeq ($(OS_ARCH),WINNT) +BIN_SUFFIX = .exe +endif diff --git a/mozilla/directory/c-sdk/ldap/include/Makefile.in b/mozilla/directory/c-sdk/ldap/include/Makefile.in index 57ece0d80aa..51bbba088de 100644 --- a/mozilla/directory/c-sdk/ldap/include/Makefile.in +++ b/mozilla/directory/c-sdk/ldap/include/Makefile.in @@ -24,12 +24,7 @@ ETCDIR = $(DIST)/etc DIR_VERSION := 2.0 DIRSDK_VERSION := 1.0 -ifeq ($(OS_ARCH), WINNT) -# Is this correct? -DIRVER_PATH = $(DEPTH)/netsite/ldap/build -else DIRVER_PATH = $(DIST)/bin -endif DIRVER_PROG = $(DIRVER_PATH)/dirver$(BIN_SUFFIX) diff --git a/mozilla/directory/c-sdk/ldap/libraries/Makefile.in b/mozilla/directory/c-sdk/ldap/libraries/Makefile.in index 54e74afaa56..16e39c685e7 100644 --- a/mozilla/directory/c-sdk/ldap/libraries/Makefile.in +++ b/mozilla/directory/c-sdk/ldap/libraries/Makefile.in @@ -2,11 +2,14 @@ DEPTH = ../../../.. srcdir = @srcdir@ ldaptopsrcdir = @top_srcdir@ -UNIXDIRLIST = liblber libldap -DIRS = $(UNIXDIRLIST) - include ../build/autoconf.mk +ifeq ($(OS_ARCH),WINNT) +DIRS = libldap +else +DIRS = liblber libldap +endif + all:: export install install:: diff --git a/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in b/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in index 18927b13c28..9607cc6e782 100644 --- a/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in +++ b/mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in @@ -3,6 +3,8 @@ NS_DEPTH = ../../../.. srcdir = @srcdir@ ldaptopsrcdir = @top_srcdir@ +include ../../build/autoconf.mk + RM = rm -f SED = sed @@ -59,7 +61,19 @@ SRCS = abandon.c \ utf8.c \ vlistctrl.c -REALOBJS = $(SRCS:.c=.o) +ifeq ($(OS_ARCH),WINNT) +LBER_SRCS = \ + decode.c \ + encode.c \ + io.c \ + bprint.c \ + $(NULL) + +SRCS += mozock.c \ + $(addprefix ../liblber/,$(LBER_SRCS)) +endif + +REALOBJS = $(SRCS:.c=.$(OBJ_SUFFIX)) #OBJS = $(REALOBJS) versiont.o OBJS = $(REALOBJS) @@ -69,7 +83,13 @@ HDIR2 = ../../include CFLAGS = $(INCLUDES) $(DEFINES) +ifeq ($(OS_ARCH),WINNT) +RES = nsldap.res +RESNAME = $(srcdir)/../msdos/winsock/nsldap.rc +LIBRARY_NAME = nsldap32v40 +else LIBRARY_NAME = ldap40 +endif # # DEFS are included in CFLAGS @@ -81,12 +101,6 @@ DEFS = $(PLATFORMCFLAGS) $(LDAP_DEBUG) $(KERBEROS) $(AFSKERBEROS) \ $(SLAPD_BACKENDS) $(LDBMBACKEND) $(LDBMINCLUDE) $(PHONETIC) \ $(LDAP_SSLIO_HOOKS) -include ../../build/autoconf.mk - -ifeq ($(OS_ARCH),OS2) -OBJS = $(REALOBJS:.o=.obj) -endif - include $(NSPR_TREE)/config/rules.mk LOCAL_INCLUDES = -I$(PUBLIC)/nspr @@ -95,6 +109,21 @@ DEFINES += $(DEFS) -DFILTERFILE=./ldapfilter.conf \ -DTEMPLATEFILE=./ldaptemplates.conf \ -DNDEBUG -UMOZILLA_CLIENT +ifeq ($(OS_ARCH),WINNT) +DEFINES += /D_WINDOWS /DWINSOCK \ + /D_WIN32 /DWIN32_KERNEL_THREADS \ + /DNO_USERINTERFACE /DLDAP_SSLIO_HOOKS +EXTRA_LIBS += rpcrt4.lib winmm.lib wsock32.lib oldnames.lib kernel32.lib user32.lib +DLL_LIBS += /DEF:$(srcdir)/../msdos/winsock/nsldap3240.def \ + /implib:$(LIBRARY_NAME).$(LIB_SUFFIX) \ + /nodefaultlib +ifdef BUILD_OPT +EXTRA_LIBS += msvcrt.lib +else +EXTRA_LIBS += msvcrtd.lib +endif +endif + ifeq ($(OS_ARCH), OS2) INCLUDES += -I$(DIST)/include EXTRA_LIBS += $(DIST)/lib/lber40.lib @@ -117,7 +146,11 @@ endif GARBAGE += $(ETCDIR)/ldapfriendly $(ETCDIR)/ldapfilter.conf \ $(ETCDIR)/ldaptemplates.conf $(ETCDIR)/ldapsearchprefs.conf +ifeq ($(OS_ARCH),WINNT) +PLATFORMCFLAGS = -DNEEDPROTOS +else PLATFORMCFLAGS = -DUSE_WAITPID -DNEEDPROTOS +endif PLATFORMLIBS = THREADS = THREADSLIB = @@ -182,11 +215,14 @@ endif else # !os2 -install:: $(LIBRARY) $(SHARED_LIBRARY) +install:: $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(INSTALL) -m 444 $(LIBRARY) $(DIST)/lib ifdef MKSHLIB $(INSTALL) -m 555 $(SHARED_LIBRARY) $(DIST)/lib $(INSTALL) -m 555 $(SHARED_LIBRARY) $(DIST)/bin +ifdef IMPORT_LIBRARY + $(INSTALL) -m 444 $(IMPORT_LIBRARY) $(DIST)/lib +endif endif endif # os2