From: Guenter Knauf <fuankg@apache.org>
Date: Fri, 11 Mar 2011 18:47:15 +0000 (+0000)
Subject: NetWare build overhaul in order to compile on Linux.
X-Git-Tag: 2.3.12~255
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e7e98fa217bfd33191a534086770c1405b4bfa0c;p=apache
NetWare build overhaul in order to compile on Linux.
Some more build fixes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1080725 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/NWGNUmakefile b/NWGNUmakefile
index 344b35ae32..48addc71b9 100644
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -61,7 +61,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
XINCDIRS += \
$(APR)/include \
$(APRUTIL)/include \
- $(AP_WORK)/include \
+ $(SRC)/include \
$(STDMOD)/aaa \
$(STDMOD)/core \
$(STDMOD)/filters \
@@ -71,8 +71,8 @@ XINCDIRS += \
$(STDMOD)/mappers \
$(STDMOD)/proxy \
$(STDMOD)/ssl \
- $(AP_WORK)/server \
- $(AP_WORK)/server/mpm/netware \
+ $(SERVER) \
+ $(SERVER)/mpm/netware \
$(PCRE) \
$(NWOS) \
$(EOLIST)
@@ -328,9 +328,9 @@ FILE_nlm_copyright =
# Any additional imports go here
#
FILES_nlm_Ximports = \
- @netware.imp \
@aprlib.imp \
@libc.imp \
+ @netware.imp \
GetCurrentAddressSpace \
$(EOLIST)
@@ -389,6 +389,8 @@ nlms :: libs $(TARGET_nlm)
# Updated this target to create necessary directories and copy files to the
# correct place. (See $(AP_WORK)/build/NWGNUhead.inc for examples)
#
+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
$(call COPY,$(OBJDIR)/$(NLM_NAME).nlm, $(INSTALL)/$(BASEDIR)/)
$(call COPY,ABOUT_APACHE, $(INSTALL)/$(BASEDIR)/)
@@ -405,19 +407,18 @@ install :: nlms instscripts FORCE
$(call COPY,docs/conf/mime.types, $(INSTALL)/$(BASEDIR)/conf/)
$(call COPY,docs/conf/charset.conv, $(INSTALL)/$(BASEDIR)/conf/)
$(call COPY,docs/cgi-examples/printenv, $(INSTALL)/$(BASEDIR)/cgi-bin/printenv.pl)
- -$(AWK) -v BDIR=$(BASEDIR) -v PORT=$(PORT) -v SSLPORT=$(SSLPORT) -v MODSSL=$(WITH_MOD_SSL) -v BSDSKT=$(USE_STDSOCKETS) -f build/mkconfNW.awk docs/conf/httpd.conf.in >$(INSTALL)/$(BASEDIR)/conf\httpd.conf
- $(call MKDIR,$(INSTALL)/$(BASEDIR)/conf/extra)
- -$(AWK) -v BDIR=$(BASEDIR) -f build/mkconfNW.awk docs/conf/extra/httpd-autoindex.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-autoindex.conf
- -$(AWK) -v BDIR=$(BASEDIR) -f build/mkconfNW.awk docs/conf/extra/httpd-dav.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-dav.conf
- -$(AWK) -v BDIR=$(BASEDIR) -f build/mkconfNW.awk docs/conf/extra/httpd-default.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-default.conf
- -$(AWK) -v BDIR=$(BASEDIR) -f build/mkconfNW.awk docs/conf/extra/httpd-info.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-info.conf
- -$(AWK) -v BDIR=$(BASEDIR) -f build/mkconfNW.awk docs/conf/extra/httpd-languages.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-languages.conf
- -$(AWK) -v BDIR=$(BASEDIR) -f build/mkconfNW.awk docs/conf/extra/httpd-manual.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-manual.conf
- -$(AWK) -v BDIR=$(BASEDIR) -f build/mkconfNW.awk docs/conf/extra/httpd-mpm.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-mpm.conf
- -$(AWK) -v BDIR=$(BASEDIR) -f build/mkconfNW.awk docs/conf/extra/httpd-multilang-errordoc.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-multilang-errordoc.conf
- -$(AWK) -v BDIR=$(BASEDIR) -f build/mkconfNW.awk docs/conf/extra/httpd-userdir.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-userdir.conf
- -$(AWK) -v BDIR=$(BASEDIR) -v PORT=$(PORT) -f build/mkconfNW.awk docs/conf/extra/httpd-vhosts.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-vhosts.conf
- -$(AWK) -v BDIR=$(BASEDIR) -v SSLPORT=$(SSLPORT) -f build/mkconfNW.awk docs/conf/extra/httpd-ssl.conf.in >$(INSTALL)/$(BASEDIR)/conf/extra/httpd-ssl.conf
+ $(call MKCNF,docs/conf/httpd.conf.in, $(INSTALL)/$(BASEDIR)/conf/httpd.conf)
+ $(call MKCNF,docs/conf/extra/httpd-autoindex.conf.in, $(INSTALL)/$(BASEDIR)/conf/extra/httpd-autoindex.conf)
+ $(call MKCNF,docs/conf/extra/httpd-dav.conf.in, $(INSTALL)/$(BASEDIR)/conf/extra/httpd-dav.conf)
+ $(call MKCNF,docs/conf/extra/httpd-default.conf.in, $(INSTALL)/$(BASEDIR)/conf/extra/httpd-default.conf)
+ $(call MKCNF,docs/conf/extra/httpd-info.conf.in, $(INSTALL)/$(BASEDIR)/conf/extra/httpd-info.conf)
+ $(call MKCNF,docs/conf/extra/httpd-languages.conf.in, $(INSTALL)/$(BASEDIR)/conf/extra/httpd-languages.conf)
+ $(call MKCNF,docs/conf/extra/httpd-manual.conf.in, $(INSTALL)/$(BASEDIR)/conf/extra/httpd-manual.conf)
+ $(call MKCNF,docs/conf/extra/httpd-mpm.conf.in, $(INSTALL)/$(BASEDIR)/conf/extra/httpd-mpm.conf)
+ $(call MKCNF,docs/conf/extra/httpd-multilang-errordoc.conf.in, $(INSTALL)/$(BASEDIR)/conf/extra/httpd-multilang-errordoc.conf)
+ $(call MKCNF,docs/conf/extra/httpd-userdir.conf.in, $(INSTALL)/$(BASEDIR)/conf/extra/httpd-userdir.conf)
+ $(call MKCNF,docs/conf/extra/httpd-vhosts.conf.in, $(INSTALL)/$(BASEDIR)/conf/extra/httpd-vhosts.conf)
+ $(call MKCNF,docs/conf/extra/httpd-ssl.conf.in, $(INSTALL)/$(BASEDIR)/conf/extra/httpd-ssl.conf)
$(call COPYR,docs/docroot, $(INSTALL)/$(BASEDIR)/htdocs)
$(call COPYR,docs/error, $(INSTALL)/$(BASEDIR)/error)
$(call COPYR,docs/icons, $(INSTALL)/$(BASEDIR)/icons)
@@ -429,6 +430,20 @@ installdev :: FORCE
$(call COPY,$(NWOS)/*.h, $(INSTALL)/$(BASEDIR)/include/)
$(call COPY,$(APR)/include/*.h, $(INSTALL)/$(BASEDIR)/include/)
$(call COPY,$(APRUTIL)/include/*.h, $(INSTALL)/$(BASEDIR)/include/)
+ $(call COPY,$(STDMOD)/core/mod_so.h, $(INSTALL)/$(BASEDIR)/include/)
+ $(call COPY,core/mod_watchdog.h, $(INSTALL)/$(BASEDIR)/include/)
+ $(call COPY,cache/mod_cache.h, $(INSTALL)/$(BASEDIR)/include/)
+ $(call COPY,database/mod_dbd.h, $(INSTALL)/$(BASEDIR)/include/)
+ $(call COPY,dav/main/mod_dav.h, $(INSTALL)/$(BASEDIR)/include/)
+ $(call COPY,filters/mod_include.h, $(INSTALL)/$(BASEDIR)/include/)
+ $(call COPY,generators/mod_cgi.h, $(INSTALL)/$(BASEDIR)/include/)
+ $(call COPY,generators/mod_status.h, $(INSTALL)/$(BASEDIR)/include/)
+ $(call COPY,loggers/mod_log_config.h, $(INSTALL)/$(BASEDIR)/include/)
+ $(call COPY,mappers/mod_rewrite.h, $(INSTALL)/$(BASEDIR)/include/)
+ $(call COPY,proxy/mod_proxy.h, $(INSTALL)/$(BASEDIR)/include/)
+ $(call COPY,proxy/mod_serf.h, $(INSTALL)/$(BASEDIR)/include/)
+ $(call COPY,session/mod_session.h, $(INSTALL)/$(BASEDIR)/include/)
+ $(call COPY,ssl/mod_ssl.h, $(INSTALL)/$(BASEDIR)/include/)
$(call COPY,$(APR)/*.imp, $(INSTALL)/$(BASEDIR)/lib/)
$(call COPY,$(NWOS)/*.imp, $(INSTALL)/$(BASEDIR)/lib/)
$(call COPY,$(NWOS)/*.xdc, $(INSTALL)/$(BASEDIR)/lib/)
diff --git a/build/NWGNUenvironment.inc b/build/NWGNUenvironment.inc
index c122b5eb38..3b4c8c95ef 100644
--- a/build/NWGNUenvironment.inc
+++ b/build/NWGNUenvironment.inc
@@ -50,10 +50,8 @@ $(error LDAPSDK does not point to a valid Novell CLDAP SDK)
endif
ifndef PCRESRC
-ifeq "$(wildcard $(AP_WORK)/srclib/pcre/pcre-config.in)" "$(AP_WORK)/srclib/pcre/pcre-config.in"
PCRESRC = $(AP_WORK)/srclib/pcre
endif
-endif
ifneq "$(wildcard $(PCRESRC)/pcre-config.in)" "$(PCRESRC)/pcre-config.in"
$(error PCRESRC does not point to a valid PCRE source tree)
endif
@@ -144,8 +142,8 @@ ifeq ($(findstring /sh,$(SHELL)),/sh)
DEL = rm -f $1
RMDIR = rm -rf $1
MKDIR = mkdir -p $1
-COPY = cp -av $1 $2
-COPYR = cp -ar $1 $2
+COPY = -cp -av $1 $2
+COPYR = -cp -ar $1 $2
ECHONL = echo ""
DL = '
CAT = cat
@@ -160,8 +158,8 @@ RMDIR = $(shell if exist $(subst /,\,$1)\NUL deltree /y 2>NUL $(subst /,\,$1))
ECHONL = command /c echo.
endif
MKDIR = $(shell if not exist $(subst /,\,$1)\NUL md 2>NUL $(subst /,\,$1))
-COPY = copy /y 2>NUL $(subst /,\,$1) $(subst /,\,$2)
-COPYR = xcopy /y /e 2>NUL $(subst /,\,$1) $(subst /,\,$2)
+COPY = -copy /y 2>NUL $(subst /,\,$1) $(subst /,\,$2)
+COPYR = -xcopy /y /e 2>NUL $(subst /,\,$1) $(subst /,\,$2)
CAT = type
endif
@@ -245,7 +243,6 @@ endif
# -g generate debugging information
# -O0 level 0 optimizations
-
ifeq "$(RELEASE)" "debug"
CFLAGS += -g -O0
endif
@@ -256,7 +253,6 @@ CFLAGS += -O4,p
endif
# -prefix pre_nw.h #include pre_nw.h for all files
-
CFLAGS += -prefix pre_nw.h
@@ -329,6 +325,7 @@ INSTDIRS += \
$(INSTALL)/$(BASEDIR)/bin \
$(INSTALL)/$(BASEDIR)/cgi-bin \
$(INSTALL)/$(BASEDIR)/conf \
+ $(INSTALL)/$(BASEDIR)/conf/extra \
$(INSTALL)/$(BASEDIR)/error \
$(INSTALL)/$(BASEDIR)/htdocs \
$(INSTALL)/$(BASEDIR)/icons \
diff --git a/build/NWGNUmakefile b/build/NWGNUmakefile
index cdf91f53dc..30a1fd4e5c 100644
--- a/build/NWGNUmakefile
+++ b/build/NWGNUmakefile
@@ -22,7 +22,9 @@ FILES_prebuild_headers = \
$(PCRE)/pcre.h \
$(EOLIST)
-nlms :: chkapr $(NWOS)/httpd.imp $(NWOS)/chartables.c
+nlms :: libs $(NWOS)/httpd.imp
+
+libs :: chkapr $(NWOS)/chartables.c
$(NWOS)/httpd.imp : make_nw_export.awk nw_export.i
@echo $(DL)GEN $@$(DL)
@@ -58,11 +60,11 @@ $(PCRE)/%.h: $(PCRE)/%.hw
ifneq "$(BUILDTOOL_AS_NLM)" "1"
-$(NWOS)/chartables.c: dftables.exe $(PCRE)/dftables.c $(FILES_prebuild_headers)
+$(NWOS)/chartables.c: dftables.exe $(PCRE)/dftables.c
@echo $(DL)GEN $@$(DL)
$< $@
-%.exe: $(PCRE)/%.c
+%.exe: $(PCRE)/%.c $(PCRE)/config.h $(PCRE)/pcre.h
@echo $(DL)Creating Build Helper $@$(DL)
$(HOST_CC) $(HOST_CFLAGS) -DHAVE_CONFIG_H $< -o $@