Skip to content

Commit 94133ba

Browse files
author
Bradley Nicholes
committed
Add mod_logio to the NetWare build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97066 13f79535-47bb-0310-9956-ffa450edef68
1 parent d1581f5 commit 94133ba

4 files changed

Lines changed: 265 additions & 0 deletions

File tree

‎build/mkconfNW.awk‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ BEGIN {
4040
print "#LoadModule file_cache_module modules/filecach.nlm"
4141
print "#LoadModule headers_module modules/headers.nlm"
4242
print "#LoadModule info_module modules/info.nlm"
43+
print "#LoadModule logio_module modules/modlogio.nlm"
4344
print "#LoadModule mime_magic_module modules/mimemagi.nlm"
4445
print "#LoadModule proxy_module modules/proxy.nlm"
4546
print "#LoadModule proxy_connect_module modules/proxycon.nlm"

‎modules/NWGNUmakefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ SUBDIRS = \
1010
dav\fs \
1111
echo \
1212
generators \
13+
loggers \
1314
mappers \
1415
metadata \
1516
proxy \

‎modules/arch/netware/mod_logio.def‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
EXPORT logio_module
2+

‎modules/loggers/NWGNUmakefile‎

Lines changed: 261 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,261 @@
1+
#
2+
# Declare the sub-directories to be built here
3+
#
4+
5+
SUBDIRS = \
6+
$(EOLIST)
7+
8+
#
9+
# Get the 'head' of the build environment. This includes default targets and
10+
# paths to tools
11+
#
12+
13+
include $(AP_WORK)\build\NWGNUhead.inc
14+
15+
#
16+
# build this level's files
17+
18+
#
19+
# Make sure all needed macro's are defined
20+
#
21+
22+
#
23+
# These directories will be at the beginning of the include list, followed by
24+
# INCDIRS
25+
#
26+
XINCDIRS += \
27+
$(AP_WORK)/include \
28+
$(NWOS) \
29+
$(AP_WORK)/modules/arch/netware \
30+
$(AP_WORK)/srclib/apr/include \
31+
$(AP_WORK)/srclib/apr-util/include \
32+
$(AP_WORK)/srclib/apr \
33+
$(EOLIST)
34+
35+
#
36+
# These flags will come after CFLAGS
37+
#
38+
XCFLAGS += \
39+
-prefix pre_nw.h \
40+
$(EOLIST)
41+
42+
#
43+
# These defines will come after DEFINES
44+
#
45+
XDEFINES += \
46+
$(EOLIST)
47+
48+
#
49+
# These flags will be added to the link.opt file
50+
#
51+
XLFLAGS += \
52+
$(EOLIST)
53+
54+
#
55+
# These values will be appended to the correct variables based on the value of
56+
# RELEASE
57+
#
58+
ifeq "$(RELEASE)" "debug"
59+
XINCDIRS += \
60+
$(EOLIST)
61+
62+
XCFLAGS += \
63+
$(EOLIST)
64+
65+
XDEFINES += \
66+
$(EOLIST)
67+
68+
XLFLAGS += \
69+
$(EOLIST)
70+
endif
71+
72+
ifeq "$(RELEASE)" "noopt"
73+
XINCDIRS += \
74+
$(EOLIST)
75+
76+
XCFLAGS += \
77+
$(EOLIST)
78+
79+
XDEFINES += \
80+
$(EOLIST)
81+
82+
XLFLAGS += \
83+
$(EOLIST)
84+
endif
85+
86+
ifeq "$(RELEASE)" "release"
87+
XINCDIRS += \
88+
$(EOLIST)
89+
90+
XCFLAGS += \
91+
$(EOLIST)
92+
93+
XDEFINES += \
94+
$(EOLIST)
95+
96+
XLFLAGS += \
97+
$(EOLIST)
98+
endif
99+
100+
#
101+
# These are used by the link target if an NLM is being generated
102+
# This is used by the link 'name' directive to name the nlm. If left blank
103+
# TARGET_nlm (see below) will be used.
104+
#
105+
NLM_NAME = logio
106+
107+
#
108+
# This is used by the link '-desc ' directive.
109+
# If left blank, NLM_NAME will be used.
110+
#
111+
NLM_DESCRIPTION = Log IO Module
112+
113+
#
114+
# This is used by the '-threadname' directive. If left blank,
115+
# NLM_NAME Thread will be used.
116+
#
117+
NLM_THREAD_NAME = Logio Module
118+
119+
#
120+
# If this is specified, it will override VERSION value in
121+
# $(AP_WORK)\build\NWGNUenvironment.inc
122+
#
123+
NLM_VERSION =
124+
125+
#
126+
# If this is specified, it will override the default of 64K
127+
#
128+
NLM_STACK_SIZE = 8192
129+
130+
131+
#
132+
# If this is specified it will be used by the link '-entry' directive
133+
#
134+
NLM_ENTRY_SYM = _LibCPrelude
135+
136+
#
137+
# If this is specified it will be used by the link '-exit' directive
138+
#
139+
NLM_EXIT_SYM = _LibCPostlude
140+
141+
#
142+
# If this is specified it will be used by the link '-check' directive
143+
#
144+
NLM_CHECK_SYM =
145+
146+
#
147+
# If these are specified it will be used by the link '-flags' directive
148+
#
149+
NLM_FLAGS = AUTOUNLOAD, PSEUDOPREEMPTION
150+
151+
#
152+
# If this is specified it will be linked in with the XDCData option in the def
153+
# file instead of the default of $(NWOS)/apache.xdc. XDCData can be disabled
154+
# by setting APACHE_UNIPROC in the environment
155+
#
156+
XDCDATA =
157+
158+
#
159+
# If there is an NLM target, put it here
160+
#
161+
TARGET_nlm = \
162+
$(OBJDIR)/modlogio.nlm \
163+
$(EOLIST)
164+
165+
#
166+
# If there is an LIB target, put it here
167+
#
168+
TARGET_lib = \
169+
$(EOLIST)
170+
171+
#
172+
# These are the OBJ files needed to create the NLM target above.
173+
# Paths must all use the '/' character
174+
#
175+
FILES_nlm_objs = \
176+
$(OBJDIR)/mod_logio.o \
177+
$(EOLIST)
178+
179+
#
180+
# These are the LIB files needed to create the NLM target above.
181+
# These will be added as a library command in the link.opt file.
182+
#
183+
FILES_nlm_libs = \
184+
libcpre.o \
185+
$(EOLIST)
186+
187+
#
188+
# These are the modules that the above NLM target depends on to load.
189+
# These will be added as a module command in the link.opt file.
190+
#
191+
FILES_nlm_modules = \
192+
aprlib \
193+
libc \
194+
$(EOLIST)
195+
196+
#
197+
# If the nlm has a msg file, put it's path here
198+
#
199+
FILE_nlm_msg =
200+
201+
#
202+
# If the nlm has a hlp file put it's path here
203+
#
204+
FILE_nlm_hlp =
205+
206+
#
207+
# If this is specified, it will override $(NWOS)\copyright.txt.
208+
#
209+
FILE_nlm_copyright =
210+
211+
#
212+
# Any additional imports go here
213+
#
214+
FILES_nlm_Ximports = \
215+
@$(APR)/aprlib.imp \
216+
@$(NWOS)/httpd.imp \
217+
@libc.imp \
218+
$(EOLIST)
219+
220+
#
221+
# Any symbols exported to here
222+
#
223+
FILES_nlm_exports = \
224+
logio_module \
225+
$(EOLIST)
226+
227+
#
228+
# These are the OBJ files needed to create the LIB target above.
229+
# Paths must all use the '/' character
230+
#
231+
FILES_lib_objs = \
232+
$(EOLIST)
233+
234+
#
235+
# implement targets and dependancies (leave this section alone)
236+
#
237+
238+
libs :: $(OBJDIR) $(TARGET_lib)
239+
240+
nlms :: libs $(TARGET_nlm)
241+
242+
#
243+
# Updated this target to create necessary directories and copy files to the
244+
# correct place. (See $(AP_WORK)\build\NWGNUhead.inc for examples)
245+
#
246+
install :: nlms FORCE
247+
copy $(OBJDIR)\*.nlm $(INSTALL)\Apache2\modules\*.*
248+
249+
#
250+
# Any specialized rules here
251+
#
252+
253+
#
254+
# Include the 'tail' makefile that has targets that depend on variables defined
255+
# in this makefile
256+
#
257+
258+
include $(AP_WORK)\build\NWGNUtail.inc
259+
260+
261+

0 commit comments

Comments
 (0)