--- cf/Makefile	2018/04/24 17:56:50	1.1.1.1
+++ cf/Makefile	2018/04/24 17:57:44	1.1.1.3
@@ -1,77 +1,90 @@
-# Makefile for Dynamips 0.2.3
+# Makefile for Dynamips 0.2.4
 # Copyright (c) 2005-2006 Christophe Fillot.
 
 # Replace x86 by amd64 for a build on x86_64.
 # Use "nojit" for architectures that are not x86 or x86_64.
-ARCH=x86
+DYNAMIPS_ARCH?=x86
 
 # Change this to 0 if your system doesn't support RFC 2553 extensions
 HAS_RFC2553=1
 
+# Change this to 1 if your system has libpcap-0.9.4 or better 
+# (WinPcap is used for Cygwin)
+HAS_PCAP?=1
+
 # Current dynamips release
-VERSION=0.2.3b
+VERSION=0.2.4
 
-CC=gcc
+CC?=gcc
 LD=ld
 RM=rm
 TAR=tar
 CP=cp
 LEX=flex
-ARCH_INC_FILE=\"$(ARCH)_trans.h\"
-CFLAGS=-g -Wall -O3 -fomit-frame-pointer -DJIT_ARCH=\"$(ARCH)\" \
-	-DARCH_INC_FILE=$(ARCH_INC_FILE) \
+ARCH_INC_FILE=\"$(DYNAMIPS_ARCH)_trans.h\"
+CFLAGS+=-g -Wall -O3 -fomit-frame-pointer -DJIT_ARCH=\"$(DYNAMIPS_ARCH)\" \
+	-DARCH_INC_FILE=$(ARCH_INC_FILE) -DDYNAMIPS_VERSION=\"$(VERSION)\" \
 	-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE \
 	-DHAS_RFC2553=$(HAS_RFC2553)
 
+PCAP_LIB=-lpcap
+
 ifeq ($(shell uname), FreeBSD)
-   CFLAGS+=-I/usr/local/include -I/usr/local/include/libelf
-   LIBS=-L/usr/local/lib -L. -lelf -pthread
+   PTHREAD_LIBS?=-pthread
+   CFLAGS+=-I/usr/local/include -I/usr/local/include/libelf $(PTHREAD_CFLAGS)
+   LIBS=-L/usr/local/lib -L. -lelf $(PTHREAD_LIBS)
+else
+ifeq ($(shell uname -s), Darwin)
+   CFLAGS+=-I/usr/local/include
+   LIBS=-L/usr/local/lib -L. -lelf -lpthread
 else
 ifeq ($(shell uname -o), Cygwin)
    CFLAGS+=-I/usr/local/include -I/usr/local/include/libelf
    LIBS=-L/usr/local/lib -L. -lelf -lpthread
+   PCAP_LIB=-lpacket -lwpcap
 else
    LIBS=-L. -lelf -lpthread
 endif
 endif
+endif
 
 PROG=dynamips
 PACKAGE=$(PROG)-$(VERSION)
 ARCHIVE=$(PACKAGE).tar.gz
 
 # Header and source files
-HDR=mempool.h cfg_lexer.h cfg_parser.h rbtree.h hash.h utils.h \
-	net.h net_io.h net_io_bridge.h atm.h \
+HDR=mempool.h cfg_lexer.h cfg_parser.h rbtree.h hash.h utils.h crc.h \
+	net.h net_io.h net_io_bridge.h atm.h frame_relay.h \
 	ptask.h dynamips.h insn_lookup.h \
 	mips64.h mips64_exec.h cpu.h cp0.h memory.h device.h \
 	nmc93c46.h ds1620.h pci_dev.h pcireg.h \
 	dev_vtty.h dev_c7200.h dev_c7200_bay.h
-SOURCES=mempool.c cfg_lexer.c cfg_parser.c rbtree.c hash.c utils.c \
-	net.c net_io.c net_io_bridge.c atm.c ptask.c \
+SOURCES=mempool.c cfg_lexer.c cfg_parser.c rbtree.c hash.c utils.c crc.c \
+	net.c net_io.c net_io_bridge.c atm.c frame_relay.c ptask.c \
 	dynamips.c insn_lookup.c mips64.c mips64_jit.c mips64_exec.c \
 	cpu.c cp0.c memory.c device.c nmc93c46.c pci_dev.c pci_io.c \
 	dev_zero.c dev_vtty.c dev_nvram.c dev_rom.c dev_bootflash.c \
 	dev_clpd6729.c dev_iofpga.c dev_mpfpga.c dev_gt64k.c \
-	dev_dec21x50.c dev_pericom.c \
+	dev_dec21x50.c dev_pericom.c dev_remote.c \
 	dev_c7200.c dev_c7200_bay.c dev_c7200_sram.c dev_dec21140.c \
-	dev_c7200_serial.c dev_pa_a1.c \
+	dev_c7200_serial.c dev_c7200_pos.c dev_pa_a1.c \
 	dev_sb1_duart.c
 
 # Profiling
 #SOURCES += profiler.c
 #CFLAGS += -p -DPROFILE -DPROFILE_FILE=\"$(PROG).profile\"
 
-ifeq ($(ARCH),x86)
+ifeq ($(DYNAMIPS_ARCH),x86)
 HDR += x86-codegen.h x86_trans.h
 SOURCES += x86_trans.c
 endif
 
-ifeq ($(ARCH),amd64)
+ifeq ($(DYNAMIPS_ARCH),amd64)
 HDR += x86-codegen.h amd64-codegen.h amd64_trans.h
 SOURCES += amd64_trans.c
 endif
 
-ifeq ($(ARCH),nojit)
+ifeq ($(DYNAMIPS_ARCH),nojit)
 HDR += nojit_trans.h
 SOURCES += nojit_trans.c
 endif
@@ -83,6 +96,15 @@ HDR += linux_eth.h
 SOURCES += linux_eth.c
 endif
 
+# Generic Ethernet support with libpcap (0.9+)
+ifeq ($(HAS_PCAP), 1)
+CFLAGS += -DGEN_ETH
+HDR += gen_eth.h
+SOURCES += gen_eth.c
+
+LIBS += $(PCAP_LIB)
+endif
+
 LEX_SOURCES=cfg_lexer.l
 
 OBJS=$(SOURCES:.c=.o)
@@ -92,7 +114,8 @@ SUPPL=Makefile ChangeLog README TODO mic
 FILE_LIST := $(HDR) $(SOURCES) $(SUPPL) \
 	x86-codegen.h x86_trans.c x86_trans.h \
 	amd64-codegen.h amd64_trans.c amd64_trans.h \
-	nojit_trans.c nojit_trans.h linux_eth.c linux_eth.h \
+	nojit_trans.c nojit_trans.h \
+	linux_eth.c linux_eth.h gen_eth.c gen_eth.h \
 	cfg_lexer.l profiler.c profiler_resolve.pl bin2c.c rom2c.c
 
 dynamips: microcode $(LEX_C) $(OBJS)
@@ -101,7 +124,7 @@ dynamips: microcode $(LEX_C) $(OBJS)
 
 .PHONY: microcode
 microcode: 
-	@$(CC) -Wall -o rom2c rom2c.c $(LIBS)
+	@$(CC) -Wall $(CFLAGS) -o rom2c rom2c.c $(LIBS)
 	@./rom2c microcode microcode_dump.inc
 
 .PHONY: clean