diff options
| -rw-r--r-- | NWGNUmakefile | 19 | ||||
| -rw-r--r-- | build/NWGNUenvironment.inc | 9 | ||||
| -rw-r--r-- | build/NWGNUmakefile | 2 | ||||
| -rw-r--r-- | ldap/NWGNUmakefile | 254 |
4 files changed, 0 insertions, 284 deletions
diff --git a/NWGNUmakefile b/NWGNUmakefile index 19884c8e5..ff9ebc675 100644 --- a/NWGNUmakefile +++ b/NWGNUmakefile @@ -4,7 +4,6 @@ SUBDIRS = \ build \ - ldap \ xml \ $(EOLIST) @@ -47,7 +46,6 @@ XINCDIRS += \ $(APR)/include/arch/unix \ $(APR)/dbm/sdbm \ $(APR)/random/unix \ - $(LDAPSDK)/inc \ $(EOLIST) # @@ -203,7 +201,6 @@ FILES_nlm_objs = \ FILES_nlm_libs = \ $(PRELUDE) \ $(APRLIB) \ - $(APRLDAPLIB) \ $(APRXMLLIB) \ $(EOLIST) @@ -229,14 +226,6 @@ FILES_nlm_modules += ws2_32 \ $(EOLIST) endif -#If the LDAP support is defined then add the auto-load modules -ifneq "$(LDAPSDK)" "" -FILES_nlm_modules += \ - lldapsdk \ - lldapssl \ - $(EOLIST) -endif - ifdef EXPATSDK ifndef EXPAT_LINK_STATIC FILES_nlm_modules += \ @@ -277,14 +266,6 @@ FILES_nlm_Ximports += \ $(EOLIST) endif -#If the LDAP support is defined then add the imports -ifneq "$(LDAPSDK)" "" -FILES_nlm_Ximports += \ - @lldapsdk.imp \ - @lldapssl.imp \ - $(EOLIST) -endif - ifdef EXPATSDK ifndef EXPAT_LINK_STATIC FILES_nlm_Ximports += \ diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc index 0c85526a1..4d28957b1 100644 --- a/build/NWGNUenvironment.inc +++ b/build/NWGNUenvironment.inc @@ -42,13 +42,6 @@ ifneq "$(wildcard $(NOVELLLIBC)/include/ndkvers.h)" "$(NOVELLLIBC)/include/ndkve $(error NOVELLLIBC does not point to a valid Novell LIBC SDK) endif -ifndef LDAPSDK -LDAPSDK = C:/novell/ndk/cldapsdk/NetWare/libc -endif -ifneq "$(wildcard $(LDAPSDK)/inc/ldap.h)" "$(LDAPSDK)/inc/ldap.h" -$(error LDAPSDK does not point to a valid Novell CLDAP SDK) -endif - ifdef EXPATSDK ifeq "$(wildcard $(EXPATSDK)/include/expat.h)" "$(EXPATSDK)/include/expat.h" EXPAT_IMP = $(EXPATSDK)/imports/expatlbc.imp @@ -353,7 +346,6 @@ INSTDIRS += \ APR = $(subst \,/,$(APR_WORK)) APRBUILD = $(APR)/build -APRLDAP = $(APR)/ldap APRXML = $(APR)/xml APRTEST = $(APR)/test @@ -362,7 +354,6 @@ APRTEST = $(APR)/test # APRLIB = $(APR)/$(OBJDIR)/aprlib.lib -APRLDAPLIB = $(APRLDAP)/$(OBJDIR)/ldap.lib APRXMLLIB = $(APRXML)/$(OBJDIR)/xml.lib # diff --git a/build/NWGNUmakefile b/build/NWGNUmakefile index fc51a7e38..f3b0625c1 100644 --- a/build/NWGNUmakefile +++ b/build/NWGNUmakefile @@ -29,13 +29,11 @@ XINCDIRS += \ $(APR)/include/arch/netware \ $(APR)/include/arch/unix \ $(APRBUILD) \ - $(LDAPSDK)/inc \ $(EOLIST) FILES_prebuild_headers = \ $(APR)/include/apr.h \ $(APR)/include/apu_want.h \ - $(APR)/include/apr_ldap.h \ $(APR)/include/private/apu_select_dbm.h \ $(EOLIST) diff --git a/ldap/NWGNUmakefile b/ldap/NWGNUmakefile deleted file mode 100644 index da6e6f8b5..000000000 --- a/ldap/NWGNUmakefile +++ /dev/null @@ -1,254 +0,0 @@ -# -# Declare the sub-directories to be built here -# - -SUBDIRS = \ - $(EOLIST) - -# -# Get the 'head' of the build environment. This includes default targets and -# paths to tools -# - -include $(APR_WORK)/build/NWGNUhead.inc - -# -# build this level's files - -# -# Make sure all needed macro's are defined -# - -# -# These directories will be at the beginning of the include list, followed by -# INCDIRS -# -XINCDIRS += \ - $(APR)/include \ - $(APR)/include/arch/netware \ - $(APR)/include/private \ - $(LDAPSDK)/inc \ - $(EOLIST) - -# -# These flags will come after CFLAGS -# -XCFLAGS += \ - $(EOLIST) - -# -# These defines will come after DEFINES -# -XDEFINES += \ - $(EOLIST) - -# -# These flags will be added to the link.opt file -# -XLFLAGS += \ - $(EOLIST) - -# -# These values will be appended to the correct variables based on the value of -# RELEASE -# -ifeq "$(RELEASE)" "debug" -XINCDIRS += \ - $(EOLIST) - -XCFLAGS += \ - $(EOLIST) - -XDEFINES += \ - $(EOLIST) - -XLFLAGS += \ - $(EOLIST) -endif - -ifeq "$(RELEASE)" "noopt" -XINCDIRS += \ - $(EOLIST) - -XCFLAGS += \ - $(EOLIST) - -XDEFINES += \ - $(EOLIST) - -XLFLAGS += \ - $(EOLIST) -endif - -ifeq "$(RELEASE)" "release" -XINCDIRS += \ - $(EOLIST) - -XCFLAGS += \ - $(EOLIST) - -XDEFINES += \ - $(EOLIST) - -XLFLAGS += \ - $(EOLIST) -endif - -# -# These are used by the link target if an NLM is being generated -# This is used by the link 'name' directive to name the nlm. If left blank -# TARGET_nlm (see below) will be used. -# -NLM_NAME = - -# -# This is used by the link '-desc ' directive. -# If left blank, NLM_NAME will be used. -# -NLM_DESCRIPTION = - -# -# This is used by the '-threadname' directive. If left blank, -# NLM_NAME Thread will be used. -# -NLM_THREAD_NAME = -# -# If this is specified, it will override VERSION value in -# $(APR_WORK)/build/NWGNUenvironment.inc -# -NLM_VERSION = - -# -# If this is specified, it will override the default of 64K -# -NLM_STACK_SIZE = - -# -# If this is specified it will be used by the link '-entry' directive -# -NLM_ENTRY_SYM = - -# -# If this is specified it will be used by the link '-exit' directive -# -NLM_EXIT_SYM = - -# -# If this is specified it will be used by the link '-check' directive -# -NLM_CHECK_SYM = - -# -# If this is specified it will be used by the link '-flags' directive -# -NLM_FLAGS = - -# -# If this is specified it will be linked in with the XDCData option in the def -# file instead of the default of $(APR)/misc/netware/apache.xdc. XDCData can -# be disabled by setting APACHE_UNIPROC in the environment -# -XDCDATA = - -# -# Declare all target files (you must add your files here) -# - -# -# If there is an NLM target, put it here -# -TARGET_nlm = \ - $(EOLIST) - -# -# If there is an LIB target, put it here -# -TARGET_lib = \ - $(OBJDIR)/ldap.lib \ - $(EOLIST) - -# -# These are the OBJ files needed to create the NLM target above. -# Paths must all use the '/' character -# -FILES_nlm_objs = \ - $(EOLIST) - -# -# These are the LIB files needed to create the NLM target above. -# These will be added as a library command in the link.opt file. -# -FILES_nlm_libs = \ - $(EOLIST) - -# -# These are the modules that the above NLM target depends on to load. -# These will be added as a module command in the link.opt file. -# -FILES_nlm_modules = \ - $(EOLIST) - -# -# If the nlm has a msg file, put it's path here -# -FILE_nlm_msg = - -# -# If the nlm has a hlp file put it's path here -# -FILE_nlm_hlp = - -# -# If this is specified, it will override the default copyright. -# -FILE_nlm_copyright = - -# -# Any additional imports go here -# -FILES_nlm_Ximports = \ - $(EOLIST) - -# -# Any symbols exported to here -# -FILES_nlm_exports = \ - $(EOLIST) - -# -# These are the OBJ files needed to create the LIB target above. -# Paths must all use the '/' character -# -FILES_lib_objs = \ - $(OBJDIR)/apr_ldap_init.o \ - $(OBJDIR)/apr_ldap_option.o \ - $(OBJDIR)/apr_ldap_url.o \ - $(OBJDIR)/apr_ldap_rebind.o \ - $(OBJDIR)/apr_ldap_stub.o \ - $(EOLIST) - -# -# implement targets and dependancies (leave this section alone) -# - -libs :: $(OBJDIR) $(TARGET_lib) - -nlms :: libs $(TARGET_nlm) - -# -# Updated this target to create necessary directories and copy files to the -# correct place. (See $(APR_WORK)/build/NWGNUhead.inc for examples) -# -install :: nlms FORCE - -# -# Any specialized rules here -# - -# -# Include the 'tail' makefile that has targets that depend on variables defined -# in this makefile -# - -include $(APRBUILD)/NWGNUtail.inc - |