Some more NetWare buildsystem tweaks. (05bb49d4) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP Apache Httpd

NWGNUmakefile

+14 −13

Changes for NWGNUmakefile: 14 added lines, 13 removed lines.
Original line number	Diff line number	Diff line
		@@ -431,22 +431,23 @@ installdev :: FORCE
		$(call COPY,$(APR)/include/*.h, $(INSTALLBASE)/include/)
		$(call COPY,$(APRUTIL)/include/*.h, $(INSTALLBASE)/include/)
		$(call COPY,$(STDMOD)/core/mod_so.h, $(INSTALLBASE)/include/)
		$(call COPY,core/mod_watchdog.h, $(INSTALLBASE)/include/)
		$(call COPY,cache/mod_cache.h, $(INSTALLBASE)/include/)
		$(call COPY,database/mod_dbd.h, $(INSTALLBASE)/include/)
		$(call COPY,dav/main/mod_dav.h, $(INSTALLBASE)/include/)
		$(call COPY,filters/mod_include.h, $(INSTALLBASE)/include/)
		$(call COPY,generators/mod_cgi.h, $(INSTALLBASE)/include/)
		$(call COPY,generators/mod_status.h, $(INSTALLBASE)/include/)
		$(call COPY,loggers/mod_log_config.h, $(INSTALLBASE)/include/)
		$(call COPY,mappers/mod_rewrite.h, $(INSTALLBASE)/include/)
		$(call COPY,proxy/mod_proxy.h, $(INSTALLBASE)/include/)
		$(call COPY,proxy/mod_serf.h, $(INSTALLBASE)/include/)
		$(call COPY,session/mod_session.h, $(INSTALLBASE)/include/)
		$(call COPY,ssl/mod_ssl.h, $(INSTALLBASE)/include/)
		$(call COPY,$(STDMOD)/core/mod_watchdog.h, $(INSTALLBASE)/include/)
		$(call COPY,$(STDMOD)/cache/mod_cache.h, $(INSTALLBASE)/include/)
		$(call COPY,$(STDMOD)/database/mod_dbd.h, $(INSTALLBASE)/include/)
		$(call COPY,$(STDMOD)/dav/main/mod_dav.h, $(INSTALLBASE)/include/)
		$(call COPY,$(STDMOD)/filters/mod_include.h, $(INSTALLBASE)/include/)
		$(call COPY,$(STDMOD)/generators/mod_cgi.h, $(INSTALLBASE)/include/)
		$(call COPY,$(STDMOD)/generators/mod_status.h, $(INSTALLBASE)/include/)
		$(call COPY,$(STDMOD)/loggers/mod_log_config.h, $(INSTALLBASE)/include/)
		$(call COPY,$(STDMOD)/mappers/mod_rewrite.h, $(INSTALLBASE)/include/)
		$(call COPY,$(STDMOD)/proxy/mod_proxy.h, $(INSTALLBASE)/include/)
		$(call COPY,$(STDMOD)/proxy/mod_serf.h, $(INSTALLBASE)/include/)
		$(call COPY,$(STDMOD)/session/mod_session.h, $(INSTALLBASE)/include/)
		$(call COPY,$(STDMOD)/ssl/mod_ssl.h, $(INSTALLBASE)/include/)
		$(call COPY,$(APR)/*.imp, $(INSTALLBASE)/lib/)
		$(call COPY,$(NWOS)/*.imp, $(INSTALLBASE)/lib/)
		$(call COPY,$(NWOS)/*.xdc, $(INSTALLBASE)/lib/)
		$(call COPY,$(APBUILD)/NWGNU*.inc, $(INSTALLBASE)/build/)

		prebuild :: FORCE
		$(MAKE) -C $(SERVER) -f NWGNUmakefile

build/NWGNUenvironment.inc

+31 −29

Changes for build/NWGNUenvironment.inc: 31 added lines, 29 removed lines.
Original line number	Diff line number	Diff line
		@@ -2,9 +2,9 @@
		# Setup needed Tools and Libraries
		#

		ifeq "$(wildcard $(AP_WORK)\NWGNUcustom.ini)" "$(AP_WORK)\NWGNUcustom.ini"
		include $(AP_WORK)\NWGNUcustom.ini
		CUSTOM_INI = $(AP_WORK)\NWGNUcustom.ini
		ifeq "$(wildcard $(AP_WORK)/NWGNUcustom.ini)" "$(AP_WORK)/NWGNUcustom.ini"
		include $(AP_WORK)/NWGNUcustom.ini
		CUSTOM_INI = $(AP_WORK)/NWGNUcustom.ini
		endif

		ifndef VERBOSE
		@@ -181,15 +181,12 @@ ifndef USE_STDSOCKETS
		INCDIRS += $(NOVELLLIBC)/include/winsock;
		endif
		ifneq "$(LDAPSDK)" ""
		#INCDIRS := $(INCDIRS);$(LDAPSDK)/inc
		INCDIRS += $(LDAPSDK)/inc;
		endif
		ifneq "$(ZLIBSDK)" ""
		#INCDIRS := $(INCDIRS);$(ZLIBSDK)
		INCDIRS += $(ZLIBSDK);
		endif
		ifneq "$(PCRESRC)" ""
		#INCDIRS := $(INCDIRS);$(PCRESRC)
		INCDIRS += $(PCRESRC);
		endif

		@@ -269,23 +266,31 @@ endif
		# Declare major project deliverables output directories here
		#

		ifndef PORT
		PORT = 80
		endif

		ifndef SSLPORT
		SSLPORT = 443
		endif

		ifdef DEST
		INSTALL = $(DEST)
		ifeq (\, $(findstring \,$(INSTALL)))
		INSTDIRS = $(DEST)
		INSTALL = $(subst \,/,$(DEST))
		ifeq (/, $(findstring /,$(INSTALL)))
		INSTDIRS = $(INSTALL)
		endif
		endif

		ifdef dest
		INSTALL = $(dest)
		ifeq (\, $(findstring \,$(INSTALL)))
		INSTDIRS = $(dest)
		INSTALL = $(subst \,/,$(dest))
		ifeq (/, $(findstring /,$(INSTALL)))
		INSTDIRS = $(INSTALL)
		endif
		endif

		ifndef INSTALL
		INSTALL = $(AP_WORK)/Dist
		INSTDIRS = $(AP_WORK)/Dist
		INSTDIRS = $(INSTALL)
		endif

		ifndef BASEDIR
		@@ -293,18 +298,10 @@ BASEDIR = Apache23
		export BASEDIR
		endif

		ifndef PORT
		PORT = 80
		endif

		ifndef SSLPORT
		SSLPORT = 443
		endif

		# Add support for building IPV6 alongside
		ifneq "$(IPV6)" ""
		DEFINES += -DNW_BUILD_IPV6
		# INCDIRS := $(NOVELLLIBC)\include\winsock\IPV6;$(INCDIRS)
		# INCDIRS := $(NOVELLLIBC)/include/winsock/IPV6;$(INCDIRS)

		ifneq "$(findstring IPV6,$(OBJDIR))" "IPV6"
		OBJDIR := $(OBJDIR)_IPV6
		@@ -323,12 +320,15 @@ endif
		INSTALLBASE := $(INSTALL)/$(BASEDIR)

		INSTDEVDIRS := \
		$(INSTDIRS) \
		$(INSTALL) \
		$(INSTALLBASE) \
		$(INSTALLBASE)/build \
		$(INSTALLBASE)/include \
		$(INSTALLBASE)/lib \
		$(EOLIST)

		INSTDIRS += \
		$(INSTALL)/$(BASEDIR) \
		$(INSTALLBASE) \
		$(INSTALLBASE)/bin \
		$(INSTALLBASE)/cgi-bin \
		$(INSTALLBASE)/conf \
		@@ -340,24 +340,26 @@ INSTDIRS += \
		$(INSTALLBASE)/man \
		$(INSTALLBASE)/manual \
		$(INSTALLBASE)/modules \
		$(EOLIST)

		#
		# Common directories
		#

		SRC = $(subst \,/,$(AP_WORK))
		APR = $(subst \,/,$(APR_WORK))
		APRUTIL = $(subst \,/,$(APU_WORK))
		APBUILD = $(SRC)/build
		STDMOD = $(SRC)/modules
		HTTPD = $(SRC)/modules/http
		NWOS = $(SRC)/os/netware
		SERVER = $(SRC)/server
		SUPMOD = $(SRC)/support
		APR = $(APR_WORK)
		APRUTIL = $(APU_WORK)
		APULDAP = $(APU_WORK)/ldap
		XML = $(APU_WORK)/xml
		APRTEST = $(APR_WORK)/test
		APULDAP = $(APRUTIL)/ldap
		XML = $(APRUTIL)/xml
		APRTEST = $(APR)/test
		PCRE = $(PCRESRC)

		PREBUILD_INST = $(SRC)/nwprebuild

		#