libbsd Makefile issues

[Joel Sherrill]

Hi

I decided to take a look at this and spotted what I think are at least
two mistakes but when I fixed them, I got a build error.

Help appreciated:

Makefile.diff attached. But it then fails like this:

$ make
i386-rtems4.11-gcc --pipe -B/home/joel/rtems-4.11-work/bsp-install/i386-rtems4.11/pc386/lib/ -specs bsp_specs -qrtems     -mtune=i386      -Wall  -O2 -g  -fno-strict-aliasing -ffreestanding -fno-common -Irtemsbsd/include -Irtemsbsd/i386/include -Ifreebsd/sys -Ifreebsd/sys/i386/include -Ifreebsd/sys/contrib/altq -Ifreebsd/sys/contrib/pf -Ifreebsd/include -Ifreebsd/lib/libc/include -Ifreebsd/lib/libc/isc/include -Ifreebsd/lib/libc/resolv -Ifreebsd/lib/libutil -Ifreebsd/lib/libkvm -Ifreebsd/lib/libmemstat -Ifreebsd/lib/libipsec -Irtemsbsd/sys -ImDNSResponder/mDNSCore -ImDNSResponder/mDNSShared -ImDNSResponder/mDNSPosix -Itestsuite/include -DHAVE_RTEMS_PCI_H=1 -Wall -Wno-format -MT freebsd/contrib/libpcap/scanner.o -MD -MP -MF freebsd/contrib/libpcap/scanner.d -std=gnu11 -D__FreeBSD__=1 -DBSD=1 -DINET6 -D_U_="__attribute__((unused))" -DHAVE_LIMITS_H=1 -DHAVE_INTTYPES=1 -DHAVE_STDINT=1 -DHAVE_STRERROR=1 -DHAVE_STRLCPY=1 -DHAVE_SNPRINTF=1 -DHAVE_VSNPRINTF=1 -DHAVE_SOCKADDR_SA_LEN=1 -DHAVE
_NET_IF_MEDIA_H=1 -DHAVE_SYS_IOCCOM_H=1 -DNEED_YYPARSE_WRAPPER=1 -Dyylval=pcap_lval -c freebsd/contrib/libpcap/scanner.c -o freebsd/contrib/libpcap/scanner.o
In file included from ../../freebsd/contrib/libpcap/scanner.l:51:0:
freebsd/contrib/libpcap/pcap-int.h:39:23: fatal error: pcap/pcap.h: No such file or directory
  #include <pcap/pcap.h>


-- 
Joel Sherrill, Ph.D.             Director of Research & Development
joel.sherrill at OARcorp.com        On-Line Applications Research
Ask me about RTEMS: a free RTOS  Huntsville AL 35805
Support Available                (256) 722-9985
-------------- next part --------------
diff --git a/Makefile b/Makefile
index da2a5ef..f6992e6 100644
--- a/Makefile
+++ b/Makefile
@@ -108,10 +108,10 @@ LIB_C_FILES += freebsd/sys/vm/uma_dbg.c
 LIB_C_FILES += freebsd/sys/cam/cam.c
 LIB_C_FILES += freebsd/sys/cam/scsi/scsi_all.c
 LIB_C_FILES += freebsd/contrib/libpcap/scanner.c
-freebsd/contrib/libpcap/scanner.c: freebsd/contrib/libpcap/scanner.l freebsd/contrib/libpcap/scanner.c
+freebsd/contrib/libpcap/scanner.c: freebsd/contrib/libpcap/scanner.l
 	${LEX} -P pcap -t $< | sed -e '/YY_BUF_SIZE/s/16384/1024/' > $@
 freebsd/contrib/libpcap/scanner.o: freebsd/contrib/libpcap/scanner.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) -D__FreeBSD__=1 -DBSD=1 -DINET6 -D_U_=__attribute__((unused)) -DHAVE_LIMITS_H=1 -DHAVE_INTTYPES=1 -DHAVE_STDINT=1 -DHAVE_STRERROR=1 -DHAVE_STRLCPY=1 -DHAVE_SNPRINTF=1 -DHAVE_VSNPRINTF=1 -DHAVE_SOCKADDR_SA_LEN=1 -DHAVE_NET_IF_MEDIA_H=1 -DHAVE_SYS_IOCCOM_H=1 -DNEED_YYPARSE_WRAPPER=1 -Dyylval=pcap_lval -c $< -o $@
+	$(CC) $(CPPFLAGS) $(CFLAGS) -D__FreeBSD__=1 -DBSD=1 -DINET6 -D_U_="__attribute__((unused))" -DHAVE_LIMITS_H=1 -DHAVE_INTTYPES=1 -DHAVE_STDINT=1 -DHAVE_STRERROR=1 -DHAVE_STRLCPY=1 -DHAVE_SNPRINTF=1 -DHAVE_VSNPRINTF=1 -DHAVE_SOCKADDR_SA_LEN=1 -DHAVE_NET_IF_MEDIA_H=1 -DHAVE_SYS_IOCCOM_H=1 -DNEED_YYPARSE_WRAPPER=1 -Dyylval=pcap_lval -c $< -o $@
 LIB_C_FILES += freebsd/contrib/libpcap/grammar.c
 freebsd/contrib/libpcap/grammar.c: freebsd/contrib/libpcap/grammar.y
 	yacc -b -b pcap -d -p -b pcap $<