← Back to branch summary

~ubuntu-branches/ubuntu/wily/apache2/wily

« back to all changes in this revision

Viewing changes to modules/mappers/NWGNUrewrite

  • Committer: Bazaar Package Importer
  • Author(s): Andres Rodriguez
  • Date: 2011-05-23 10:16:09 UTC
  • mfrom: (14.3.26 sid)
  • Revision ID: james.westby@ubuntu.com-20110523101609-iqqcad6kzo1zc2df
Tags: 2.2.19-1ubuntu1
https://launchpad.net/bugs/787013
* Merge from debian unstable (LP: #787013). Remaining changes:
  - debian/{control, rules}: Enable PIE hardening.
  - debian/{control, rules, apache2.2-common.ufw.profile}: Add ufw profiles.
  - debian/control: Add bzr tag and point it to our tree
  - debian/apache2.py, debian/apache2.2-common.install: Add apport hook.
  - debian/control, debian/ask-for-passphrase, debian/config-dir/mods-available/ssl.conf:
    Plymouth aware passphrase dialog program ask-for-passphrase.

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/mappers/NWGNUrewrite
8
8
#
9
9
 
10
10
ifndef EnvironmentDefined
11
 
include $(AP_WORK)\build\NWGNUhead.inc
 
11
include $(AP_WORK)/build/NWGNUhead.inc
12
12
endif
13
13
 
14
14
#
16
16
# INCDIRS
17
17
#
18
18
XINCDIRS        += \
 
19
                        $(APR)/include \
 
20
                        $(APRUTIL)/include \
19
21
                        $(AP_WORK)/include \
20
22
                        $(NWOS) \
21
 
                        $(AP_WORK)/modules/arch/netware \
22
 
                        $(AP_WORK)/modules/ssl \
23
 
                        $(APR)/include \
24
 
                        $(APRUTIL)/include \
25
 
                        $(APR) \
 
23
                        $(STDMOD)/ssl \
26
24
                        $(EOLIST)
27
25
 
28
26
#
110
108
 
111
109
#
112
110
# If this is specified, it will override VERSION value in 
113
 
# $(AP_WORK)\build\NWGNUenvironment.inc
 
111
# $(AP_WORK)/build/NWGNUenvironment.inc
114
112
#
115
113
NLM_VERSION     =
116
114
 
123
121
#
124
122
# If this is specified it will be used by the link '-entry' directive
125
123
#
126
 
NLM_ENTRY_SYM   = _LibCPrelude
 
124
NLM_ENTRY_SYM   =
127
125
 
128
126
#
129
127
# If this is specified it will be used by the link '-exit' directive
130
128
#
131
 
NLM_EXIT_SYM    = _LibCPostlude
 
129
NLM_EXIT_SYM    =
132
130
 
133
131
#
134
132
# If this is specified it will be used by the link '-check' directive
138
136
#
139
137
# If these are specified it will be used by the link '-flags' directive
140
138
#
141
 
NLM_FLAGS       = AUTOUNLOAD, PSEUDOPREEMPTION
 
139
NLM_FLAGS       =
142
140
 
143
141
#
144
142
# If this is specified it will be linked in with the XDCData option in the def 
173
171
# These will be added as a library command in the link.opt file.
174
172
#
175
173
FILES_nlm_libs = \
176
 
        libcpre.o \
 
174
        $(PRELUDE) \
177
175
        $(EOLIST)
178
176
 
179
177
#
204
202
# Any additional imports go here
205
203
#
206
204
FILES_nlm_Ximports = \
207
 
        @$(APR)/aprlib.imp \
208
 
        @$(NWOS)/httpd.imp \
 
205
        @aprlib.imp \
 
206
        @httpd.imp \
209
207
        @libc.imp \
210
208
        $(EOLIST)
211
209
 
233
231
 
234
232
#
235
233
# Updated this target to create necessary directories and copy files to the 
236
 
# correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 
234
# correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)
237
235
#
238
236
install :: nlms FORCE
239
237
 
246
244
# in this makefile
247
245
#
248
246
 
249
 
include $(AP_WORK)\build\NWGNUtail.inc
 
247
include $(APBUILD)/NWGNUtail.inc
250
248
 
251
249