diff options
| author | Guenter Knauf <fuankg@apache.org> | 2010-07-23 00:40:00 +0000 |
|---|---|---|
| committer | Guenter Knauf <fuankg@apache.org> | 2010-07-23 00:40:00 +0000 |
| commit | d9dcc0af84cb4c06d7c0046fbdd0d4512636782d (patch) | |
| tree | 0d2e65016025a08fa300ae40e164fe0646823c7f /NWGNUmakefile | |
| parent | 8fdc64959fe9779e40a541d72fb9ffe0df31b1d6 (diff) | |
| download | httpd-d9dcc0af84cb4c06d7c0046fbdd0d4512636782d.tar.gz | |
Cleaned up NetWare makefiles:
- removed obsolete -prefix compiler switch since already defined global for all files
- removed obsolete include paths
- changed include paths to use internal vars so hat apr/apr-util builds outside source tree
- removed trailing tabs and spaces, other minor cosmetic changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@966915 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'NWGNUmakefile')
| -rw-r--r-- | NWGNUmakefile | 41 |
1 files changed, 35 insertions, 6 deletions
diff --git a/NWGNUmakefile b/NWGNUmakefile index 8e92f45b1a..a30d89735a 100644 --- a/NWGNUmakefile +++ b/NWGNUmakefile @@ -1,9 +1,40 @@ # +# Define our required macro's if not already done. +# + +ifndef AP_WORK +export AP_WORK = $(CURDIR) +endif + +ifndef APR_WORK +ifeq "$(wildcard $(AP_WORK)/srclib/apr)" "$(AP_WORK)/srclib/apr" +export APR_WORK = $(AP_WORK)/srclib/apr +endif +endif +ifneq "$(wildcard $(APR_WORK)/include/apr_version.h)" "$(APR_WORK)/include/apr_version.h" +$(error APR_WORK does not point to a valid APR source tree) +endif + +ifndef APU_WORK +ifeq "$(wildcard $(AP_WORK)/srclib/apr-util)" "$(AP_WORK)/srclib/apr-util" +export APU_WORK = $(AP_WORK)/srclib/apr-util +endif +endif +ifndef APU_WORK +ifeq "$(wildcard $(APR_WORK)/include/apu_version.h)" "$(APR_WORK)/include/apu_version.h" +export APU_WORK = $(APR_WORK) +endif +endif +ifneq "$(wildcard $(APU_WORK)/include/apu_version.h)" "$(APU_WORK)/include/apu_version.h" +$(error APU_WORK does not point to a valid APU source tree) +endif + +# # Declare the sub-directories to be built here # SUBDIRS = \ - srclib\apr \ + $(APR_WORK) \ build \ support \ modules \ @@ -28,9 +59,8 @@ include $(AP_WORK)\build\NWGNUhead.inc # INCDIRS # XINCDIRS += \ - $(AP_WORK)/srclib/apr/include \ - $(AP_WORK)/srclib/include/arch/NetWare \ - $(AP_WORK)/srclib/apr-util/include \ + $(APR)/include \ + $(APRUTIL)/include \ $(AP_WORK)/include \ $(AP_WORK)/modules/filters/ \ $(AP_WORK)/modules/generators/ \ @@ -38,9 +68,8 @@ XINCDIRS += \ $(AP_WORK)/modules/loggers/ \ $(AP_WORK)/modules/mappers/ \ $(AP_WORK)/modules/proxy/ \ - $(AP_WORK)/os/NetWare \ $(AP_WORK)/server/mpm/NetWare \ - $(AP_WORK)/srclib/pcre \ + $(PCRE) \ $(NWOS) \ $(EOLIST) |