--- upstream/dynamips-0.2.7-RC1/Makefile	2007/10/06 16:23:47	7
+++ upstream/dynamips-0.2.7-RC2/Makefile	2007/10/06 16:24:54	8
@@ -14,7 +14,7 @@
 
 # Current dynamips release
 VERSION_TRAIN=0.2.7
-VERSION_SUB=-RC1
+VERSION_SUB=-RC2
 
 VERSION=$(VERSION_TRAIN)$(VERSION_SUB)
 VERSION_DEV=$(VERSION_TRAIN)-$(shell date +%Y%m%d-%H)
@@ -51,9 +51,9 @@
 else
 ifeq ($(shell uname), Linux)
    PTHREAD_LIBS?=-lpthread
-   PCAP_LIB=-lpcap
+#   PCAP_LIB=-lpcap
    CFLAGS+=-I/usr/include -I. $(PTHREAD_CFLAGS)
-   LIBS=-L/usr/lib -L. -lelf $(PTHREAD_LIBS)
+   LIBS=-L/usr/lib -L. /usr/lib/libelf.a $(PTHREAD_LIBS)
    DESTDIR=/usr
 else
 ifeq ($(shell uname -s), Darwin)
@@ -90,26 +90,32 @@
 
 # Header and source files
 HDR=mempool.h registry.h rbtree.h hash.h utils.h parser.h \
-	crc.h base64.h net.h net_io.h net_io_bridge.h net_io_filter.h \
+	crc.h sbox.h base64.h net.h net_io.h net_io_bridge.h net_io_filter.h \
 	atm.h frame_relay.h eth_switch.h \
-	ptask.h timer.h hypervisor.h dynamips.h insn_lookup.h \
+	ptask.h timer.h dev_vtty.h hypervisor.h dynamips.h insn_lookup.h \
 	vm.h cpu.h memory.h device.h \
 	mips64.h mips64_mem.h mips64_exec.h mips64_jit.h mips64_cp0.h \
 	ppc32.h ppc32_mem.h ppc32_exec.h ppc32_jit.h ppc32_vmtest.h \
-	nmc93c46.h cisco_eeprom.h ds1620.h dev_rom.h \
+	nmc93cX6.h cisco_eeprom.h ds1620.h dev_rom.h \
 	pci_dev.h pci_io.h dev_mpc860.h dev_gt.h dev_mv64460.h dev_plx.h \
 	dev_dec21140.h dev_am79c971.h dev_i8254x.h \
 	dev_mueslix.h dev_nm_16esw.h \
-	dev_vtty.h dev_c7200.h dev_c3600.h dev_c3600_bay.h \
-	dev_c2691.h dev_c3725.h dev_c3745.h dev_c2600.h
-
-SOURCES=mempool.c registry.c rbtree.c hash.c utils.c parser.c ptask.c timer.c \
-	crc.c base64.c net.c net_io.c net_io_bridge.c net_io_filter.c \
+	dev_c7200.h dev_c7200_mpfpga.h \
+	dev_c3600.h dev_c3600_iofpga.h dev_c3600_bay.h \
+	dev_c2691.h dev_c2691_iofpga.h \
+	dev_c3725.h dev_c3725_iofpga.h \
+	dev_c3745.h dev_c3745_iofpga.h \
+	dev_c2600.h dev_c2600_iofpga.h \
+	dev_msfc1.h dev_msfc1_mpfpga.h
+
+SOURCES=mempool.c registry.c rbtree.c hash.c sbox.c utils.c parser.c \
+	ptask.c timer.c crc.c base64.c \
+	net.c net_io.c net_io_bridge.c net_io_filter.c \
 	atm.c frame_relay.c eth_switch.c \
 	dynamips.c insn_lookup.c vm.c cpu.c \
 	mips64.c mips64_mem.c mips64_cp0.c mips64_jit.c mips64_exec.c \
 	ppc32.c ppc32_mem.c ppc32_jit.c ppc32_exec.c ppc32_vmtest.c \
-	memory.c device.c nmc93c46.c cisco_eeprom.c \
+	memory.c device.c nmc93cX6.c cisco_eeprom.c \
 	pci_dev.c pci_io.c \
 	dev_zero.c dev_bswap.c dev_vtty.c dev_ram.c dev_rom.c dev_nvram.c \
 	dev_bootflash.c dev_flash.c dev_mpc860.c \
@@ -127,6 +133,7 @@
 	dev_c3725.c dev_c3725_iofpga.c dev_c3725_eth.c dev_c3725_serial.c \
 	dev_c3745.c dev_c3745_iofpga.c dev_c3745_eth.c dev_c3745_serial.c \
 	dev_c2600.c dev_c2600_pci.c dev_c2600_iofpga.c dev_c2600_eth.c \
+	dev_msfc1.c dev_msfc1_iofpga.c dev_msfc1_mpfpga.c \
 	dev_nm_16esw.c dev_pa_a1.c dev_pa_mc8te1.c \
 	dev_sb1.c dev_sb1_io.c dev_sb1_pci.c hypervisor.c \
 	hv_nio.c hv_nio_bridge.c hv_frsw.c hv_atmsw.c hv_ethsw.c \
@@ -186,7 +193,7 @@
 	ppc32_nojit_trans.c ppc32_nojit_trans.h \
 	linux_eth.c linux_eth.h gen_eth.c gen_eth.h \
 	profiler.c profiler_resolve.pl bin2c.c rom2c.c \
-	nvram_export.c
+	nvram_export.c udp_send.c 
 
 .PHONY: all
 all: $(PROG) nvram_export
@@ -196,6 +203,10 @@
 	@echo "Linking $@"
 	@$(CC) -o $@ $(C_OBJS) $(A_OBJS) $(LIBS)
 
+udp_send$(BIN_EXT): udp_send.c net.c
+	@echo "Linking $@"
+	@$(CC) -Wall $(CFLAGS) -o $@ udp_send.c net.c $(LIBS)
+
 rom2c$(BIN_EXT): rom2c.c
 	@echo "Linking $@"
 	@$(CC) -Wall $(CFLAGS) -o $@ rom2c.c $(LIBS)