From 14cfcac8fa1dea8f7920860a178362cf1f5fbebe Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sun, 12 Jul 2009 16:33:08 -0700 Subject: [PATCH] Rename ADDLOBJ to ADDLOBJS, along the lines of LIBOBJS, etc.. Add ADDLARCHIVEOBJS, so that we can put some stuff from -ldag into the archive library (so it's self-contained, and the configuration processes for programs not configured with pcap-config don't have to know about the DAG library) but not into the shared library (as we can link libpcap with the DAG shared library, so linking with -lpcap will cause -ldag to be linked in at run time if necessary). --- Makefile.in | 13 +++++++------ configure | 14 +++++++++----- configure.in | 8 +++++--- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/Makefile.in b/Makefile.in index 4b5c3c1..06fe6ec 100644 --- a/Makefile.in +++ b/Makefile.in @@ -48,7 +48,8 @@ CC = @CC@ CCOPT = @V_CCOPT@ INCLS = -I. @V_INCLS@ DEFS = @DEFS@ @V_DEFS@ -ADDLOBJ = @ADDLOBJ@ +ADDLOBJS = @ADDLOBJS@ +ADDLARCHIVEOBJS = @ADDLARCHIVEOBJS@ LIBS = @LIBS@ LDFLAGS = @LDFLAGS@ DYEXT = @DYEXT@ @@ -316,7 +317,7 @@ all: libpcap.a shared pcap-config libpcap.a: $(OBJ) @rm -f $@ - ar rc $@ $(OBJ) $(ADDLOBJ) + ar rc $@ $(OBJ) $(ADDLARCHIVEOBJS) $(RANLIB) $@ shared: libpcap.$(DYEXT) @@ -326,7 +327,7 @@ libpcap.so: $(OBJ) 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) $(ADDLOBJ) $(LIBS) + -o $@.$$VER $(OBJ) $(ADDLOBJS) $(LIBS) # # The following rule succeeds, but the result is untested. @@ -353,7 +354,7 @@ libpcap.dylib: $(OBJ) COMPAT_VER=1; \ CURRENT_VER=`sed 's/[^0-9.].*$$//' $(srcdir)/VERSION`; \ $(CC) -dynamiclib -undefined error $(LDFLAGS) \ - -o libpcap.$$VER.dylib $(OBJ) $(ADDLOBJ) $(LIBS) \ + -o libpcap.$$VER.dylib $(OBJ) $(ADDLOBJS) $(LIBS) \ -install_name $(libdir)/libpcap.$$MAJOR_VER.dylib \ -compatibility_version $$COMPAT_VER \ -current_version $$CURRENT_VER @@ -375,7 +376,7 @@ libpcap.sl: $(OBJ) rm -f libpcap.$$MAJOR_VER MAJOR_VER=`sed 's/\([0-9][0-9]*\)\..*/\1/' $(srcdir)/VERSION`; \ ld -b $(LDFLAGS) -o libpcap.$$MAJOR_VER +h libpcap.$$MAJOR_VER \ - $(OBJ) $(ADDLOBJ) $(LIBS) + $(OBJ) $(ADDLOBJS) $(LIBS) # # AIX is different from everybody else. A shared library is an archive @@ -388,7 +389,7 @@ libpcap.sl: $(OBJ) # libpcap.shareda: $(OBJ) @rm -f $@ shr.o - $(CC) @V_SHLIB_OPT@ -o shr.o $(OBJ) $(ADDLOBJ) $(LIBS) + $(CC) @V_SHLIB_OPT@ -o shr.o $(OBJ) $(ADDLOBJS) $(LIBS) ar rc $@ shr.o # diff --git a/configure b/configure index 83dda29..36ec00a 100755 --- a/configure +++ b/configure @@ -688,7 +688,8 @@ V_SHLIB_CMD V_SHLIB_OPT V_SONAME_OPT V_RPATH_OPT -ADDLOBJ +ADDLOBJS +ADDLARCHIVEOBJS SSRC DYEXT MAN_FILE_FORMATS @@ -8624,7 +8625,7 @@ fi if test $ac_cv_lbl_dag_api = yes; then V_INCLS="$V_INCLS -I$dag_include_dir" - ADDLOBJ="$ADDLOBJ $dagapi_obj $dagopts_obj $dagreg_obj" + ADDLARCHIVEOBJS="$ADDLARCHIVEOBJS $dagapi_obj $dagopts_obj $dagreg_obj" if test $V_PCAP != dag ; then SSRC="pcap-dag.c" fi @@ -8949,7 +8950,8 @@ echo $ECHO_N "checking whether we have Septel API... $ECHO_C" >&6; } ac_cv_lbl_septel_api=no if test -r "$septel_include_dir/msg.h"; then V_INCLS="$V_INCLS -I$septel_include_dir" - ADDLOBJ="$ADDLOBJ $septel_tools_dir/asciibin.o $septel_tools_dir/bit2byte.o $septel_tools_dir/confirm.o $septel_tools_dir/fmtmsg.o $septel_tools_dir/gct_unix.o $septel_tools_dir/hqueue.o $septel_tools_dir/ident.o $septel_tools_dir/mem.o $septel_tools_dir/pack.o $septel_tools_dir/parse.o $septel_tools_dir/pool.o $septel_tools_dir/sdlsig.o $septel_tools_dir/strtonum.o $septel_tools_dir/timer.o $septel_tools_dir/trace.o" + ADDLOBJS="$ADDLOBJS $septel_tools_dir/asciibin.o $septel_tools_dir/bit2byte.o $septel_tools_dir/confirm.o $septel_tools_dir/fmtmsg.o $septel_tools_dir/gct_unix.o $septel_tools_dir/hqueue.o $septel_tools_dir/ident.o $septel_tools_dir/mem.o $septel_tools_dir/pack.o $septel_tools_dir/parse.o $septel_tools_dir/pool.o $septel_tools_dir/sdlsig.o $septel_tools_dir/strtonum.o $septel_tools_dir/timer.o $septel_tools_dir/trace.o" + ADDLARCHIVEOBJS="$ADDLARCHIVEOBJS $septel_tools_dir/asciibin.o $septel_tools_dir/bit2byte.o $septel_tools_dir/confirm.o $septel_tools_dir/fmtmsg.o $septel_tools_dir/gct_unix.o $septel_tools_dir/hqueue.o $septel_tools_dir/ident.o $septel_tools_dir/mem.o $septel_tools_dir/pack.o $septel_tools_dir/parse.o $septel_tools_dir/pool.o $septel_tools_dir/sdlsig.o $septel_tools_dir/strtonum.o $septel_tools_dir/timer.o $septel_tools_dir/trace.o" if test "$V_PCAP" != septel ; then SSRC="pcap-septel.c" @@ -9823,6 +9825,7 @@ ln -s ${srcdir}/bpf/net net + { echo "$as_me:$LINENO: checking for USB sniffing support" >&5 echo $ECHO_N "checking for USB sniffing support... $ECHO_C" >&6; } case "$host_os" in @@ -11011,7 +11014,8 @@ V_SHLIB_CMD!$V_SHLIB_CMD$ac_delim V_SHLIB_OPT!$V_SHLIB_OPT$ac_delim V_SONAME_OPT!$V_SONAME_OPT$ac_delim V_RPATH_OPT!$V_RPATH_OPT$ac_delim -ADDLOBJ!$ADDLOBJ$ac_delim +ADDLOBJS!$ADDLOBJS$ac_delim +ADDLARCHIVEOBJS!$ADDLARCHIVEOBJS$ac_delim SSRC!$SSRC$ac_delim DYEXT!$DYEXT$ac_delim MAN_FILE_FORMATS!$MAN_FILE_FORMATS$ac_delim @@ -11026,7 +11030,7 @@ INSTALL_DATA!$INSTALL_DATA$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 87; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 88; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.in b/configure.in index 397a9c7..26da290 100644 --- a/configure.in +++ b/configure.in @@ -820,7 +820,7 @@ fi if test $ac_cv_lbl_dag_api = yes; then V_INCLS="$V_INCLS -I$dag_include_dir" - ADDLOBJ="$ADDLOBJ $dagapi_obj $dagopts_obj $dagreg_obj" + ADDLARCHIVEOBJS="$ADDLARCHIVEOBJS $dagapi_obj $dagopts_obj $dagreg_obj" if test $V_PCAP != dag ; then SSRC="pcap-dag.c" fi @@ -920,7 +920,8 @@ if test "$with_septel" != no; then ac_cv_lbl_septel_api=no if test -r "$septel_include_dir/msg.h"; then V_INCLS="$V_INCLS -I$septel_include_dir" - ADDLOBJ="$ADDLOBJ $septel_tools_dir/asciibin.o $septel_tools_dir/bit2byte.o $septel_tools_dir/confirm.o $septel_tools_dir/fmtmsg.o $septel_tools_dir/gct_unix.o $septel_tools_dir/hqueue.o $septel_tools_dir/ident.o $septel_tools_dir/mem.o $septel_tools_dir/pack.o $septel_tools_dir/parse.o $septel_tools_dir/pool.o $septel_tools_dir/sdlsig.o $septel_tools_dir/strtonum.o $septel_tools_dir/timer.o $septel_tools_dir/trace.o" + ADDLOBJS="$ADDLOBJS $septel_tools_dir/asciibin.o $septel_tools_dir/bit2byte.o $septel_tools_dir/confirm.o $septel_tools_dir/fmtmsg.o $septel_tools_dir/gct_unix.o $septel_tools_dir/hqueue.o $septel_tools_dir/ident.o $septel_tools_dir/mem.o $septel_tools_dir/pack.o $septel_tools_dir/parse.o $septel_tools_dir/pool.o $septel_tools_dir/sdlsig.o $septel_tools_dir/strtonum.o $septel_tools_dir/timer.o $septel_tools_dir/trace.o" + ADDLARCHIVEOBJS="$ADDLARCHIVEOBJS $septel_tools_dir/asciibin.o $septel_tools_dir/bit2byte.o $septel_tools_dir/confirm.o $septel_tools_dir/fmtmsg.o $septel_tools_dir/gct_unix.o $septel_tools_dir/hqueue.o $septel_tools_dir/ident.o $septel_tools_dir/mem.o $septel_tools_dir/pack.o $septel_tools_dir/parse.o $septel_tools_dir/pool.o $septel_tools_dir/sdlsig.o $septel_tools_dir/strtonum.o $septel_tools_dir/timer.o $septel_tools_dir/trace.o" if test "$V_PCAP" != septel ; then SSRC="pcap-septel.c" @@ -1161,7 +1162,8 @@ AC_SUBST(V_SHLIB_OPT) AC_SUBST(V_SONAME_OPT) AC_SUBST(V_RPATH_OPT) AC_SUBST(V_YACC) -AC_SUBST(ADDLOBJ) +AC_SUBST(ADDLOBJS) +AC_SUBST(ADDLARCHIVEOBJS) AC_SUBST(SSRC) AC_SUBST(DYEXT) AC_SUBST(MAN_FILE_FORMATS)