← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/iptables/oneiric

« back to all changes in this revision

Viewing changes to .pc/9000-howtos.patch/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Jamie Strandboge, Lorenzo De Liso, Jamie Strandboge
  • Date: 2010-11-12 15:58:40 UTC
  • mfrom: (5.1.8 upstream) (2.1.11 sid)
  • Revision ID: james.westby@ubuntu.com-20101112155840-jm07l9o9722h0bvm
Tags: 1.4.10-1ubuntu1
https://launchpad.net/bugs/671652
[ Lorenzo De Liso ]
* Merge from debian unstable (LP: #671652), remaining changes:
  - Don't fail to run iptables-save if iptables module isn't loaded.
  - Revert changes between 1.4.1.1-3 and 1.4.1.1-4, thus bringing back
    the howtos.
  - Added linuxdoc-tools to Build-Depends
  - Modified debian/iptables{,-dev}.install to match DM syntax
    (removed debian/tmp)
  - Added -fno-strict-aliasing -Werror switches to regular_CFLAGS
    for catching errors early
  - Removed unused TC_NUM_RULES() and TC_GET_RULE()
* debian/patches/03-compilation-error.patch: updated
* debian/patches/0600-makefile_jedi_handwaving.patch: updated
* Dropped changes:
  - debian/patches/0902-docs-version-reference.diff: modifies files inside
    the debian/ directory and hence is not needed

[ Jamie Strandboge ]
* debian/patches/9000-howtos.patch:
  - combine 0102-howtos.patch and 0103-sgml_errors.patch into this patch
    and apply after the Debian patches for easier maintenance
  - add DEP-3 comments
* debian/patches/9001-build-libipq_pic.la.patch:
  - Build libipq_pic.la with -fPIC
  - add DEP-3 comments
* debian/iptables-dev.install: install lib/*.la in usr/lib
* merge debian/patches/9002-xt_recent-reap.patch:
  - support for the xt_recent filter --reap switch (refreshed and updated)
  - add DEP-3 comments
* debian/patches/9003-compilation-error.patch:
  - renamed 03-compilation-error.patch as 9003-compilation-error.patch
  - apply after Debian patches for easier maintenance
  - add DEP-3 comments
* debian/iptables.doc-base.{nat|packet-filter}: update for 2.6
* Dropped changes:
  - Replaced ipt_DSCP.h by xpt_DSCP.h in ipt_ECN.h and ipt_echn.h (applied
    upstream)
  - 9001-build-libipq_pic.a.patch (using la instead)

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/9000-howtos.patch/Makefile.am
 
1
# -*- Makefile -*-
 
2
 
 
3
ACLOCAL_AMFLAGS  = -I m4
 
4
AUTOMAKE_OPTIONS = foreign subdir-objects
 
5
 
 
6
AM_CFLAGS        = ${regular_CFLAGS} -I${top_builddir}/include -I${top_srcdir}/include ${kinclude_CFLAGS}
 
7
SUBDIRS          = extensions
 
8
if ENABLE_DEVEL
 
9
SUBDIRS         += include
 
10
endif
 
11
if ENABLE_LIBIPQ
 
12
SUBDIRS         += libipq
 
13
endif
 
14
if HAVE_LIBNFNETLINK
 
15
SUBDIRS         += utils
 
16
endif
 
17
lib_LTLIBRARIES =
 
18
 
 
19
# libiptc
 
20
lib_LTLIBRARIES           += libiptc/libip4tc.la libiptc/libip6tc.la libiptc/libiptc.la
 
21
libiptc_libiptc_la_SOURCES  =
 
22
libiptc_libiptc_la_LIBADD   = libiptc/libip4tc.la libiptc/libip6tc.la
 
23
libiptc_libiptc_la_LDFLAGS  = -version-info 0:0:0 ${libiptc_LDFLAGS2}
 
24
libiptc_libip4tc_la_SOURCES = libiptc/libip4tc.c
 
25
libiptc_libip4tc_la_LDFLAGS = -version-info 0:0:0
 
26
libiptc_libip6tc_la_SOURCES = libiptc/libip6tc.c
 
27
libiptc_libip6tc_la_LDFLAGS = -version-info 0:0:0 ${libiptc_LDFLAGS2}
 
28
 
 
29
lib_LTLIBRARIES      += libxtables.la
 
30
libxtables_la_SOURCES = xtables.c
 
31
libxtables_la_LDFLAGS = -version-info ${libxtables_vcurrent}:0:${libxtables_vage}
 
32
if ENABLE_SHARED
 
33
libxtables_la_CFLAGS  = ${AM_CFLAGS}
 
34
libxtables_la_LIBADD  = -ldl
 
35
else
 
36
libxtables_la_CFLAGS  = ${AM_CFLAGS} -DNO_SHARED_LIBS=1
 
37
libxtables_la_LIBADD  =
 
38
endif
 
39
 
 
40
iptables_multi_SOURCES    = iptables-multi.c iptables-save.c \
 
41
                            iptables-restore.c iptables-xml.c \
 
42
                            iptables-standalone.c iptables.c xshared.c
 
43
iptables_multi_CFLAGS     = ${AM_CFLAGS} -DIPTABLES_MULTI
 
44
if ENABLE_STATIC
 
45
iptables_multi_CFLAGS    += -DALL_INCLUSIVE
 
46
endif
 
47
iptables_multi_LDFLAGS    = -rdynamic
 
48
iptables_multi_LDADD      = libiptc/libip4tc.la extensions/libext4.a libxtables.la -lm
 
49
 
 
50
ip6tables_multi_SOURCES   = ip6tables-multi.c ip6tables-save.c \
 
51
                            ip6tables-restore.c ip6tables-standalone.c \
 
52
                            ip6tables.c xshared.c
 
53
ip6tables_multi_CFLAGS    = ${AM_CFLAGS} -DIPTABLES_MULTI
 
54
if ENABLE_STATIC
 
55
ip6tables_multi_CFLAGS   += -DALL_INCLUSIVE
 
56
endif
 
57
ip6tables_multi_LDFLAGS   = -rdynamic
 
58
ip6tables_multi_LDADD     = libiptc/libip6tc.la extensions/libext6.a libxtables.la -lm
 
59
 
 
60
sbin_PROGRAMS    =
 
61
man_MANS         = iptables.8 iptables-restore.8 iptables-save.8 \
 
62
                   iptables-xml.8 ip6tables.8 ip6tables-restore.8 \
 
63
                   ip6tables-save.8
 
64
CLEANFILES       = iptables.8 ip6tables.8
 
65
 
 
66
if ENABLE_IPV4
 
67
sbin_PROGRAMS += iptables-multi
 
68
v4_bin_links   = iptables-xml
 
69
v4_sbin_links  = iptables iptables-restore iptables-save
 
70
endif
 
71
if ENABLE_IPV6
 
72
sbin_PROGRAMS += ip6tables-multi
 
73
v6_sbin_links  = ip6tables ip6tables-restore ip6tables-save
 
74
endif
 
75
 
 
76
iptables.8: ${srcdir}/iptables.8.in extensions/matches4.man extensions/targets4.man
 
77
        ${AM_VERBOSE_GEN} sed -e 's/@PACKAGE_AND_VERSION@/${PACKAGE} ${PACKAGE_VERSION}/g' -e '/@MATCH@/ r extensions/matches4.man' -e '/@TARGET@/ r extensions/targets4.man' $< >$@;
 
78
 
 
79
ip6tables.8: ${srcdir}/ip6tables.8.in extensions/matches6.man extensions/targets6.man
 
80
        ${AM_VERBOSE_GEN} sed -e 's/@PACKAGE_AND_VERSION@/${PACKAGE} ${PACKAGE_VERSION}/g' -e '/@MATCH@/ r extensions/matches6.man' -e '/@TARGET@/ r extensions/targets6.man' $< >$@;
 
81
 
 
82
pkgconfig_DATA = libiptc.pc xtables.pc
 
83
 
 
84
.PHONY: tarball
 
85
tarball:
 
86
        rm -Rf /tmp/${PACKAGE_TARNAME}-${PACKAGE_VERSION};
 
87
        pushd ${top_srcdir} && git archive --prefix=${PACKAGE_TARNAME}-${PACKAGE_VERSION}/ HEAD | tar -C /tmp -x && popd;
 
88
        pushd /tmp/${PACKAGE_TARNAME}-${PACKAGE_VERSION} && ./autogen.sh && popd;
 
89
        tar -C /tmp -cjf ${PACKAGE_TARNAME}-${PACKAGE_VERSION}.tar.bz2 --owner=root --group=root ${PACKAGE_TARNAME}-${PACKAGE_VERSION}/;
 
90
        rm -Rf /tmp/${PACKAGE_TARNAME}-${PACKAGE_VERSION};
 
91
 
 
92
config.status: extensions/GNUmakefile.in \
 
93
        include/xtables.h.in include/iptables/internal.h.in
 
94
 
 
95
# Using if..fi avoids an ugly "error (ignored)" message :)
 
96
install-exec-hook:
 
97
        -if test -z "${DESTDIR}"; then /sbin/ldconfig; fi;
 
98
        ${INSTALL} -dm0755 "${DESTDIR}${bindir}";
 
99
        for i in ${v4_bin_links}; do ${LN_S} -f "${sbindir}/iptables-multi" "${DESTDIR}${bindir}/$$i"; done;
 
100
        for i in ${v4_sbin_links}; do ${LN_S} -f iptables-multi "${DESTDIR}${sbindir}/$$i"; done;
 
101
        for i in ${v6_sbin_links}; do ${LN_S} -f ip6tables-multi "${DESTDIR}${sbindir}/$$i"; done;
 
102
 
 
103
test check:
 
104
        echo "Are we on the air? Hello, Mom!"
 
105