Annotation of /trunk/iptables/patches-1.3.3/install_all_dev_files.patch-1.3.1
Parent Directory | Revision Log
Revision 144 -
(hide annotations)
(download)
Tue May 8 20:06:05 2007 UTC (17 years, 4 months ago) by niro
File size: 3267 byte(s)
Tue May 8 20:06:05 2007 UTC (17 years, 4 months ago) by niro
File size: 3267 byte(s)
-import
1 | niro | 144 | diff -Nuar --exclude=Makefile.orig iptables-1.3.1.old/Makefile iptables-1.3.1/Makefile |
2 | --- iptables-1.3.1.old/Makefile 2005-03-08 21:48:15.000000000 -0800 | ||
3 | +++ iptables-1.3.1/Makefile 2005-03-08 21:58:13.771709158 -0800 | ||
4 | @@ -38,8 +38,10 @@ | ||
5 | CFLAGS += -DNO_SHARED_LIBS=1 | ||
6 | endif | ||
7 | |||
8 | -EXTRAS+=iptables iptables.o iptables.8 | ||
9 | +EXTRAS+=iptables iptables.o iptables.8 libiptables.a | ||
10 | EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/iptables $(DESTDIR)$(MANDIR)/man8/iptables.8 | ||
11 | +DEVEL_HEADERS+=include/iptables.h include/iptables_common.h | ||
12 | +DEVEL_LIBS+=libiptables.a | ||
13 | |||
14 | # No longer experimental. | ||
15 | ifneq ($(DO_MULTI), 1) | ||
16 | @@ -48,10 +50,12 @@ | ||
17 | EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/iptables-save $(DESTDIR)$(BINDIR)/iptables-restore $(DESTDIR)$(MANDIR)/man8/iptables-restore.8 $(DESTDIR)$(MANDIR)/man8/iptables-save.8 | ||
18 | |||
19 | ifeq ($(DO_IPV6), 1) | ||
20 | -EXTRAS+=ip6tables ip6tables.o ip6tables.8 | ||
21 | +EXTRAS+=ip6tables ip6tables.o ip6tables.8 libip6tables.a | ||
22 | EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/ip6tables $(DESTDIR)$(MANDIR)/man8/ip6tables.8 | ||
23 | EXTRAS+=ip6tables-save ip6tables-restore | ||
24 | EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/ip6tables-save $(DESTDIR)$(BINDIR)/ip6tables-restore # $(DESTDIR)$(MANDIR)/man8/iptables-restore.8 $(DESTDIR)$(MANDIR)/man8/iptables-save.8 $(DESTDIR)$(MANDIR)/man8/ip6tables-save.8 $(DESTDIR)$(MANDIR)/man8/ip6tables-restore.8 | ||
25 | +DEVEL_HEADERS+=include/ip6tables.h | ||
26 | +DEVEL_LIBS+=libip6tables.a | ||
27 | endif | ||
28 | |||
29 | # Sparc64 hack | ||
30 | @@ -113,6 +117,8 @@ | ||
31 | print-extensions: | ||
32 | @[ -n "$(OPTIONALS)" ] && echo Extensions found: $(OPTIONALS) | ||
33 | |||
34 | +libiptables.a: libiptables.a(iptables.o) | ||
35 | + | ||
36 | iptables.o: iptables.c | ||
37 | $(CC) $(CFLAGS) -DIPT_LIB_DIR=\"$(IPT_LIBDIR)\" -c -o $@ $< | ||
38 | |||
39 | @@ -154,6 +160,8 @@ | ||
40 | cp $< $@ | ||
41 | endif | ||
42 | |||
43 | +libip6tables.a: libip6tables.a(ip6tables.o) | ||
44 | + | ||
45 | ip6tables.o: ip6tables.c | ||
46 | $(CC) $(CFLAGS) -DIP6T_LIB_DIR=\"$(IPT_LIBDIR)\" -c -o $@ $< | ||
47 | |||
48 | @@ -202,7 +210,7 @@ | ||
49 | .PHONY: install-devel-headers | ||
50 | install-devel-headers: $(DEVEL_HEADERS) | ||
51 | @[ -d $(DESTDIR)$(INCDIR) ] || mkdir -p $(DESTDIR)$(INCDIR) | ||
52 | - @cp -v $(DEVEL_HEADERS) $(DESTDIR)$(INCDIR) | ||
53 | + @cp -v --parents $(DEVEL_HEADERS) `echo $(DESTDIR)$(INCDIR) | sed -e "s:/include/\?::"` | ||
54 | |||
55 | .PHONY: install-devel-libs | ||
56 | install-devel-libs: $(DEVEL_LIBS) | ||
57 | diff -Nuar --exclude=Makefile.orig iptables-1.3.1.old/libipq/Makefile iptables-1.3.1/libipq/Makefile | ||
58 | --- iptables-1.3.1.old/libipq/Makefile 2004-10-10 02:56:23.000000000 -0700 | ||
59 | +++ iptables-1.3.1/libipq/Makefile 2005-03-08 21:56:14.162427845 -0800 | ||
60 | @@ -17,7 +17,7 @@ | ||
61 | |||
62 | DEVEL_LIBS+=libipq/libipq.a | ||
63 | |||
64 | -DEVEL_HEADERS+=include/libipq/libipq.h | ||
65 | +DEVEL_HEADERS+=include/libipq/libipq.h include/libipq/ip_queue_64.h | ||
66 | |||
67 | ifndef TOPLEVEL_INCLUDED | ||
68 | local: | ||
69 | diff -Nuar --exclude=Makefile.orig iptables-1.3.1.old/libiptc/Makefile iptables-1.3.1/libiptc/Makefile | ||
70 | --- iptables-1.3.1.old/libiptc/Makefile 2004-10-10 02:56:24.000000000 -0700 | ||
71 | +++ iptables-1.3.1/libiptc/Makefile 2005-03-08 21:56:14.163427722 -0800 | ||
72 | @@ -16,8 +16,11 @@ | ||
73 | ifeq ($(DO_IPV6), 1) | ||
74 | EXTRA_DEPENDS+= libiptc/libip6tc.d | ||
75 | libiptc/libiptc.a: libiptc/libiptc.a(libiptc/libip6tc.o) | ||
76 | +DEVEL_HEADERS+=include/libiptc/libip6tc.h | ||
77 | endif | ||
78 | |||
79 | +DEVEL_HEADERS+=include/libiptc/libiptc.h include/libiptc/ipt_kernel_headers.h | ||
80 | + | ||
81 | libiptc/libip4tc.d libiptc/libip6tc.d: %.d: %.c | ||
82 | @-$(CC) -M -MG $(CFLAGS) $< | sed -e 's@^.*\.o:@$*.d libiptc/libiptc.a($*.o):@' > $@ | ||
83 | endif |