Contents of /trunk/iptables/patches/iptables-1.4.0-install-all-dev-files.patch
Parent Directory | Revision Log
Revision 549 -
(show annotations)
(download)
Thu Mar 27 11:03:18 2008 UTC (16 years, 1 month ago) by niro
File size: 3213 byte(s)
Thu Mar 27 11:03:18 2008 UTC (16 years, 1 month ago) by niro
File size: 3213 byte(s)
-rediffed patches and cleand directory weirdyness
1 | diff -Naur iptables-1.4.0/libipq/Makefile iptables-1.4.0-magellan/libipq/Makefile |
2 | --- iptables-1.4.0/libipq/Makefile 2007-01-23 13:49:50.000000000 +0100 |
3 | +++ iptables-1.4.0-magellan/libipq/Makefile 2008-03-27 11:58:36.000000000 +0100 |
4 | @@ -17,7 +17,7 @@ |
5 | |
6 | DEVEL_LIBS+=libipq/libipq.a |
7 | |
8 | -DEVEL_HEADERS+=include/libipq/libipq.h |
9 | +DEVEL_HEADERS+=include/libipq/libipq.h include/libipq/ip_queue_64.h |
10 | |
11 | ifndef TOPLEVEL_INCLUDED |
12 | local: |
13 | diff -Naur iptables-1.4.0/libiptc/Makefile iptables-1.4.0-magellan/libiptc/Makefile |
14 | --- iptables-1.4.0/libiptc/Makefile 2007-01-23 13:49:53.000000000 +0100 |
15 | +++ iptables-1.4.0-magellan/libiptc/Makefile 2008-03-27 12:00:36.000000000 +0100 |
16 | @@ -17,8 +17,11 @@ |
17 | ifeq ($(DO_IPV6), 1) |
18 | EXTRA_DEPENDS+= libiptc/libip6tc.d |
19 | libiptc/libiptc.a: libiptc/libiptc.a(libiptc/libip6tc.o) |
20 | +DEVEL_HEADERS+=include/libiptc/libip6tc.h |
21 | endif |
22 | |
23 | +DEVEL_HEADERS+=include/libiptc/libiptc.h include/libiptc/ipt_kernel_headers.h |
24 | + |
25 | libiptc/libip4tc.d libiptc/libip6tc.d: %.d: %.c |
26 | @-$(CC) -M -MG $(CFLAGS) $< | sed -e 's@^.*\.o:@$*.d libiptc/libiptc.a($*.o):@' > $@ |
27 | endif |
28 | diff -Naur iptables-1.4.0/Makefile iptables-1.4.0-magellan/Makefile |
29 | --- iptables-1.4.0/Makefile 2007-12-22 13:44:46.000000000 +0100 |
30 | +++ iptables-1.4.0-magellan/Makefile 2008-03-27 11:58:00.000000000 +0100 |
31 | @@ -49,8 +49,10 @@ |
32 | CFLAGS += -DNO_SHARED_LIBS=1 |
33 | endif |
34 | |
35 | -EXTRAS+=iptables iptables.o iptables.8 |
36 | +EXTRAS+=iptables iptables.o iptables.8 libiptables.a |
37 | EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/iptables $(DESTDIR)$(MANDIR)/man8/iptables.8 |
38 | +DEVEL_HEADERS+=include/iptables.h include/iptables_common.h |
39 | +DEVEL_LIBS+=libiptables.a |
40 | |
41 | # No longer experimental. |
42 | ifneq ($(DO_MULTI), 1) |
43 | @@ -59,7 +61,7 @@ |
44 | EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/iptables-save $(DESTDIR)$(BINDIR)/iptables-restore $(DESTDIR)$(BINDIR)/iptables-xml $(DESTDIR)$(MANDIR)/man8/iptables-restore.8 $(DESTDIR)$(MANDIR)/man8/iptables-save.8 |
45 | |
46 | ifeq ($(DO_IPV6), 1) |
47 | -EXTRAS+=ip6tables ip6tables.o ip6tables.8 |
48 | +EXTRAS+=ip6tables ip6tables.o ip6tables.8 libip6tables.a |
49 | EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/ip6tables $(DESTDIR)$(MANDIR)/man8/ip6tables.8 |
50 | |
51 | ifneq ($(DO_MULTI), 1) |
52 | @@ -67,6 +69,8 @@ |
53 | endif |
54 | EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/ip6tables-save $(DESTDIR)$(BINDIR)/ip6tables-restore $(DESTDIR)$(MANDIR)/man8/ip6tables-save.8 $(DESTDIR)$(MANDIR)/man8/ip6tables-restore.8 |
55 | endif |
56 | +DEVEL_HEADERS+=include/ip6tables.h |
57 | +DEVEL_LIBS+=libip6tables.a |
58 | |
59 | ifndef IPT_LIBDIR |
60 | IPT_LIBDIR:=$(LIBDIR)/iptables |
61 | @@ -102,6 +106,8 @@ |
62 | print-extensions: |
63 | @[ -n "$(OPTIONALS)" ] && echo Extensions found: $(OPTIONALS) |
64 | |
65 | +libiptables.a: libiptables.a(iptables.o) |
66 | + |
67 | iptables.o: iptables.c |
68 | $(CC) $(CFLAGS) -DIPT_LIB_DIR=\"$(IPT_LIBDIR)\" -c -o $@ $< |
69 | |
70 | @@ -156,6 +162,8 @@ |
71 | cp $< $@ |
72 | endif |
73 | |
74 | +libip6tables.a: libip6tables.a(ip6tables.o) |
75 | + |
76 | ip6tables.o: ip6tables.c |
77 | $(CC) $(CFLAGS) -DIP6T_LIB_DIR=\"$(IPT_LIBDIR)\" -c -o $@ $< |
78 | |
79 | @@ -221,7 +229,7 @@ |
80 | .PHONY: install-devel-headers |
81 | install-devel-headers: $(DEVEL_HEADERS) |
82 | @[ -d $(DESTDIR)$(INCDIR) ] || mkdir -p $(DESTDIR)$(INCDIR) |
83 | - @cp -v $(DEVEL_HEADERS) $(DESTDIR)$(INCDIR) |
84 | + @cp -v --parents $(DEVEL_HEADERS) `echo $(DESTDIR)$(INCDIR) | sed -e "s:/include/\?::"` |
85 | |
86 | .PHONY: install-devel-libs |
87 | install-devel-libs: $(DEVEL_LIBS) |