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

109
NWGNUmakefile
View File

@ -392,68 +392,69 @@ nlms :: libs $(TARGET_nlm)
MKCNF = $(AWK) -v BDIR=$(BASEDIR) -v PORT=$(PORT) -v SSLPORT=$(SSLPORT) -v MODSSL=$(WITH_MOD_SSL) -v BSDSKT=$(USE_STDSOCKETS) -f build/mkconfNW.awk $1 > $2 MKCNF = $(AWK) -v BDIR=$(BASEDIR) -v PORT=$(PORT) -v SSLPORT=$(SSLPORT) -v MODSSL=$(WITH_MOD_SSL) -v BSDSKT=$(USE_STDSOCKETS) -f build/mkconfNW.awk $1 > $2
install :: nlms instscripts FORCE install :: nlms instscripts FORCE
$(call COPY,$(OBJDIR)/$(NLM_NAME).nlm, $(INSTALLBASE)/) $(call COPY,$(OBJDIR)/$(NLM_NAME).nlm, $(INSTALLBASE)/)
$(call COPY,ABOUT_APACHE, $(INSTALLBASE)/) $(call COPY,ABOUT_APACHE, $(INSTALLBASE)/)
$(call COPY,CHANGES, $(INSTALLBASE)/) $(call COPY,CHANGES, $(INSTALLBASE)/)
$(call COPY,LICENSE, $(INSTALLBASE)/) $(call COPY,LICENSE, $(INSTALLBASE)/)
$(call COPY,README, $(INSTALLBASE)/) $(call COPY,README, $(INSTALLBASE)/)
$(call COPY,VERSIONING, $(INSTALLBASE)/) $(call COPY,VERSIONING, $(INSTALLBASE)/)
$(call COPY,STATUS, $(INSTALLBASE)/) $(call COPY,STATUS, $(INSTALLBASE)/)
$(call COPY,support/dbmmanage.in, $(INSTALLBASE)/bin/dbmmanage.pl) $(call COPY,support/dbmmanage.in, $(INSTALLBASE)/bin/dbmmanage.pl)
$(call COPY,support/logresolve.pl.in, $(INSTALLBASE)/bin/logresolve.pl) $(call COPY,support/logresolve.pl.in, $(INSTALLBASE)/bin/logresolve.pl)
$(call COPY,support/split-logfile.in, $(INSTALLBASE)/bin/split-logfile.pl) $(call COPY,support/split-logfile.in, $(INSTALLBASE)/bin/split-logfile.pl)
$(call COPY,support/check_forensic, $(INSTALLBASE)/bin/check_forensic.sh) $(call COPY,support/check_forensic, $(INSTALLBASE)/bin/check_forensic.sh)
$(call COPY,docs/conf/magic, $(INSTALLBASE)/conf/) $(call COPY,docs/conf/magic, $(INSTALLBASE)/conf/)
$(call COPY,docs/conf/mime.types, $(INSTALLBASE)/conf/) $(call COPY,docs/conf/mime.types, $(INSTALLBASE)/conf/)
$(call COPY,docs/conf/charset.conv, $(INSTALLBASE)/conf/) $(call COPY,docs/conf/charset.conv, $(INSTALLBASE)/conf/)
$(call COPY,docs/cgi-examples/printenv, $(INSTALLBASE)/cgi-bin/printenv.pl) $(call COPY,docs/cgi-examples/printenv, $(INSTALLBASE)/cgi-bin/printenv.pl)
$(call MKCNF,docs/conf/httpd.conf.in, $(INSTALLBASE)/conf/httpd.conf) $(call MKCNF,docs/conf/httpd.conf.in, $(INSTALLBASE)/conf/httpd.conf)
$(call MKCNF,docs/conf/extra/httpd-autoindex.conf.in, $(INSTALLBASE)/conf/extra/httpd-autoindex.conf) $(call MKCNF,docs/conf/extra/httpd-autoindex.conf.in, $(INSTALLBASE)/conf/extra/httpd-autoindex.conf)
$(call MKCNF,docs/conf/extra/httpd-dav.conf.in, $(INSTALLBASE)/conf/extra/httpd-dav.conf) $(call MKCNF,docs/conf/extra/httpd-dav.conf.in, $(INSTALLBASE)/conf/extra/httpd-dav.conf)
$(call MKCNF,docs/conf/extra/httpd-default.conf.in, $(INSTALLBASE)/conf/extra/httpd-default.conf) $(call MKCNF,docs/conf/extra/httpd-default.conf.in, $(INSTALLBASE)/conf/extra/httpd-default.conf)
$(call MKCNF,docs/conf/extra/httpd-info.conf.in, $(INSTALLBASE)/conf/extra/httpd-info.conf) $(call MKCNF,docs/conf/extra/httpd-info.conf.in, $(INSTALLBASE)/conf/extra/httpd-info.conf)
$(call MKCNF,docs/conf/extra/httpd-languages.conf.in, $(INSTALLBASE)/conf/extra/httpd-languages.conf) $(call MKCNF,docs/conf/extra/httpd-languages.conf.in, $(INSTALLBASE)/conf/extra/httpd-languages.conf)
$(call MKCNF,docs/conf/extra/httpd-manual.conf.in, $(INSTALLBASE)/conf/extra/httpd-manual.conf) $(call MKCNF,docs/conf/extra/httpd-manual.conf.in, $(INSTALLBASE)/conf/extra/httpd-manual.conf)
$(call MKCNF,docs/conf/extra/httpd-mpm.conf.in, $(INSTALLBASE)/conf/extra/httpd-mpm.conf) $(call MKCNF,docs/conf/extra/httpd-mpm.conf.in, $(INSTALLBASE)/conf/extra/httpd-mpm.conf)
$(call MKCNF,docs/conf/extra/httpd-multilang-errordoc.conf.in, $(INSTALLBASE)/conf/extra/httpd-multilang-errordoc.conf) $(call MKCNF,docs/conf/extra/httpd-multilang-errordoc.conf.in, $(INSTALLBASE)/conf/extra/httpd-multilang-errordoc.conf)
$(call MKCNF,docs/conf/extra/httpd-userdir.conf.in, $(INSTALLBASE)/conf/extra/httpd-userdir.conf) $(call MKCNF,docs/conf/extra/httpd-userdir.conf.in, $(INSTALLBASE)/conf/extra/httpd-userdir.conf)
$(call MKCNF,docs/conf/extra/httpd-vhosts.conf.in, $(INSTALLBASE)/conf/extra/httpd-vhosts.conf) $(call MKCNF,docs/conf/extra/httpd-vhosts.conf.in, $(INSTALLBASE)/conf/extra/httpd-vhosts.conf)
$(call MKCNF,docs/conf/extra/httpd-ssl.conf.in, $(INSTALLBASE)/conf/extra/httpd-ssl.conf) $(call MKCNF,docs/conf/extra/httpd-ssl.conf.in, $(INSTALLBASE)/conf/extra/httpd-ssl.conf)
$(call COPYR,docs/docroot, $(INSTALLBASE)/htdocs) $(call COPYR,docs/docroot, $(INSTALLBASE)/htdocs)
$(call COPYR,docs/error, $(INSTALLBASE)/error) $(call COPYR,docs/error, $(INSTALLBASE)/error)
$(call COPYR,docs/icons, $(INSTALLBASE)/icons) $(call COPYR,docs/icons, $(INSTALLBASE)/icons)
$(call COPYR,docs/man, $(INSTALLBASE)/man) $(call COPYR,docs/man, $(INSTALLBASE)/man)
$(call COPYR,docs/manual, $(INSTALLBASE)/manual) $(call COPYR,docs/manual, $(INSTALLBASE)/manual)
installdev :: FORCE installdev :: FORCE
$(call COPY,$(SRC)/include/*.h, $(INSTALLBASE)/include/) $(call COPY,$(SRC)/include/*.h, $(INSTALLBASE)/include/)
$(call COPY,$(NWOS)/*.h, $(INSTALLBASE)/include/) $(call COPY,$(NWOS)/*.h, $(INSTALLBASE)/include/)
$(call COPY,$(APR)/include/*.h, $(INSTALLBASE)/include/) $(call COPY,$(APR)/include/*.h, $(INSTALLBASE)/include/)
$(call COPY,$(APRUTIL)/include/*.h, $(INSTALLBASE)/include/) $(call COPY,$(APRUTIL)/include/*.h, $(INSTALLBASE)/include/)
$(call COPY,$(STDMOD)/core/mod_so.h, $(INSTALLBASE)/include/) $(call COPY,$(STDMOD)/core/mod_so.h, $(INSTALLBASE)/include/)
$(call COPY,core/mod_watchdog.h, $(INSTALLBASE)/include/) $(call COPY,$(STDMOD)/core/mod_watchdog.h, $(INSTALLBASE)/include/)
$(call COPY,cache/mod_cache.h, $(INSTALLBASE)/include/) $(call COPY,$(STDMOD)/cache/mod_cache.h, $(INSTALLBASE)/include/)
$(call COPY,database/mod_dbd.h, $(INSTALLBASE)/include/) $(call COPY,$(STDMOD)/database/mod_dbd.h, $(INSTALLBASE)/include/)
$(call COPY,dav/main/mod_dav.h, $(INSTALLBASE)/include/) $(call COPY,$(STDMOD)/dav/main/mod_dav.h, $(INSTALLBASE)/include/)
$(call COPY,filters/mod_include.h, $(INSTALLBASE)/include/) $(call COPY,$(STDMOD)/filters/mod_include.h, $(INSTALLBASE)/include/)
$(call COPY,generators/mod_cgi.h, $(INSTALLBASE)/include/) $(call COPY,$(STDMOD)/generators/mod_cgi.h, $(INSTALLBASE)/include/)
$(call COPY,generators/mod_status.h, $(INSTALLBASE)/include/) $(call COPY,$(STDMOD)/generators/mod_status.h, $(INSTALLBASE)/include/)
$(call COPY,loggers/mod_log_config.h, $(INSTALLBASE)/include/) $(call COPY,$(STDMOD)/loggers/mod_log_config.h, $(INSTALLBASE)/include/)
$(call COPY,mappers/mod_rewrite.h, $(INSTALLBASE)/include/) $(call COPY,$(STDMOD)/mappers/mod_rewrite.h, $(INSTALLBASE)/include/)
$(call COPY,proxy/mod_proxy.h, $(INSTALLBASE)/include/) $(call COPY,$(STDMOD)/proxy/mod_proxy.h, $(INSTALLBASE)/include/)
$(call COPY,proxy/mod_serf.h, $(INSTALLBASE)/include/) $(call COPY,$(STDMOD)/proxy/mod_serf.h, $(INSTALLBASE)/include/)
$(call COPY,session/mod_session.h, $(INSTALLBASE)/include/) $(call COPY,$(STDMOD)/session/mod_session.h, $(INSTALLBASE)/include/)
$(call COPY,ssl/mod_ssl.h, $(INSTALLBASE)/include/) $(call COPY,$(STDMOD)/ssl/mod_ssl.h, $(INSTALLBASE)/include/)
$(call COPY,$(APR)/*.imp, $(INSTALLBASE)/lib/) $(call COPY,$(APR)/*.imp, $(INSTALLBASE)/lib/)
$(call COPY,$(NWOS)/*.imp, $(INSTALLBASE)/lib/) $(call COPY,$(NWOS)/*.imp, $(INSTALLBASE)/lib/)
$(call COPY,$(NWOS)/*.xdc, $(INSTALLBASE)/lib/) $(call COPY,$(NWOS)/*.xdc, $(INSTALLBASE)/lib/)
$(call COPY,$(APBUILD)/NWGNU*.inc, $(INSTALLBASE)/build/)
prebuild :: FORCE prebuild :: FORCE
$(MAKE) -C $(SERVER) -f NWGNUmakefile $(MAKE) -C $(SERVER) -f NWGNUmakefile
$(MAKE) -C $(PCRE) -f NWGNUmakefile $(MAKE) -C $(PCRE) -f NWGNUmakefile
$(call MKDIR,$(PREBUILD_INST)) $(call MKDIR,$(PREBUILD_INST))
$(call COPY,$(SERVER)/$(OBJDIR)/*.nlm, $(PREBUILD_INST)/) $(call COPY,$(SERVER)/$(OBJDIR)/*.nlm, $(PREBUILD_INST)/)
$(call COPY,$(PCRE)/$(OBJDIR)/*.nlm, $(PREBUILD_INST)/) $(call COPY,$(PCRE)/$(OBJDIR)/*.nlm, $(PREBUILD_INST)/)
# #
# Any specialized rules here # Any specialized rules here

80
build/NWGNUenvironment.inc
View File

@ -2,9 +2,9 @@
# Setup needed Tools and Libraries # Setup needed Tools and Libraries
# #
ifeq "$(wildcard $(AP_WORK)\NWGNUcustom.ini)" "$(AP_WORK)\NWGNUcustom.ini" ifeq "$(wildcard $(AP_WORK)/NWGNUcustom.ini)" "$(AP_WORK)/NWGNUcustom.ini"
include $(AP_WORK)\NWGNUcustom.ini include $(AP_WORK)/NWGNUcustom.ini
CUSTOM_INI = $(AP_WORK)\NWGNUcustom.ini CUSTOM_INI = $(AP_WORK)/NWGNUcustom.ini
endif endif
ifndef VERBOSE ifndef VERBOSE
@ -181,15 +181,12 @@ ifndef USE_STDSOCKETS
INCDIRS += $(NOVELLLIBC)/include/winsock; INCDIRS += $(NOVELLLIBC)/include/winsock;
endif endif
ifneq "$(LDAPSDK)" "" ifneq "$(LDAPSDK)" ""
#INCDIRS := $(INCDIRS);$(LDAPSDK)/inc
INCDIRS += $(LDAPSDK)/inc; INCDIRS += $(LDAPSDK)/inc;
endif endif
ifneq "$(ZLIBSDK)" "" ifneq "$(ZLIBSDK)" ""
#INCDIRS := $(INCDIRS);$(ZLIBSDK)
INCDIRS += $(ZLIBSDK); INCDIRS += $(ZLIBSDK);
endif endif
ifneq "$(PCRESRC)" "" ifneq "$(PCRESRC)" ""
#INCDIRS := $(INCDIRS);$(PCRESRC)
INCDIRS += $(PCRESRC); INCDIRS += $(PCRESRC);
endif endif
@ -269,30 +266,6 @@ endif
# Declare major project deliverables output directories here # 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 ifndef PORT
PORT = 80 PORT = 80
endif endif
@ -301,10 +274,34 @@ ifndef SSLPORT
SSLPORT = 443 SSLPORT = 443
endif 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 # Add support for building IPV6 alongside
ifneq "$(IPV6)" "" ifneq "$(IPV6)" ""
DEFINES += -DNW_BUILD_IPV6 DEFINES += -DNW_BUILD_IPV6
# INCDIRS := $(NOVELLLIBC)\include\winsock\IPV6;$(INCDIRS) # INCDIRS := $(NOVELLLIBC)/include/winsock/IPV6;$(INCDIRS)
ifneq "$(findstring IPV6,$(OBJDIR))" "IPV6" ifneq "$(findstring IPV6,$(OBJDIR))" "IPV6"
OBJDIR := $(OBJDIR)_IPV6 OBJDIR := $(OBJDIR)_IPV6
@ -323,12 +320,15 @@ endif
INSTALLBASE := $(INSTALL)/$(BASEDIR) INSTALLBASE := $(INSTALL)/$(BASEDIR)
INSTDEVDIRS := \ INSTDEVDIRS := \
$(INSTDIRS) \ $(INSTALL) \
$(INSTALLBASE) \
$(INSTALLBASE)/build \
$(INSTALLBASE)/include \ $(INSTALLBASE)/include \
$(INSTALLBASE)/lib \ $(INSTALLBASE)/lib \
$(EOLIST)
INSTDIRS += \ INSTDIRS += \
$(INSTALL)/$(BASEDIR) \ $(INSTALLBASE) \
$(INSTALLBASE)/bin \ $(INSTALLBASE)/bin \
$(INSTALLBASE)/cgi-bin \ $(INSTALLBASE)/cgi-bin \
$(INSTALLBASE)/conf \ $(INSTALLBASE)/conf \
@ -340,25 +340,27 @@ INSTDIRS += \
$(INSTALLBASE)/man \ $(INSTALLBASE)/man \
$(INSTALLBASE)/manual \ $(INSTALLBASE)/manual \
$(INSTALLBASE)/modules \ $(INSTALLBASE)/modules \
$(EOLIST)
# #
# Common directories # Common directories
# #
SRC = $(subst \,/,$(AP_WORK)) SRC = $(subst \,/,$(AP_WORK))
APR = $(subst \,/,$(APR_WORK))
APRUTIL = $(subst \,/,$(APU_WORK))
APBUILD = $(SRC)/build APBUILD = $(SRC)/build
STDMOD = $(SRC)/modules STDMOD = $(SRC)/modules
HTTPD = $(SRC)/modules/http HTTPD = $(SRC)/modules/http
NWOS = $(SRC)/os/netware NWOS = $(SRC)/os/netware
SERVER = $(SRC)/server SERVER = $(SRC)/server
SUPMOD = $(SRC)/support SUPMOD = $(SRC)/support
APR = $(APR_WORK) APULDAP = $(APRUTIL)/ldap
APRUTIL = $(APU_WORK) XML = $(APRUTIL)/xml
APULDAP = $(APU_WORK)/ldap APRTEST = $(APR)/test
XML = $(APU_WORK)/xml
APRTEST = $(APR_WORK)/test
PCRE = $(PCRESRC) PCRE = $(PCRESRC)
PREBUILD_INST = $(SRC)/nwprebuild
PREBUILD_INST = $(SRC)/nwprebuild
# #
# Internal Libraries # Internal Libraries