mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-30 18:59:44 +02:00
228d1c4df2
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33657 3c298f89-4303-0410-b956-a3cf2f4a3e73
179 lines
5.1 KiB
Diff
179 lines
5.1 KiB
Diff
Debian-specific modifications to the upstream Makefile.in to
|
|
build a shared library.
|
|
---
|
|
Makefile.in | 45 ++++++++++++++++++++++++++++++++++++++++++---
|
|
configure | 2 +-
|
|
configure.in | 2 +-
|
|
3 files changed, 44 insertions(+), 5 deletions(-)
|
|
|
|
--- a/Makefile.in
|
|
+++ b/Makefile.in
|
|
@@ -40,6 +40,14 @@ mandir = @mandir@
|
|
srcdir = @srcdir@
|
|
VPATH = @srcdir@
|
|
|
|
+# some defines for shared library compilation
|
|
+MAJ=1.1
|
|
+LIBVERSION=$(MAJ).1
|
|
+LIBNAME=pcap
|
|
+LIBRARY=lib$(LIBNAME).a
|
|
+SOLIBRARY=lib$(LIBNAME).so
|
|
+SHAREDLIB=$(SOLIBRARY).$(LIBVERSION)
|
|
+
|
|
#
|
|
# You shouldn't need to edit anything below.
|
|
#
|
|
@@ -59,6 +67,7 @@ PROG=libpcap
|
|
|
|
# Standard CFLAGS
|
|
CFLAGS = $(CCOPT) $(INCLS) $(DEFS)
|
|
+CFLAGS_SHARED = -shared -Wl,-soname,$(SOLIBRARY).$(MAJ)
|
|
|
|
INSTALL = @INSTALL@
|
|
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
|
@@ -78,7 +87,11 @@ YACC = @V_YACC@
|
|
# problem if you don't own the file but can write to the directory.
|
|
.c.o:
|
|
@rm -f $@
|
|
- $(CC) $(CFLAGS) -c $(srcdir)/$*.c
|
|
+ $(CC) $(CFLAGS) -c -o $@ $(srcdir)/$*.c
|
|
+
|
|
+%_pic.o: %.c
|
|
+ @rm -f $@
|
|
+ $(CC) -fPIC $(CFLAGS) -c -o $@ $(srcdir)/$*.c
|
|
|
|
PSRC = pcap-@V_PCAP@.c @USB_SRC@ @BT_SRC@ @CAN_SRC@
|
|
FSRC = fad-@V_FINDALLDEVS@.c
|
|
@@ -94,6 +107,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 \
|
|
@@ -131,7 +145,7 @@ TAGFILES = \
|
|
|
|
CLEANFILES = $(OBJ) libpcap.* filtertest findalldevstest selpolltest \
|
|
opentest $(PROG)-`cat $(srcdir)/VERSION`.tar.gz $(GENSRC) $(GENHDR) \
|
|
- lex.yy.c pcap-config
|
|
+ lex.yy.c pcap-config $(OBJ_PIC)
|
|
|
|
MAN1 = pcap-config.1
|
|
|
|
@@ -324,21 +338,14 @@ EXTRA_DIST = \
|
|
Win32/Src/inet_net.c \
|
|
Win32/Src/inet_pton.c
|
|
|
|
-all: libpcap.a shared pcap-config
|
|
+all: libpcap.a shared pcap-config $(SHAREDLIB)
|
|
|
|
libpcap.a: $(OBJ)
|
|
@rm -f $@
|
|
ar rc $@ $(OBJ) $(ADDLARCHIVEOBJS)
|
|
$(RANLIB) $@
|
|
|
|
-shared: libpcap.$(DYEXT)
|
|
-
|
|
-libpcap.so: $(OBJ)
|
|
- @rm -f $@
|
|
- VER=`cat $(srcdir)/VERSION`; \
|
|
- MAJOR_VER=`sed 's/\([0-9][0-9]*\)\..*/\1/' $(srcdir)/VERSION`; \
|
|
- @V_SHLIB_CMD@ @V_SHLIB_OPT@ @V_SONAME_OPT@$@.$$MAJOR_VER $(LDFLAGS) \
|
|
- -o $@.$$VER $(OBJ) $(ADDLOBJS) $(LIBS)
|
|
+shared: $(SHAREDLIB)
|
|
|
|
#
|
|
# The following rule succeeds, but the result is untested.
|
|
@@ -409,6 +416,13 @@ libpcap.shareda: $(OBJ)
|
|
#
|
|
libpcap.none:
|
|
|
|
+$(SHAREDLIB): $(OBJ_PIC)
|
|
+ -@rm -f $@
|
|
+ -@rm -f $(SOLIBRARY) $(SOLIBRARY).$(MAJ)
|
|
+ $(CC) $(CFLAGS_SHARED) -o $(SHAREDLIB) $(OBJ_PIC) -lc
|
|
+ ln -s $(SHAREDLIB) $(SOLIBRARY).$(MAJ)
|
|
+ ln -s $(SOLIBRARY).$(MAJ) $(SOLIBRARY)
|
|
+
|
|
scanner.c: $(srcdir)/scanner.l
|
|
@rm -f $@
|
|
$(srcdir)/runlex.sh $(LEX) -o$@ $<
|
|
@@ -416,6 +430,9 @@ scanner.c: $(srcdir)/scanner.l
|
|
scanner.o: scanner.c tokdefs.h
|
|
$(CC) $(CFLAGS) -c scanner.c
|
|
|
|
+scanner_pic.o: scanner.c tokdefs.h
|
|
+ $(CC) -fPIC $(CFLAGS) -o $@ -c scanner.c
|
|
+
|
|
pcap.o: version.h
|
|
|
|
tokdefs.h: grammar.c
|
|
@@ -429,9 +446,17 @@ grammar.o: grammar.c
|
|
@rm -f $@
|
|
$(CC) $(CFLAGS) -Dyylval=pcap_lval -c grammar.c
|
|
|
|
+grammar_pic.o: grammar.c
|
|
+ @rm -f $@
|
|
+ $(CC) -fPIC $(CFLAGS) -Dyylval=pcap_lval -o $@ -c grammar.c
|
|
+
|
|
version.o: version.c
|
|
$(CC) $(CFLAGS) -c version.c
|
|
|
|
+version_pic.o: version.c
|
|
+ $(CC) -fPIC $(CFLAGS) -c version.c -o $@
|
|
+
|
|
+
|
|
snprintf.o: $(srcdir)/missing/snprintf.c
|
|
$(CC) $(CFLAGS) -o $@ -c $(srcdir)/missing/snprintf.c
|
|
|
|
@@ -469,6 +494,9 @@ bpf_filter.c: $(srcdir)/bpf/net/bpf_filt
|
|
bpf_filter.o: bpf_filter.c
|
|
$(CC) $(CFLAGS) -c bpf_filter.c
|
|
|
|
+bpf_filter_pic.o: bpf_filter.c
|
|
+ $(CC) -fPIC $(CFLAGS) -c bpf_filter.c -o $@
|
|
+
|
|
#
|
|
# Generate the pcap-config script.
|
|
#
|
|
@@ -562,14 +590,12 @@ install: install-shared install-archive
|
|
$(DESTDIR)$(mandir)/man@MAN_MISC_INFO@/`echo $$i | sed 's/.manmisc.in/.@MAN_MISC_INFO@/'`; done
|
|
|
|
install-shared: install-shared-$(DYEXT)
|
|
-install-shared-so: libpcap.so
|
|
+install-shared-so: $(SHAREDLIB)
|
|
[ -d $(DESTDIR)$(libdir) ] || \
|
|
(mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
|
|
- VER=`cat $(srcdir)/VERSION`; \
|
|
- MAJOR_VER=`sed 's/\([0-9][0-9]*\)\..*/\1/' $(srcdir)/VERSION`; \
|
|
- $(INSTALL_PROGRAM) libpcap.so.$$VER $(DESTDIR)$(libdir)/libpcap.so.$$VER; \
|
|
- ln -sf libpcap.so.$$VER $(DESTDIR)$(libdir)/libpcap.so.$$MAJOR_VER; \
|
|
- ln -sf libpcap.so.$$MAJOR_VER $(DESTDIR)$(libdir)/libpcap.so
|
|
+ $(INSTALL_DATA) $(SHAREDLIB) $(DESTDIR)$(libdir)/
|
|
+ ln -sf $(SHAREDLIB) $(DESTDIR)$(libdir)/$(SOLIBRARY).$(MAJ)
|
|
+ ln -sf $(SOLIBRARY).$(MAJ) $(DESTDIR)$(libdir)/$(SOLIBRARY)
|
|
install-shared-dylib: libpcap.dylib
|
|
[ -d $(DESTDIR)$(libdir) ] || \
|
|
(mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -3229,7 +3229,7 @@ _ACEOF
|
|
# or accepts command-line arguments like
|
|
# those the GNU linker accepts.
|
|
#
|
|
- V_CCOPT="$V_CCOPT -fpic"
|
|
+ V_CCOPT="$V_CCOPT"
|
|
V_SONAME_OPT="-Wl,-soname,"
|
|
V_RPATH_OPT="-Wl,-rpath,"
|
|
;;
|
|
@@ -3292,7 +3292,7 @@ _ACEOF
|
|
#
|
|
# "cc" is GCC.
|
|
#
|
|
- V_CCOPT="$V_CCOPT -fpic"
|
|
+ V_CCOPT="$V_CCOPT"
|
|
V_SHLIB_CMD="\$(CC)"
|
|
V_SHLIB_OPT="-shared"
|
|
V_SONAME_OPT="-Wl,-soname,"
|