Move bpf/net/bpf-filter.c to toplevel directory - it's the sole file in bpf/...

Fix autotools .devel failure in OOT-build while at it

5 files changed, 7 insertions, 21 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d08dfb5c..ed675148 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -850,6 +850,7 @@ endif(NOT WIN32)
 
 set(PROJECT_SOURCE_LIST_C
     bpf_dump.c
+    bpf_filter.c
     bpf_image.c
     etherent.c
     fmtutils.c
@@ -861,7 +862,6 @@ set(PROJECT_SOURCE_LIST_C
     savefile.c
     sf-pcapng.c
     sf-pcap.c
-    bpf/net/bpf_filter.c
 )
 
 if(WIN32)
diff --git a/Makefile.in b/Makefile.in
index 85fe8ea6..6fcd3afc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -92,8 +92,8 @@ SSRC =  @SSRC@
 CSRC =	pcap.c gencode.c optimize.c nametoaddr.c etherent.c \
 	fmtutils.c \
 	savefile.c sf-pcap.c sf-pcapng.c pcap-common.c \
-	bpf_image.c bpf_dump.c
-GENSRC = scanner.c grammar.c bpf_filter.c
+	bpf_image.c bpf_filter.c bpf_dump.c
+GENSRC = scanner.c grammar.c
 LIBOBJS = @LIBOBJS@
 
 SRC =	$(PSRC) $(FSRC) $(CSRC) $(SSRC) $(GENSRC)
@@ -253,7 +253,6 @@ EXTRA_DIST = \
 	TODO \
 	VERSION \
 	aclocal.m4 \
-	bpf/net/bpf_filter.c \
 	chmod_bpf \
 	cmake_uninstall.cmake.in \
 	cmakeconfig.h.in \
@@ -503,13 +502,6 @@ snprintf.o: $(srcdir)/missing/snprintf.c
 strtok_r.o: $(srcdir)/missing/strtok_r.c
 	$(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/strtok_r.c
 
-bpf_filter.c: $(srcdir)/bpf/net/bpf_filter.c
-	rm -f bpf_filter.c
-	ln -s $(srcdir)/bpf/net/bpf_filter.c bpf_filter.c
-
-bpf_filter.o: bpf_filter.c
-	$(CC) $(FULL_CFLAGS) -c bpf_filter.c
-
 #
 # Generate the libpcap.pc file.
 #
@@ -743,7 +735,7 @@ clean:
 
 distclean: clean
 	rm -f Makefile config.cache config.log config.status \
-	    config.h gnuc.h net os-proto.h bpf_filter.c libpcap.pc \
+	    config.h gnuc.h net os-proto.h libpcap.pc \
 	    pcap-config stamp-h stamp-h.in
 	rm -f $(MAN3PCAP_EXPAND:.in=) $(MANFILE:.in=) $(MANMISC:.in=)
 	rm -rf autom4te.cache
@@ -765,7 +757,7 @@ releasetar:
 	   tar -c -z -f $$name.tar.gz $$name; \
 	   rm -rf $$name
 
-depend:	$(GENSRC) $(GENHDR) bpf_filter.c
+depend:	$(GENSRC) $(GENHDR)
 	$(MKDEP) -c "$(CC)" -m "$(DEPENDENCY_CFLAG)" $(CFLAGS) $(DEFS) $(INCLS) $(SRC)
 	cd rpcapd; $(MAKE) depend
 	cd testprogs; $(MAKE) depend
diff --git a/bpf/net/bpf_filter.c b/bpf_filter.c
index 1484e08b..1484e08b 100644
--- a/bpf/net/bpf_filter.c
+++ b/bpf_filter.c
diff --git a/configure b/configure
index 85081786..eb6c8f90 100755
--- a/configure
+++ b/configure
@@ -9202,9 +9202,6 @@ $as_echo "#define LBL_ALIGN 1" >>confdefs.h
 
     fi
 
-rm -f net
-ln -s ${srcdir}/bpf/net net
-
 
 
 
@@ -11247,7 +11244,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
   case $ac_file$ac_mode in
     "default-1":C) if test -f .devel; then
 	echo timestamp > stamp-h
-	cat Makefile-devel-adds >> Makefile
+	cat $srcdir/Makefile-devel-adds >> Makefile
 	make depend
 fi ;;
 
diff --git a/configure.ac b/configure.ac
index cb63ae73..7767f016 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1868,9 +1868,6 @@ AC_CHECK_MEMBERS([dl_hp_ppa_info_t.dl_module_id_1],,,
 
 AC_LBL_UNALIGNED_ACCESS
 
-rm -f net
-ln -s ${srcdir}/bpf/net net
-
 AC_SUBST(V_CCOPT)
 AC_SUBST(V_DEFS)
 AC_SUBST(V_FINDALLDEVS)
@@ -2274,7 +2271,7 @@ AC_CONFIG_HEADER(config.h)
 
 AC_OUTPUT_COMMANDS([if test -f .devel; then
 	echo timestamp > stamp-h
-	cat Makefile-devel-adds >> Makefile
+	cat $srcdir/Makefile-devel-adds >> Makefile
 	make depend
 fi])
 AC_OUTPUT(Makefile pcap-filter.manmisc pcap-linktype.manmisc