VladPolskiy/apache_httpd
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-20 14:14:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some more NetWare buildsystem tweaks.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1083366 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Guenter Knauf
2011-03-20 04:19:49 +00:00
parent 66c61f70d5
commit 8489ec0d04
2 changed files with 96 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
NWGNUmakefile
View File

@ -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

78
build/NWGNUenvironment.inc
View File

@ -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,30 +266,6 @@ endif
# Declare major project deliverables output directories here
#
ifdef DEST
INSTALL = $(DEST)
ifeq (\, $(findstring \,$(INSTALL)))
INSTDIRS = $(DEST)
endif
endif
ifdef dest
INSTALL = $(dest)
ifeq (\, $(findstring \,$(INSTALL)))
INSTDIRS = $(dest)
endif
endif
ifndef INSTALL
INSTALL = $(AP_WORK)/Dist
INSTDIRS = $(AP_WORK)/Dist
endif
ifndef BASEDIR
BASEDIR = Apache23
export BASEDIR
endif
ifndef PORT
PORT = 80
endif
@ -301,10 +274,34 @@ ifndef SSLPORT
SSLPORT = 443
endif
ifdef DEST
INSTALL = $(subst \,/,$(DEST))
ifeq (/, $(findstring /,$(INSTALL)))
INSTDIRS = $(INSTALL)
endif
endif
ifdef dest
INSTALL = $(subst \,/,$(dest))
ifeq (/, $(findstring /,$(INSTALL)))
INSTDIRS = $(INSTALL)
endif
endif
ifndef INSTALL
INSTALL = $(AP_WORK)/Dist
INSTDIRS = $(INSTALL)
endif
ifndef BASEDIR
BASEDIR = Apache23
export BASEDIR
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
#