Skip to content

Commit

Permalink
NetWare build tweaks.
Browse files Browse the repository at this point in the history 
Make more use of internal makefile macros;
axed now obsolete include paths.
Submitted by: normw gknw net.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1371177 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
Guenter Knauf committed Aug 9, 2012
1 parent e70c833 commit 84877f4
Show file tree
Hide file tree
Showing 102 changed files with 159 additions and 167 deletions.
8 changes: 0 additions & 8 deletions NWGNUmakefile
View file
Expand Up @@ -62,18 +62,10 @@ XINCDIRS += \
$(APR)/include \ $(APR)/include \
$(APRUTIL)/include \ $(APRUTIL)/include \
$(SRC)/include \ $(SRC)/include \
$(STDMOD)/aaa \
$(STDMOD)/core \ $(STDMOD)/core \
$(STDMOD)/filters \ $(STDMOD)/filters \
$(STDMOD)/generators \ $(STDMOD)/generators \
$(STDMOD)/http \
$(STDMOD)/loggers \
$(STDMOD)/mappers \
$(STDMOD)/proxy \ $(STDMOD)/proxy \
$(STDMOD)/ssl \
$(SERVER) \
$(SERVER)/mpm/netware \
$(PCRE) \
$(NWOS) \ $(NWOS) \
$(EOLIST) $(EOLIST)


Expand Down
2 changes: 1 addition & 1 deletion modules/aaa/NWGNUaccesscompat
View file
Expand Up @@ -18,7 +18,7 @@ endif
XINCDIRS += \ XINCDIRS += \
$(APR)/include \ $(APR)/include \
$(APRUTIL)/include \ $(APRUTIL)/include \
$(AP_WORK)/include \ $(SRC)/include \
$(NWOS) \ $(NWOS) \
$(EOLIST) $(EOLIST)


Expand Down
2 changes: 1 addition & 1 deletion modules/aaa/NWGNUallowmethods
View file
Expand Up @@ -18,7 +18,7 @@ endif
XINCDIRS += \ XINCDIRS += \
$(APR)/include \ $(APR)/include \
$(APRUTIL)/include \ $(APRUTIL)/include \
$(AP_WORK)/include \ $(SRC)/include \
$(NWOS) \ $(NWOS) \
$(EOLIST) $(EOLIST)


Expand Down
2 changes: 1 addition & 1 deletion modules/aaa/NWGNUauthbasc
View file
Expand Up @@ -18,7 +18,7 @@ endif
XINCDIRS += \ XINCDIRS += \
$(APR)/include \ $(APR)/include \
$(APRUTIL)/include \ $(APRUTIL)/include \
$(AP_WORK)/include \ $(SRC)/include \
$(NWOS) \ $(NWOS) \
$(EOLIST) $(EOLIST)


Expand Down
2 changes: 1 addition & 1 deletion modules/aaa/NWGNUauthdigt
View file
Expand Up @@ -18,7 +18,7 @@ endif
XINCDIRS += \ XINCDIRS += \
$(APR)/include \ $(APR)/include \
$(APRUTIL)/include \ $(APRUTIL)/include \
$(AP_WORK)/include \ $(SRC)/include \
$(NWOS) \ $(NWOS) \
$(EOLIST) $(EOLIST)


Expand Down
2 changes: 1 addition & 1 deletion modules/aaa/NWGNUauthform
View file
Expand Up @@ -18,7 +18,7 @@ endif
XINCDIRS += \ XINCDIRS += \
$(APR)/include \ $(APR)/include \
$(APRUTIL)/include \ $(APRUTIL)/include \
$(AP_WORK)/include \ $(SRC)/include \
$(NWOS) \ $(NWOS) \
$(STDMOD)/session \ $(STDMOD)/session \
$(STDMOD)/filters \ $(STDMOD)/filters \
Expand Down
2 changes: 1 addition & 1 deletion modules/aaa/NWGNUauthnano
View file
Expand Up @@ -18,7 +18,7 @@ endif
XINCDIRS += \ XINCDIRS += \
$(APR)/include \ $(APR)/include \
$(APRUTIL)/include \ $(APRUTIL)/include \
$(AP_WORK)/include \ $(SRC)/include \
$(NWOS) \ $(NWOS) \
$(EOLIST) $(EOLIST)


Expand Down
4 changes: 2 additions & 2 deletions modules/aaa/NWGNUauthndbd
View file
Expand Up @@ -18,9 +18,9 @@ endif
XINCDIRS += \ XINCDIRS += \
$(APR)/include \ $(APR)/include \
$(APRUTIL)/include \ $(APRUTIL)/include \
$(AP_WORK)/include \ $(SRC)/include \
$(NWOS) \ $(NWOS) \
$(AP_WORK)/modules/database \ $(STDMOD)/database \
$(EOLIST) $(EOLIST)


# #
Expand Down
2 changes: 1 addition & 1 deletion modules/aaa/NWGNUauthndbm
View file
Expand Up @@ -18,7 +18,7 @@ endif
XINCDIRS += \ XINCDIRS += \
$(APR)/include \ $(APR)/include \
$(APRUTIL)/include \ $(APRUTIL)/include \
$(AP_WORK)/include \ $(SRC)/include \
$(NWOS) \ $(NWOS) \
$(EOLIST) $(EOLIST)


Expand Down
2 changes: 1 addition & 1 deletion modules/aaa/NWGNUauthnfil
View file
Expand Up @@ -18,7 +18,7 @@ endif
XINCDIRS += \ XINCDIRS += \
$(APR)/include \ $(APR)/include \
$(APRUTIL)/include \ $(APRUTIL)/include \
$(AP_WORK)/include \ $(SRC)/include \
$(NWOS) \ $(NWOS) \
$(EOLIST) $(EOLIST)


Expand Down
2 changes: 1 addition & 1 deletion modules/aaa/NWGNUauthnsocache
View file
Expand Up @@ -18,7 +18,7 @@ endif
XINCDIRS += \ XINCDIRS += \
$(APR)/include \ $(APR)/include \
$(APRUTIL)/include \ $(APRUTIL)/include \
$(AP_WORK)/include \ $(SRC)/include \
$(NWOS) \ $(NWOS) \
$(EOLIST) $(EOLIST)


Expand Down
2 changes: 1 addition & 1 deletion modules/aaa/NWGNUauthnzldap
View file
Expand Up @@ -18,7 +18,7 @@ endif
XINCDIRS += \ XINCDIRS += \
$(APR)/include \ $(APR)/include \
$(APRUTIL)/include \ $(APRUTIL)/include \
$(AP_WORK)/include \ $(SRC)/include \
$(NWOS) \ $(NWOS) \
$(EOLIST) $(EOLIST)


Expand Down
2 changes: 1 addition & 1 deletion modules/aaa/NWGNUauthzdbd
View file
Expand Up @@ -18,7 +18,7 @@ endif
XINCDIRS += \ XINCDIRS += \
$(APR)/include \ $(APR)/include \
$(APRUTIL)/include \ $(APRUTIL)/include \
$(AP_WORK)/include \ $(SRC)/include \
$(NWOS) \ $(NWOS) \
$(STDMOD)/database \ $(STDMOD)/database \
$(EOLIST) $(EOLIST)
Expand Down
2 changes: 1 addition & 1 deletion modules/aaa/NWGNUauthzdbm
View file
Expand Up @@ -18,7 +18,7 @@ endif
XINCDIRS += \ XINCDIRS += \
$(APR)/include \ $(APR)/include \
$(APRUTIL)/include \ $(APRUTIL)/include \
$(AP_WORK)/include \ $(SRC)/include \
$(NWOS) \ $(NWOS) \
$(EOLIST) $(EOLIST)


Expand Down
2 changes: 1 addition & 1 deletion modules/aaa/NWGNUauthzgrp
View file
Expand Up @@ -18,7 +18,7 @@ endif
XINCDIRS += \ XINCDIRS += \
$(APR)/include \ $(APR)/include \
$(APRUTIL)/include \ $(APRUTIL)/include \
$(AP_WORK)/include \ $(SRC)/include \
$(NWOS) \ $(NWOS) \
$(EOLIST) $(EOLIST)


Expand Down
2 changes: 1 addition & 1 deletion modules/aaa/NWGNUauthzusr
View file
Expand Up @@ -18,7 +18,7 @@ endif
XINCDIRS += \ XINCDIRS += \
$(APR)/include \ $(APR)/include \
$(APRUTIL)/include \ $(APRUTIL)/include \
$(AP_WORK)/include \ $(SRC)/include \
$(NWOS) \ $(NWOS) \
$(EOLIST) $(EOLIST)


Expand Down
2 changes: 1 addition & 1 deletion modules/apreq/NWGNUmakefile
View file
Expand Up @@ -18,7 +18,7 @@ endif
XINCDIRS += \ XINCDIRS += \
$(APR)/include \ $(APR)/include \
$(APRUTIL)/include \ $(APRUTIL)/include \
$(AP_WORK)/include \ $(SRC)/include \
$(NWOS) \ $(NWOS) \
$(EOLIST) $(EOLIST)


Expand Down
4 changes: 2 additions & 2 deletions modules/cache/NWGNUcach_dsk
View file
Expand Up @@ -25,8 +25,8 @@ include $(AP_WORK)/build/NWGNUhead.inc
XINCDIRS += \ XINCDIRS += \
$(APR)/include \ $(APR)/include \
$(APRUTIL)/include \ $(APRUTIL)/include \
$(AP_WORK)/include \ $(SRC)/include \
$(AP_WORK)/server/mpm/netware \ $(SERVER)/mpm/netware \
$(NWOS) \ $(NWOS) \
$(EOLIST) $(EOLIST)


Expand Down
4 changes: 2 additions & 2 deletions modules/cache/NWGNUmod_cach
View file
Expand Up @@ -25,8 +25,8 @@ include $(AP_WORK)/build/NWGNUhead.inc
XINCDIRS += \ XINCDIRS += \
$(APR)/include \ $(APR)/include \
$(APRUTIL)/include \ $(APRUTIL)/include \
$(AP_WORK)/include \ $(SRC)/include \
$(AP_WORK)/server/mpm/netware \ $(SERVER)/mpm/netware \
$(NWOS) \ $(NWOS) \
$(EOLIST) $(EOLIST)


Expand Down
4 changes: 2 additions & 2 deletions modules/cache/NWGNUsocachdbm
View file
Expand Up @@ -25,8 +25,8 @@ include $(AP_WORK)/build/NWGNUhead.inc
XINCDIRS += \ XINCDIRS += \
$(APR)/include \ $(APR)/include \
$(APRUTIL)/include \ $(APRUTIL)/include \
$(AP_WORK)/include \ $(SRC)/include \
$(AP_WORK)/server/mpm/netware \ $(SERVER)/mpm/netware \
$(NWOS) \ $(NWOS) \
$(EOLIST) $(EOLIST)


Expand Down
4 changes: 2 additions & 2 deletions modules/cache/NWGNUsocachmem
View file
Expand Up @@ -25,8 +25,8 @@ include $(AP_WORK)/build/NWGNUhead.inc
XINCDIRS += \ XINCDIRS += \
$(APR)/include \ $(APR)/include \
$(APRUTIL)/include \ $(APRUTIL)/include \
$(AP_WORK)/include \ $(SRC)/include \
$(AP_WORK)/server/mpm/netware \ $(SERVER)/mpm/netware \
$(NWOS) \ $(NWOS) \
$(EOLIST) $(EOLIST)


Expand Down
4 changes: 2 additions & 2 deletions modules/cache/NWGNUsocachshmcb
View file
Expand Up @@ -25,8 +25,8 @@ include $(AP_WORK)/build/NWGNUhead.inc
XINCDIRS += \ XINCDIRS += \
$(APR)/include \ $(APR)/include \
$(APRUTIL)/include \ $(APRUTIL)/include \
$(AP_WORK)/include \ $(SRC)/include \
$(AP_WORK)/server/mpm/netware \ $(SERVER)/mpm/netware \
$(NWOS) \ $(NWOS) \
$(EOLIST) $(EOLIST)


Expand Down
4 changes: 2 additions & 2 deletions modules/cluster/NWGNUmodheartbeat
View file
Expand Up @@ -26,8 +26,8 @@ include $(AP_WORK)/build/NWGNUhead.inc
XINCDIRS += \ XINCDIRS += \
$(APR)/include \ $(APR)/include \
$(APRUTIL)/include \ $(APRUTIL)/include \
$(AP_WORK)/include \ $(SRC)/include \
$(AP_WORK)/modules/core \ $(STDMOD)/core \
$(NWOS) \ $(NWOS) \
$(EOLIST) $(EOLIST)


Expand Down
4 changes: 2 additions & 2 deletions modules/cluster/NWGNUmodheartmonitor
View file
Expand Up @@ -26,8 +26,8 @@ include $(AP_WORK)/build/NWGNUhead.inc
XINCDIRS += \ XINCDIRS += \
$(APR)/include \ $(APR)/include \
$(APRUTIL)/include \ $(APRUTIL)/include \
$(AP_WORK)/include \ $(SRC)/include \
$(AP_WORK)/modules/core \ $(STDMOD)/core \
$(NWOS) \ $(NWOS) \
$(EOLIST) $(EOLIST)


Expand Down
2 changes: 1 addition & 1 deletion modules/database/NWGNUmakefile
View file
Expand Up @@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
XINCDIRS += \ XINCDIRS += \
$(APR)/include \ $(APR)/include \
$(APRUTIL)/include \ $(APRUTIL)/include \
$(AP_WORK)/include \ $(SRC)/include \
$(NWOS) \ $(NWOS) \
$(EOLIST) $(EOLIST)


Expand Down
6 changes: 3 additions & 3 deletions modules/dav/fs/NWGNUmakefile
View file
Expand Up @@ -26,9 +26,9 @@ include $(AP_WORK)/build/NWGNUhead.inc
XINCDIRS += \ XINCDIRS += \
$(APR)/include \ $(APR)/include \
$(APRUTIL)/include \ $(APRUTIL)/include \
$(AP_WORK)/include \ $(SRC)/include \
$(AP_WORK)/server/mpm/netware \ $(SERVER)/mpm/netware \
$(AP_WORK)/modules/dav/main \ $(STDMOD)/dav/main \
$(NWOS) \ $(NWOS) \
$(EOLIST) $(EOLIST)


Expand Down
6 changes: 3 additions & 3 deletions modules/dav/lock/NWGNUmakefile
View file
Expand Up @@ -26,9 +26,9 @@ include $(AP_WORK)/build/NWGNUhead.inc
XINCDIRS += \ XINCDIRS += \
$(APR)/include \ $(APR)/include \
$(APRUTIL)/include \ $(APRUTIL)/include \
$(AP_WORK)/include \ $(SRC)/include \
$(AP_WORK)/server/mpm/netware \ $(SERVER)/mpm/netware \
$(AP_WORK)/modules/dav/main \ $(STDMOD)/dav/main \
$(NWOS) \ $(NWOS) \
$(EOLIST) $(EOLIST)


Expand Down
4 changes: 2 additions & 2 deletions modules/dav/main/NWGNUmakefile
View file
Expand Up @@ -25,8 +25,8 @@ include $(AP_WORK)/build/NWGNUhead.inc
XINCDIRS += \ XINCDIRS += \
$(APR)/include \ $(APR)/include \
$(APRUTIL)/include \ $(APRUTIL)/include \
$(AP_WORK)/include \ $(SRC)/include \
$(AP_WORK)/server/mpm/netware \ $(SERVER)/mpm/netware \
$(NWOS) \ $(NWOS) \
$(EOLIST) $(EOLIST)


Expand Down
2 changes: 1 addition & 1 deletion modules/debugging/NWGNUmodbucketeer
View file
Expand Up @@ -18,7 +18,7 @@ endif
XINCDIRS += \ XINCDIRS += \
$(APR)/include \ $(APR)/include \
$(APRUTIL)/include \ $(APRUTIL)/include \
$(AP_WORK)/include \ $(SRC)/include \
$(NWOS) \ $(NWOS) \
$(EOLIST) $(EOLIST)


Expand Down
2 changes: 1 addition & 1 deletion modules/debugging/NWGNUmoddumpio
View file
Expand Up @@ -18,7 +18,7 @@ endif
XINCDIRS += \ XINCDIRS += \
$(APR)/include \ $(APR)/include \
$(APRUTIL)/include \ $(APRUTIL)/include \
$(AP_WORK)/include \ $(SRC)/include \
$(NWOS) \ $(NWOS) \
$(EOLIST) $(EOLIST)


Expand Down
2 changes: 1 addition & 1 deletion modules/debugging/NWGNUmodfirehose
View file
Expand Up @@ -18,7 +18,7 @@ endif
XINCDIRS += \ XINCDIRS += \
$(APR)/include \ $(APR)/include \
$(APRUTIL)/include \ $(APRUTIL)/include \
$(AP_WORK)/include \ $(SRC)/include \
$(STDMOD)/proxy \ $(STDMOD)/proxy \
$(NWOS) \ $(NWOS) \
$(EOLIST) $(EOLIST)
Expand Down
2 changes: 1 addition & 1 deletion modules/echo/NWGNUmakefile
View file
Expand Up @@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
XINCDIRS += \ XINCDIRS += \
$(APR)/include \ $(APR)/include \
$(APRUTIL)/include \ $(APRUTIL)/include \
$(AP_WORK)/include \ $(SRC)/include \
$(NWOS) \ $(NWOS) \
$(EOLIST) $(EOLIST)


Expand Down
2 changes: 1 addition & 1 deletion modules/examples/NWGNUcase_flt
View file
Expand Up @@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
XINCDIRS += \ XINCDIRS += \
$(APR)/include \ $(APR)/include \
$(APRUTIL)/include \ $(APRUTIL)/include \
$(AP_WORK)/include \ $(SRC)/include \
$(NWOS) \ $(NWOS) \
$(EOLIST) $(EOLIST)


Expand Down
2 changes: 1 addition & 1 deletion modules/examples/NWGNUcase_flt_in
View file
Expand Up @@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
XINCDIRS += \ XINCDIRS += \
$(APR)/include \ $(APR)/include \
$(APRUTIL)/include \ $(APRUTIL)/include \
$(AP_WORK)/include \ $(SRC)/include \
$(NWOS) \ $(NWOS) \
$(EOLIST) $(EOLIST)


Expand Down
4 changes: 2 additions & 2 deletions modules/examples/NWGNUexample_hooks
View file
Expand Up @@ -26,8 +26,8 @@ include $(AP_WORK)/build/NWGNUhead.inc
XINCDIRS += \ XINCDIRS += \
$(APR)/include \ $(APR)/include \
$(APRUTIL)/include \ $(APRUTIL)/include \
$(AP_WORK)/include \ $(SRC)/include \
$(AP_WORK)/server/mpm/netware \ $(SERVER)/mpm/netware \
$(NWOS) \ $(NWOS) \
$(EOLIST) $(EOLIST)


Expand Down
4 changes: 2 additions & 2 deletions modules/examples/NWGNUexample_ipc
View file
Expand Up @@ -26,8 +26,8 @@ include $(AP_WORK)/build/NWGNUhead.inc
XINCDIRS += \ XINCDIRS += \
$(APR)/include \ $(APR)/include \
$(APRUTIL)/include \ $(APRUTIL)/include \
$(AP_WORK)/include \ $(SRC)/include \
$(AP_WORK)/server/mpm/netware \ $(SERVER)/mpm/netware \
$(NWOS) \ $(NWOS) \
$(EOLIST) $(EOLIST)


Expand Down
2 changes: 1 addition & 1 deletion modules/experimental/NWGNUnoloris
View file
Expand Up @@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
XINCDIRS += \ XINCDIRS += \
$(APR)/include \ $(APR)/include \
$(APRUTIL)/include \ $(APRUTIL)/include \
$(AP_WORK)/include \ $(SRC)/include \
$(NWOS) \ $(NWOS) \
$(EOLIST) $(EOLIST)


Expand Down
2 changes: 1 addition & 1 deletion modules/filters/NWGNUcharsetl
View file
Expand Up @@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
XINCDIRS += \ XINCDIRS += \
$(APR)/include \ $(APR)/include \
$(APRUTIL)/include \ $(APRUTIL)/include \
$(AP_WORK)/include \ $(SRC)/include \
$(NWOS) \ $(NWOS) \
$(EOLIST) $(EOLIST)


Expand Down
2 changes: 1 addition & 1 deletion modules/filters/NWGNUdeflate
View file
Expand Up @@ -29,7 +29,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
XINCDIRS += \ XINCDIRS += \
$(APR)/include \ $(APR)/include \
$(APRUTIL)/include \ $(APRUTIL)/include \
$(AP_WORK)/include \ $(SRC)/include \
$(STDMOD)/ssl \ $(STDMOD)/ssl \
$(NWOS) \ $(NWOS) \
$(EOLIST) $(EOLIST)
Expand Down

0 comments on commit 84877f4

Please sign in to comment.