← Back to branch summary

~matttbe/ubuntu/quantal/apache2/lp1013171

« back to all changes in this revision

Viewing changes to modules/filters/NWGNUextfiltr

  • 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/filters/NWGNUextfiltr
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
 
                        $(APR)/include \
23
 
                        $(APRUTIL)/include \
24
 
                        $(APR) \
25
23
                        $(EOLIST)
26
24
 
27
25
#
109
107
 
110
108
#
111
109
# If this is specified, it will override VERSION value in 
112
 
# $(AP_WORK)\build\NWGNUenvironment.inc
 
110
# $(AP_WORK)/build/NWGNUenvironment.inc
113
111
#
114
112
NLM_VERSION     =
115
113
 
122
120
#
123
121
# If this is specified it will be used by the link '-entry' directive
124
122
#
125
 
NLM_ENTRY_SYM   = _LibCPrelude
 
123
NLM_ENTRY_SYM   =
126
124
 
127
125
#
128
126
# If this is specified it will be used by the link '-exit' directive
129
127
#
130
 
NLM_EXIT_SYM    = _LibCPostlude
 
128
NLM_EXIT_SYM    =
131
129
 
132
130
#
133
131
# If this is specified it will be used by the link '-check' directive
137
135
#
138
136
# If these are specified it will be used by the link '-flags' directive
139
137
#
140
 
NLM_FLAGS       = AUTOUNLOAD, PSEUDOPREEMPTION
 
138
NLM_FLAGS       =
141
139
 
142
140
#
143
141
# If this is specified it will be linked in with the XDCData option in the def 
172
170
# These will be added as a library command in the link.opt file.
173
171
#
174
172
FILES_nlm_libs = \
175
 
        libcpre.o \
 
173
        $(PRELUDE) \
176
174
        $(EOLIST)
177
175
 
178
176
#
203
201
# Any additional imports go here
204
202
#
205
203
FILES_nlm_Ximports = \
206
 
        @$(APR)/aprlib.imp \
207
 
        @$(NWOS)/httpd.imp \
 
204
        @aprlib.imp \
 
205
        @httpd.imp \
208
206
        @libc.imp \
209
207
        $(EOLIST)
210
208
 
232
230
 
233
231
#
234
232
# Updated this target to create necessary directories and copy files to the 
235
 
# correct place.  (See $(AP_WORK)\build\NWGNUhead.inc for examples)
 
233
# correct place.  (See $(AP_WORK)/build/NWGNUhead.inc for examples)
236
234
#
237
235
install :: nlms FORCE
238
236
 
245
243
# in this makefile
246
244
#
247
245
 
248
 
include $(AP_WORK)\build\NWGNUtail.inc
 
246
include $(APBUILD)/NWGNUtail.inc
249
247
 
250
248