Index: head/net/libpcap/files/patchbase-Makefile.in =================================================================== --- head/net/libpcap/files/patchbase-Makefile.in (revision 169458) +++ head/net/libpcap/files/patchbase-Makefile.in (revision 169459) @@ -1,30 +1,38 @@ ---- Makefile.in.orig Thu Jan 8 16:38:30 2004 -+++ Makefile.in Thu Jan 8 16:41:40 2004 -@@ -96,13 +96,17 @@ +--- Makefile.in.orig Sun Apr 16 17:17:57 2006 ++++ Makefile.in Sun Apr 16 17:18:08 2006 +@@ -97,22 +97,18 @@ CLEANFILES = $(OBJ) libpcap.a $(GENSRC) $(GENHDR) lex.yy.c -all: libpcap.a +all: libpcap.a libpcap.so.2 libpcap.a: $(OBJ) @rm -f $@ ar rc $@ $(OBJ) $(LIBS) $(RANLIB) $@ +-shared: libpcap.$(DYEXT) ++#shared: libpcap.$(DYEXT) + +-# +-# XXX - this works with GNU ld, but won't necessarily work with native +-# ld on, for example, various SVR4-flavored platforms, or Digital UNIX. +-# +-libpcap.so: $(OBJ) +libpcap.so.2: $(OBJ) -+ @rm -f $@ -+ $(CC) -shared -Wl,-x -o libpcap.so.2 -Wl,-soname,libpcap.so.2 `lorder *.o | tsort -q` -+ - scanner.c: $(srcdir)/scanner.l @rm -f $@ - $(LEX) -t $< > $$$$.$@; mv $$$$.$@ $@ -@@ -154,6 +158,8 @@ - install: +- ld -shared -o $@.`cat VERSION` $(OBJ) ++ $(CC) -shared -Wl,-x -o libpcap.so.2 -Wl,-soname,libpcap.so.2 `lorder *.o | tsort -q` + + # the following rule succeeds, but the result is untested. + libpcap.dylib: $(OBJ) +@@ -173,6 +169,8 @@ + install: libpcap.a [ -d $(DESTDIR)$(libdir) ] || \ (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) + $(INSTALL_DATA) libpcap.so.2 $(DESTDIR)$(libdir)/libpcap.so.2 + ln -fs $(DESTDIR)$(libdir)/libpcap.so.2 $(DESTDIR)$(libdir)/libpcap.so $(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a $(RANLIB) $(DESTDIR)$(libdir)/libpcap.a [ -d $(DESTDIR)$(includedir) ] || \ Property changes on: head/net/libpcap/files/patchbase-Makefile.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property