mirror of
https://github.com/apache/httpd.git
synced 2025-08-03 16:33:59 +00:00
more NetWare makefile fixes and cleanups.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@885774 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Guenter Knauf
@ -1,14 +1,10 @@
|
||||
#
|
||||
# Make sure all needed macro's are defined
|
||||
#
|
||||
|
||||
#
|
||||
# Get the 'head' of the build environment if necessary. This includes default
|
||||
# targets and paths to tools
|
||||
#
|
||||
|
||||
ifndef EnvironmentDefined
|
||||
include $(AP_WORK)\build\NWGNUhead.inc
|
||||
include $(AP_WORK)/build/NWGNUhead.inc
|
||||
endif
|
||||
|
||||
#
|
||||
@ -17,12 +13,29 @@ endif
|
||||
# Make sure all needed macro's are defined
|
||||
#
|
||||
|
||||
ifdef WITH_MOD_SSL
|
||||
ifneq "$(OSSLSDK)" ""
|
||||
OSSLINC = $(OSSLSDK)/outinc_nw_libc
|
||||
OSSLLIB = $(OSSLSDK)/out_nw_libc
|
||||
ifeq "$(WITH_ABS)" "1"
|
||||
|
||||
ifeq "$(USE_NTLS)" "1"
|
||||
SSL_INC = $(NTLSSDK)/inc
|
||||
SSL_LIB = $(NTLSSDK)/imp
|
||||
SSL_BIN = $(NTLSSDK)/bin
|
||||
SSL_APP = $(NTLSSDK)/apps
|
||||
ifneq "$(wildcard $(SSL_INC)/openssl/opensslv.h)" "$(SSL_INC)/openssl/opensslv.h"
|
||||
$(warning '$(NTLSSDK)' does NOT point to a valid NTLS SDK!)
|
||||
endif
|
||||
else
|
||||
SSL_INC = $(OSSLSDK)/outinc_nw_libc
|
||||
SSL_LIB = $(OSSLSDK)/out_nw_libc
|
||||
SSL_BIN = $(OSSLSDK)/out_nw_libc
|
||||
SSL_APP = $(OSSLSDK)/apps
|
||||
ifneq "$(wildcard $(SSL_INC)/openssl/opensslv.h)" "$(SSL_INC)/openssl/opensslv.h"
|
||||
$(warning '$(OSSLSDK)' does NOT point to a valid OpenSSL SDK!)
|
||||
endif
|
||||
endif
|
||||
ifeq "$(wildcard $(SSL_INC)/openssl/opensslv.h)" "$(SSL_INC)/openssl/opensslv.h"
|
||||
HAVE_OPENSSL = 1
|
||||
endif
|
||||
|
||||
endif
|
||||
|
||||
#
|
||||
@ -31,8 +44,8 @@ endif
|
||||
#
|
||||
ifdef HAVE_OPENSSL
|
||||
XINCDIRS += \
|
||||
$(OSSLINC) \
|
||||
$(OSSLINC)/openssl \
|
||||
$(SSL_INC) \
|
||||
$(SSL_INC)/openssl \
|
||||
$(EOLIST)
|
||||
endif
|
||||
|
||||
@ -63,7 +76,7 @@ XDEFINES += \
|
||||
# These flags will be added to the link.opt file
|
||||
#
|
||||
XLFLAGS += \
|
||||
-l $(OSSLLIB) \
|
||||
-l $(SSL_LIB) \
|
||||
$(EOLIST)
|
||||
endif
|
||||
|
||||
@ -152,7 +165,7 @@ NLM_VERSION =
|
||||
#
|
||||
# If this is specified, it will override the default of 64K
|
||||
#
|
||||
NLM_STACK_SIZE = 8192
|
||||
NLM_STACK_SIZE = 65536
|
||||
|
||||
|
||||
#
|
||||
@ -212,11 +225,13 @@ FILES_nlm_libs = \
|
||||
$(EOLIST)
|
||||
|
||||
ifdef HAVE_OPENSSL
|
||||
ifneq "$(USE_NTLS)" "1"
|
||||
FILES_nlm_libs += \
|
||||
$(OSSLLIB)/crypto.lib \
|
||||
$(OSSLLIB)/ssl.lib \
|
||||
$(SSL_LIB)/crypto.lib \
|
||||
$(SSL_LIB)/ssl.lib \
|
||||
$(EOLIST)
|
||||
endif
|
||||
endif
|
||||
|
||||
#
|
||||
# These are the modules that the above NLM target depends on to load.
|
||||
@ -227,6 +242,13 @@ FILES_nlm_modules = \
|
||||
libc \
|
||||
$(EOLIST)
|
||||
|
||||
ifdef HAVE_OPENSSL
|
||||
ifeq "$(USE_NTLS)" "1"
|
||||
FILES_nlm_modules += ntls \
|
||||
$(EOLIST)
|
||||
endif
|
||||
endif
|
||||
|
||||
#
|
||||
# If the nlm has a msg file, put it's path here
|
||||
#
|
||||
@ -250,18 +272,24 @@ FILES_nlm_Ximports = \
|
||||
@libc.imp \
|
||||
$(EOLIST)
|
||||
|
||||
ifdef HAVE_OPENSSL
|
||||
# Don't link with Winsock if standard sockets are being used
|
||||
ifndef USE_STDSOCKETS
|
||||
ifneq "$(USE_STDSOCKETS)" "1"
|
||||
FILES_nlm_Ximports += @ws2nlm.imp \
|
||||
$(EOLIST)
|
||||
endif
|
||||
|
||||
ifdef HAVE_OPENSSL
|
||||
ifeq "$(USE_NTLS)" "1"
|
||||
FILES_nlm_Ximports += @ntls.imp \
|
||||
$(EOLIST)
|
||||
else
|
||||
FILES_nlm_Ximports += \
|
||||
GetProcessSwitchCount \
|
||||
RunningProcess \
|
||||
GetSuperHighResolutionTimer \
|
||||
$(EOLIST)
|
||||
endif
|
||||
endif
|
||||
|
||||
#
|
||||
# Any symbols exported to here
|
||||
@ -299,5 +327,5 @@ install :: nlms FORCE
|
||||
# in this makefile
|
||||
#
|
||||
|
||||
include $(AP_WORK)\build\NWGNUtail.inc
|
||||
include $(AP_WORK)/build/NWGNUtail.inc
|
||||
|
||||
|
||||
@ -1,10 +1,3 @@
|
||||
#
|
||||
# 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
|
||||
@ -15,138 +8,6 @@ include $(AP_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 += \
|
||||
$(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
|
||||
# $(AP_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 these are 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 $(NWOS)/apache.xdc. XDCData can be disabled
|
||||
# by setting APACHE_UNIPROC in the environment
|
||||
#
|
||||
XDCDATA =
|
||||
|
||||
#
|
||||
# If there is an NLM target, put it here
|
||||
#
|
||||
@ -161,67 +22,6 @@ TARGET_nlm = \
|
||||
$(OBJDIR)/rotlogs.nlm \
|
||||
$(EOLIST)
|
||||
|
||||
#
|
||||
# If there is an LIB target, put it here
|
||||
#
|
||||
TARGET_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 $(NWOS)\copyright.txt.
|
||||
#
|
||||
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 = \
|
||||
$(EOLIST)
|
||||
|
||||
#
|
||||
# implement targets and dependancies (leave this section alone)
|
||||
#
|
||||
|
||||
Reference in New Issue
Block a user