OpenWrt – Diff between revs 2 and 3

Subversion Repositories:

?pathlinks?

Rev 2 – Details – Blame – Last modification – View Log

 Debian-specific modifications to the upstream Makefile.in to
 build a shared library.
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -40,6 +40,13 @@ mandir = @mandir@
+@@ -38,6 +38,13 @@ mandir = @mandir@
  srcdir = @srcdir@
  VPATH = @srcdir@
 +SHAREDLIB=$(SOLIBRARY).$(LIBVERSION)
++
+ #
  # You shouldn't need to edit anything below.
+ #
-@@ -69,7 +76,8 @@ INSTALL_RPCAPD=@INSTALL_RPCAPD@
+@@ -62,7 +69,8 @@ DEPENDENCY_CFLAG = @DEPENDENCY_CFLAG@
- EXTRA_NETWORK_LIBS=@EXTRA_NETWORK_LIBS@
+ PROG=libpcap
- # Standard CFLAGS for building members of a shared library
+ # Standard CFLAGS
--FULL_CFLAGS = $(CCOPT) $(SHLIB_CCOPT) $(INCLS) $(DEFS) $(CFLAGS)
+-FULL_CFLAGS = $(CCOPT) $(INCLS) $(DEFS) $(CFLAGS)
-+FULL_CFLAGS = $(CCOPT) $(SHLIB_CCOPT) $(INCLS) $(DEFS) $(CFLAGS) $(CPPFLAGS)
++FULL_CFLAGS = $(CCOPT) $(INCLS) $(DEFS) $(CFLAGS) $(CPPFLAGS)
 +CFLAGS_SHARED = -shared -Wl,-soname,$(SHAREDLIB)
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -84,7 +92,11 @@ YACC = @YACC@
+@@ -77,7 +85,11 @@ YACC = @YACC@
  # problem if you don't own the file but can write to the directory.
  .c.o:
  	@rm -f $@
 -	$(CC) $(FULL_CFLAGS) -c $(srcdir)/$*.c
 +	$(CC) $(FULL_CFLAGS) -c -o $@ $(srcdir)/$*.c
++
 +%_pic.o: %.c %.o
 +	@rm -f $@
 +	$(CC) -fPIC $(FULL_CFLAGS) -c -o $@ $(srcdir)/$*.c
- PSRC =	pcap-@V_PCAP@.c @USB_SRC@ @BT_SRC@ @BT_MONITOR_SRC@ @NETFILTER_SRC@ @DBUS_SRC@ @NETMAP_SRC@ @RDMA_SRC@
+ PSRC =	pcap-@V_PCAP@.c @USB_SRC@ @BT_SRC@ @BT_MONITOR_SRC@ @NETFILTER_SRC@ @DBUS_SRC@
  FSRC =  @V_FINDALLDEVS@
-@@ -101,6 +113,7 @@ SRC =	$(PSRC) $(FSRC) $(CSRC) $(SSRC) $(
+@@ -93,6 +105,7 @@ SRC =	$(PSRC) $(FSRC) $(CSRC) $(SSRC) $(
  # We would like to say "OBJ = $(SRC:.c=.o)" but Ultrix's make cannot
  # hack the extra indirection
  OBJ =	$(PSRC:.c=.o) $(FSRC:.c=.o) $(CSRC:.c=.o) $(SSRC:.c=.o) $(GENSRC:.c=.o) $(LIBOBJS)
 +OBJ_PIC = $(PSRC:.c=_pic.o) $(FSRC:.c=_pic.o) $(CSRC:.c=_pic.o) $(SSRC:.c=_pic.o) $(GENSRC:.c=_pic.o)
  PUBHDR = \
  	pcap.h \
  	pcap-bpf.h \
-@@ -154,7 +167,7 @@ TAGFILES = \
+@@ -157,7 +170,7 @@ TAGFILES = \
- CLEANFILES = $(OBJ) libpcap.a libpcap.so.`cat $(srcdir)/VERSION` \
+ CLEANFILES = $(OBJ) libpcap.* $(TESTS) \
  	$(PROG)-`cat $(srcdir)/VERSION`.tar.gz $(GENSRC) $(GENHDR) \
--	lex.yy.c pcap-config libpcap.pc
+-	lex.yy.c pcap-config
-+	lex.yy.c pcap-config libpcap.pc $(OBJ_PIC)
++	lex.yy.c pcap-config $(OBJ_PIC)
  MAN1 = pcap-config.1
-@@ -386,7 +399,7 @@ libpcap.a: $(OBJ)
+@@ -365,7 +378,7 @@ libpcap.a: $(OBJ)
  	$(AR) rc $@ $(OBJ) $(ADDLARCHIVEOBJS)
  	$(RANLIB) $@
 -shared: libpcap.$(DYEXT)
 +shared: $(SHAREDLIB)
 +	ln -s $(SHAREDLIB) $(SOLIBRARY)
++
  scanner.c: $(srcdir)/scanner.l
  	$(LEX) -P pcap_ --header-file=scanner.h --nounput -o scanner.c $<
  scanner.h: scanner.c
-@@ -474,6 +493,9 @@ scanner.h: scanner.c
+@@ -455,6 +474,9 @@ scanner.h: scanner.c
  scanner.o: scanner.c grammar.h
  	$(CC) $(FULL_CFLAGS) -c scanner.c
 +scanner_pic.o: scanner.c grammar.h
 +	$(CC) -fPIC $(FULL_CFLAGS) -o $@ -c scanner.c
-+
- grammar.c: $(srcdir)/grammar.y
- 	$(YACC) -p pcap_ -o grammar.c -d $<
- grammar.h: grammar.c
-@@ -486,6 +508,9 @@ grammar.h: grammar.c
++
- grammar.o: grammar.c scanner.h
- 	$(CC) $(FULL_CFLAGS) -c grammar.c
+ pcap.o: pcap_version.h
-+grammar_pic.o: grammar.c scanner.h
-+	$(CC) -fPIC $(FULL_CFLAGS) -o $@ -c grammar.c
+ grammar.c: $(srcdir)/grammar.y
@@ -472,9 +494,16 @@ grammar.o: grammar.c
+ gencode.o: $(srcdir)/gencode.c grammar.h scanner.h
+ 	$(CC) $(FULL_CFLAGS) -c $(srcdir)/gencode.c
++grammar_pic.o: grammar.c
++	@rm -f $@
++	$(CC) -fPIC $(FULL_CFLAGS) -Dyylval=pcap_lval -o $@ -c grammar.c
++
+ version.o: version.c
+ 	$(CC) $(FULL_CFLAGS) -c version.c
++version_pic.o: version.c
++	$(CC) -fPIC $(FULL_CFLAGS) -c version.c -o $@
++
- gencode.o: $(srcdir)/gencode.c grammar.h scanner.h
+ snprintf.o: $(srcdir)/missing/snprintf.c
- 	$(CC) $(FULL_CFLAGS) -c $(srcdir)/gencode.c
+ 	$(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c
-@@ -524,6 +549,9 @@ pcap-config: $(srcdir)/pcap-config.in ./
+@@ -501,6 +530,9 @@ bpf_filter.c: $(srcdir)/bpf/net/bpf_filt
- 	mv $@.tmp $@
+ bpf_filter.o: bpf_filter.c
- 	chmod a+x $@
+ 	$(CC) $(FULL_CFLAGS) -c bpf_filter.c
 +bpf_filter_pic.o: bpf_filter.c
 +	$(CC) -fPIC $(FULL_CFLAGS) -c bpf_filter.c -o $@
 +
+ #
- # Remote pcap daemon.
+ # Generate the pcap-config script.
+ #
-@@ -614,14 +642,11 @@ install: install-shared install-archive
+@@ -623,14 +655,11 @@ install: install-shared install-archive
  install-shared-dylib: libpcap.dylib
  	[ -d $(DESTDIR)$(libdir) ] || \
  	    (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
 --- a/aclocal.m4
 +++ b/aclocal.m4
-@@ -507,7 +507,7 @@ AC_DEFUN(AC_LBL_SHLIBS_INIT,
+@@ -470,7 +470,7 @@ AC_DEFUN(AC_LBL_SHLIBS_INIT,
  			esac
  			;;
  		    esac
--		    V_SHLIB_CCOPT="$V_SHLIB_CCOPT $PIC_OPT"
+-		    V_CCOPT="$V_CCOPT $PIC_OPT"
-+		    V_SHLIB_CCOPT="$V_SHLIB_CCOPT"
++		    V_CCOPT="$V_CCOPT"
  		    V_SONAME_OPT="-Wl,-soname,"
  		    V_RPATH_OPT="-Wl,-rpath,"
  		    ;;
-@@ -570,7 +570,7 @@ AC_DEFUN(AC_LBL_SHLIBS_INIT,
+@@ -533,7 +533,7 @@ AC_DEFUN(AC_LBL_SHLIBS_INIT,
+ 		    #
  		    # "cc" is GCC.
+ 		    #
--		    V_SHLIB_CCOPT="$V_SHLIB_CCOPT -fpic"
+-		    V_CCOPT="$V_CCOPT -fpic"
-+		    V_SHLIB_CCOPT="$V_SHLIB_CCOPT"
++		    V_CCOPT="$V_CCOPT"
  		    V_SHLIB_CMD="\$(CC)"
  		    V_SHLIB_OPT="-shared"
  		    V_SONAME_OPT="-Wl,-soname,"
 --- a/pcap-config.in
 +++ b/pcap-config.in
-@@ -41,16 +41,6 @@ do
+@@ -36,16 +36,6 @@ do
  	esac
  	shift
  done
 -if [ "$V_RPATH_OPT" != "" ]
 -then