← Back to branch summary

~ubuntu-branches/ubuntu/quantal/iptables/quantal-proposed

« back to all changes in this revision

Viewing changes to extensions/GNUmakefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Nicolas Valcárcel Scerpella
  • Date: 2009-05-06 16:35:21 UTC
  • mfrom: (5.1.6 upstream) (2.1.2 lenny)
  • Revision ID: james.westby@ubuntu.com-20090506163521-2hbruo0m33h04wxf
Tags: 1.4.3.2-2ubuntu1
https://launchpad.net/bugs/372920
* Merge from debian unstable (LP: #372920), remaining changes:
  - Don't fail to run iptables-save if iptables module isn't loaded.
  - debian/patches/0901-build-libipq_pic.a.patch - Build libipq_pic.a with
    -fPIC. Upstream changed build system and patch modified accordingly.
  - Revert changes between 1.4.1.1-3 and 1.4.1.1-4, thus bringing back
    the howtos.
* Droped unexistent patches from debian/patches/series
* Droped 0903-autoload-module-in-iptables-save.diff, fixed upstream
* Added linuxdoc-tools to Build-Depends
* Modified debian/iptables{,-dev}.install to match DM syntax 
  (removed debian/tmp)

Show diffs side-by-side

added added

removed removed

Lines of Context:
extensions/GNUmakefile.in
35
35
#       Wildcard module list
36
36
#
37
37
pfx_build_mod := $(patsubst ${srcdir}/libxt_%.c,%,$(wildcard ${srcdir}/libxt_*.c))
38
 
pf4_build_mod := $(patsubst ${srcdir}/libipt_%.c,%,$(wildcard ${srcdir}/libipt_*.c))
39
 
pf6_build_mod := $(patsubst ${srcdir}/libip6t_%.c,%,$(wildcard ${srcdir}/libip6t_*.c))
 
38
@ENABLE_IPV4_TRUE@ pf4_build_mod := $(patsubst ${srcdir}/libipt_%.c,%,$(wildcard ${srcdir}/libipt_*.c))
 
39
@ENABLE_IPV6_TRUE@ pf6_build_mod := $(patsubst ${srcdir}/libip6t_%.c,%,$(wildcard ${srcdir}/libip6t_*.c))
40
40
pfx_build_mod := $(filter-out @blacklist_modules@,${pfx_build_mod})
41
41
pf4_build_mod := $(filter-out @blacklist_modules@,${pf4_build_mod})
42
42
pf6_build_mod := $(filter-out @blacklist_modules@,${pf6_build_mod})
75
75
distclean: clean
76
76
        rm -f .*.d .*.dd;
77
77
 
78
 
init%.o: ${srcdir}/init%.c
 
78
init%.o: init%.c
79
79
        ${AM_VERBOSE_CC} ${CC} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=$*_init ${CFLAGS} -o $@ -c $<;
80
80
 
81
81
-include .*.d
166
166
                        cat "$$f"; \
167
167
                        continue; \
168
168
                fi; \
169
 
                f="${srcdir}/libipt_$$ext.man"; \
170
 
                if [ -f "$$f" ]; then \
171
 
                        echo ".SS $$ext"; \
172
 
                        cat "$$f"; \
173
 
                        continue; \
174
 
                fi; \
175
 
                f="${srcdir}/libip6t_$$ext.man"; \
 
169
                f="${srcdir}/lib$(2)t_$$ext.man"; \
176
170
                if [ -f "$$f" ]; then \
177
171
                        echo ".SS $$ext"; \
178
172
                        cat "$$f"; \
181
175
        done >$@;
182
176
 
183
177
matches4.man: .initext4.dd $(wildcard ${srcdir}/lib*.man)
184
 
        $(call man_run,$(call ex_matches,${pfx_build_mod} ${pf4_build_mod}))
 
178
        $(call man_run,$(call ex_matches,${pfx_build_mod} ${pf4_build_mod}),ip)
185
179
 
186
180
matches6.man: .initext6.dd $(wildcard ${srcdir}/lib*.man)
187
 
        $(call man_run,$(call ex_matches,${pfx_build_mod} ${pf6_build_mod}))
 
181
        $(call man_run,$(call ex_matches,${pfx_build_mod} ${pf6_build_mod}),ip6)
188
182
 
189
183
targets4.man: .initext4.dd $(wildcard ${srcdir}/lib*.man)
190
 
        $(call man_run,$(call ex_targets,${pfx_build_mod} ${pf4_build_mod}))
 
184
        $(call man_run,$(call ex_targets,${pfx_build_mod} ${pf4_build_mod}),ip)
191
185
 
192
186
targets6.man: .initext6.dd $(wildcard ${srcdir}/lib*.man)
193
 
        $(call man_run,$(call ex_targets,${pfx_build_mod} ${pf6_build_mod}))
 
187
        $(call man_run,$(call ex_targets,${pfx_build_mod} ${pf6_build_mod}),ip6)