OpenWrt – Diff between revs 2 and 3
?pathlinks?
Rev 2 | Rev 3 | |||
---|---|---|---|---|
Line 1... | Line 1... | |||
1 | Debian-specific modifications to the upstream Makefile.in to |
1 | Debian-specific modifications to the upstream Makefile.in to |
|
2 | build a shared library. |
2 | build a shared library. |
|
Line 3... | Line 3... | |||
3 | |
3 | |
|
4 | --- a/Makefile.in |
4 | --- a/Makefile.in |
|
5 | +++ b/Makefile.in |
5 | +++ b/Makefile.in |
|
6 | @@ -40,6 +40,13 @@ mandir = @mandir@ |
6 | @@ -38,6 +38,13 @@ mandir = @mandir@ |
|
7 | srcdir = @srcdir@ |
7 | srcdir = @srcdir@ |
|
Line 8... | Line 8... | |||
8 | VPATH = @srcdir@ |
8 | VPATH = @srcdir@ |
|
9 | |
9 | |
|
Line 15... | Line 15... | |||
15 | +SHAREDLIB=$(SOLIBRARY).$(LIBVERSION) |
15 | +SHAREDLIB=$(SOLIBRARY).$(LIBVERSION) |
|
16 | + |
16 | + |
|
17 | # |
17 | # |
|
18 | # You shouldn't need to edit anything below. |
18 | # You shouldn't need to edit anything below. |
|
19 | # |
19 | # |
|
20 | @@ -69,7 +76,8 @@ INSTALL_RPCAPD=@INSTALL_RPCAPD@ |
20 | @@ -62,7 +69,8 @@ DEPENDENCY_CFLAG = @DEPENDENCY_CFLAG@ |
|
21 | EXTRA_NETWORK_LIBS=@EXTRA_NETWORK_LIBS@ |
21 | PROG=libpcap |
|
Line 22... | Line 22... | |||
22 | |
22 | |
|
23 | # Standard CFLAGS for building members of a shared library |
23 | # Standard CFLAGS |
|
24 | -FULL_CFLAGS = $(CCOPT) $(SHLIB_CCOPT) $(INCLS) $(DEFS) $(CFLAGS) |
24 | -FULL_CFLAGS = $(CCOPT) $(INCLS) $(DEFS) $(CFLAGS) |
|
25 | +FULL_CFLAGS = $(CCOPT) $(SHLIB_CCOPT) $(INCLS) $(DEFS) $(CFLAGS) $(CPPFLAGS) |
25 | +FULL_CFLAGS = $(CCOPT) $(INCLS) $(DEFS) $(CFLAGS) $(CPPFLAGS) |
|
Line 26... | Line 26... | |||
26 | +CFLAGS_SHARED = -shared -Wl,-soname,$(SHAREDLIB) |
26 | +CFLAGS_SHARED = -shared -Wl,-soname,$(SHAREDLIB) |
|
27 | |
27 | |
|
28 | INSTALL = @INSTALL@ |
28 | INSTALL = @INSTALL@ |
|
29 | INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
29 | INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
|
30 | @@ -84,7 +92,11 @@ YACC = @YACC@ |
30 | @@ -77,7 +85,11 @@ YACC = @YACC@ |
|
31 | # problem if you don't own the file but can write to the directory. |
31 | # problem if you don't own the file but can write to the directory. |
|
32 | .c.o: |
32 | .c.o: |
|
33 | @rm -f $@ |
33 | @rm -f $@ |
|
34 | - $(CC) $(FULL_CFLAGS) -c $(srcdir)/$*.c |
34 | - $(CC) $(FULL_CFLAGS) -c $(srcdir)/$*.c |
|
35 | + $(CC) $(FULL_CFLAGS) -c -o $@ $(srcdir)/$*.c |
35 | + $(CC) $(FULL_CFLAGS) -c -o $@ $(srcdir)/$*.c |
|
36 | + |
36 | + |
|
37 | +%_pic.o: %.c %.o |
37 | +%_pic.o: %.c %.o |
|
Line 38... | Line 38... | |||
38 | + @rm -f $@ |
38 | + @rm -f $@ |
|
39 | + $(CC) -fPIC $(FULL_CFLAGS) -c -o $@ $(srcdir)/$*.c |
39 | + $(CC) -fPIC $(FULL_CFLAGS) -c -o $@ $(srcdir)/$*.c |
|
40 | |
40 | |
|
41 | PSRC = pcap-@V_PCAP@.c @USB_SRC@ @BT_SRC@ @BT_MONITOR_SRC@ @NETFILTER_SRC@ @DBUS_SRC@ @NETMAP_SRC@ @RDMA_SRC@ |
41 | PSRC = pcap-@V_PCAP@.c @USB_SRC@ @BT_SRC@ @BT_MONITOR_SRC@ @NETFILTER_SRC@ @DBUS_SRC@ |
|
42 | FSRC = @V_FINDALLDEVS@ |
42 | FSRC = @V_FINDALLDEVS@ |
|
43 | @@ -101,6 +113,7 @@ SRC = $(PSRC) $(FSRC) $(CSRC) $(SSRC) $( |
43 | @@ -93,6 +105,7 @@ SRC = $(PSRC) $(FSRC) $(CSRC) $(SSRC) $( |
|
44 | # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot |
44 | # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot |
|
45 | # hack the extra indirection |
45 | # hack the extra indirection |
|
46 | OBJ = $(PSRC:.c=.o) $(FSRC:.c=.o) $(CSRC:.c=.o) $(SSRC:.c=.o) $(GENSRC:.c=.o) $(LIBOBJS) |
46 | OBJ = $(PSRC:.c=.o) $(FSRC:.c=.o) $(CSRC:.c=.o) $(SSRC:.c=.o) $(GENSRC:.c=.o) $(LIBOBJS) |
|
47 | +OBJ_PIC = $(PSRC:.c=_pic.o) $(FSRC:.c=_pic.o) $(CSRC:.c=_pic.o) $(SSRC:.c=_pic.o) $(GENSRC:.c=_pic.o) |
47 | +OBJ_PIC = $(PSRC:.c=_pic.o) $(FSRC:.c=_pic.o) $(CSRC:.c=_pic.o) $(SSRC:.c=_pic.o) $(GENSRC:.c=_pic.o) |
|
48 | PUBHDR = \ |
48 | PUBHDR = \ |
|
Line 49... | Line 49... | |||
49 | pcap.h \ |
49 | pcap.h \ |
|
50 | pcap-bpf.h \ |
50 | pcap-bpf.h \ |
|
51 | @@ -154,7 +167,7 @@ TAGFILES = \ |
51 | @@ -157,7 +170,7 @@ TAGFILES = \ |
|
52 | |
52 | |
|
Line 53... | Line 53... | |||
53 | CLEANFILES = $(OBJ) libpcap.a libpcap.so.`cat $(srcdir)/VERSION` \ |
53 | CLEANFILES = $(OBJ) libpcap.* $(TESTS) \ |
|
Line 54... | Line 54... | |||
54 | $(PROG)-`cat $(srcdir)/VERSION`.tar.gz $(GENSRC) $(GENHDR) \ |
54 | $(PROG)-`cat $(srcdir)/VERSION`.tar.gz $(GENSRC) $(GENHDR) \ |
|
55 | - lex.yy.c pcap-config libpcap.pc |
55 | - lex.yy.c pcap-config |
|
56 | + lex.yy.c pcap-config libpcap.pc $(OBJ_PIC) |
56 | + lex.yy.c pcap-config $(OBJ_PIC) |
|
Line 57... | Line 57... | |||
57 | |
57 | |
|
58 | MAN1 = pcap-config.1 |
58 | MAN1 = pcap-config.1 |
|
Line 59... | Line 59... | |||
59 | |
59 | |
|
60 | @@ -386,7 +399,7 @@ libpcap.a: $(OBJ) |
60 | @@ -365,7 +378,7 @@ libpcap.a: $(OBJ) |
|
61 | $(AR) rc $@ $(OBJ) $(ADDLARCHIVEOBJS) |
61 | $(AR) rc $@ $(OBJ) $(ADDLARCHIVEOBJS) |
|
62 | $(RANLIB) $@ |
62 | $(RANLIB) $@ |
|
63 | |
63 | |
|
Line 64... | Line 64... | |||
64 | -shared: libpcap.$(DYEXT) |
64 | -shared: libpcap.$(DYEXT) |
|
65 | +shared: $(SHAREDLIB) |
65 | +shared: $(SHAREDLIB) |
|
Line 77... | Line 77... | |||
77 | + ln -s $(SHAREDLIB) $(SOLIBRARY) |
77 | + ln -s $(SHAREDLIB) $(SOLIBRARY) |
|
78 | + |
78 | + |
|
79 | scanner.c: $(srcdir)/scanner.l |
79 | scanner.c: $(srcdir)/scanner.l |
|
80 | $(LEX) -P pcap_ --header-file=scanner.h --nounput -o scanner.c $< |
80 | $(LEX) -P pcap_ --header-file=scanner.h --nounput -o scanner.c $< |
|
81 | scanner.h: scanner.c |
81 | scanner.h: scanner.c |
|
82 | @@ -474,6 +493,9 @@ scanner.h: scanner.c |
82 | @@ -455,6 +474,9 @@ scanner.h: scanner.c |
|
83 | scanner.o: scanner.c grammar.h |
83 | scanner.o: scanner.c grammar.h |
|
84 | $(CC) $(FULL_CFLAGS) -c scanner.c |
84 | $(CC) $(FULL_CFLAGS) -c scanner.c |
|
Line 85... | Line 85... | |||
85 | |
85 | |
|
86 | +scanner_pic.o: scanner.c grammar.h |
86 | +scanner_pic.o: scanner.c grammar.h |
|
87 | + $(CC) -fPIC $(FULL_CFLAGS) -o $@ -c scanner.c |
87 | + $(CC) -fPIC $(FULL_CFLAGS) -o $@ -c scanner.c |
|
88 | + |
- | ||
89 | grammar.c: $(srcdir)/grammar.y |
- | ||
90 | $(YACC) -p pcap_ -o grammar.c -d $< |
- | ||
91 | grammar.h: grammar.c |
- | ||
92 | @@ -486,6 +508,9 @@ grammar.h: grammar.c |
88 | + |
|
93 | grammar.o: grammar.c scanner.h |
- | ||
Line 94... | Line 89... | |||
94 | $(CC) $(FULL_CFLAGS) -c grammar.c |
89 | pcap.o: pcap_version.h |
|
95 | |
90 | |
|
96 | +grammar_pic.o: grammar.c scanner.h |
- | ||
97 | + $(CC) -fPIC $(FULL_CFLAGS) -o $@ -c grammar.c |
91 | grammar.c: $(srcdir)/grammar.y |
|
98 | + |
92 | @@ -472,9 +494,16 @@ grammar.o: grammar.c |
|
Line -... | Line 93... | |||
- | 93 | gencode.o: $(srcdir)/gencode.c grammar.h scanner.h |
||
- | 94 | $(CC) $(FULL_CFLAGS) -c $(srcdir)/gencode.c |
||
- | 95 | |
||
- | 96 | +grammar_pic.o: grammar.c |
||
- | 97 | + @rm -f $@ |
||
- | 98 | + $(CC) -fPIC $(FULL_CFLAGS) -Dyylval=pcap_lval -o $@ -c grammar.c |
||
- | 99 | + |
||
- | 100 | version.o: version.c |
||
- | 101 | $(CC) $(FULL_CFLAGS) -c version.c |
||
- | 102 | |
||
- | 103 | +version_pic.o: version.c |
||
- | 104 | + $(CC) -fPIC $(FULL_CFLAGS) -c version.c -o $@ |
||
- | 105 | + |
||
99 | gencode.o: $(srcdir)/gencode.c grammar.h scanner.h |
106 | snprintf.o: $(srcdir)/missing/snprintf.c |
|
100 | $(CC) $(FULL_CFLAGS) -c $(srcdir)/gencode.c |
107 | $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c |
|
101 | |
108 | |
|
Line 102... | Line 109... | |||
102 | @@ -524,6 +549,9 @@ pcap-config: $(srcdir)/pcap-config.in ./ |
109 | @@ -501,6 +530,9 @@ bpf_filter.c: $(srcdir)/bpf/net/bpf_filt |
|
103 | mv $@.tmp $@ |
110 | bpf_filter.o: bpf_filter.c |
|
104 | chmod a+x $@ |
111 | $(CC) $(FULL_CFLAGS) -c bpf_filter.c |
|
105 | |
112 | |
|
106 | +bpf_filter_pic.o: bpf_filter.c |
113 | +bpf_filter_pic.o: bpf_filter.c |
|
107 | + $(CC) -fPIC $(FULL_CFLAGS) -c bpf_filter.c -o $@ |
114 | + $(CC) -fPIC $(FULL_CFLAGS) -c bpf_filter.c -o $@ |
|
108 | + |
115 | + |
|
109 | # |
116 | # |
|
Line 110... | Line 117... | |||
110 | # Remote pcap daemon. |
117 | # Generate the pcap-config script. |
|
111 | # |
118 | # |
|
112 | @@ -614,14 +642,11 @@ install: install-shared install-archive |
119 | @@ -623,14 +655,11 @@ install: install-shared install-archive |
|
Line 127... | Line 134... | |||
127 | install-shared-dylib: libpcap.dylib |
134 | install-shared-dylib: libpcap.dylib |
|
128 | [ -d $(DESTDIR)$(libdir) ] || \ |
135 | [ -d $(DESTDIR)$(libdir) ] || \ |
|
129 | (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) |
136 | (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) |
|
130 | --- a/aclocal.m4 |
137 | --- a/aclocal.m4 |
|
131 | +++ b/aclocal.m4 |
138 | +++ b/aclocal.m4 |
|
132 | @@ -507,7 +507,7 @@ AC_DEFUN(AC_LBL_SHLIBS_INIT, |
139 | @@ -470,7 +470,7 @@ AC_DEFUN(AC_LBL_SHLIBS_INIT, |
|
133 | esac |
140 | esac |
|
134 | ;; |
141 | ;; |
|
135 | esac |
142 | esac |
|
136 | - V_SHLIB_CCOPT="$V_SHLIB_CCOPT $PIC_OPT" |
143 | - V_CCOPT="$V_CCOPT $PIC_OPT" |
|
137 | + V_SHLIB_CCOPT="$V_SHLIB_CCOPT" |
144 | + V_CCOPT="$V_CCOPT" |
|
138 | V_SONAME_OPT="-Wl,-soname," |
145 | V_SONAME_OPT="-Wl,-soname," |
|
139 | V_RPATH_OPT="-Wl,-rpath," |
146 | V_RPATH_OPT="-Wl,-rpath," |
|
140 | ;; |
147 | ;; |
|
141 | @@ -570,7 +570,7 @@ AC_DEFUN(AC_LBL_SHLIBS_INIT, |
148 | @@ -533,7 +533,7 @@ AC_DEFUN(AC_LBL_SHLIBS_INIT, |
|
142 | # |
149 | # |
|
143 | # "cc" is GCC. |
150 | # "cc" is GCC. |
|
144 | # |
151 | # |
|
145 | - V_SHLIB_CCOPT="$V_SHLIB_CCOPT -fpic" |
152 | - V_CCOPT="$V_CCOPT -fpic" |
|
146 | + V_SHLIB_CCOPT="$V_SHLIB_CCOPT" |
153 | + V_CCOPT="$V_CCOPT" |
|
147 | V_SHLIB_CMD="\$(CC)" |
154 | V_SHLIB_CMD="\$(CC)" |
|
148 | V_SHLIB_OPT="-shared" |
155 | V_SHLIB_OPT="-shared" |
|
149 | V_SONAME_OPT="-Wl,-soname," |
156 | V_SONAME_OPT="-Wl,-soname," |
|
150 | --- a/pcap-config.in |
157 | --- a/pcap-config.in |
|
151 | +++ b/pcap-config.in |
158 | +++ b/pcap-config.in |
|
152 | @@ -41,16 +41,6 @@ do |
159 | @@ -36,16 +36,6 @@ do |
|
153 | esac |
160 | esac |
|
154 | shift |
161 | shift |
|
155 | done |
162 | done |
|
156 | -if [ "$V_RPATH_OPT" != "" ] |
163 | -if [ "$V_RPATH_OPT" != "" ] |
|
157 | -then |
164 | -then |