forked from pool/dynamips
117 lines
3.9 KiB
Diff
117 lines
3.9 KiB
Diff
Index: Makefile
|
|
===================================================================
|
|
--- Makefile.orig 2007-10-14 10:43:07.000000000 +0200
|
|
+++ Makefile 2008-06-20 21:20:06.000000000 +0200
|
|
@@ -13,7 +13,7 @@ HAS_RFC2553?=1
|
|
HAS_PCAP?=1
|
|
|
|
# Change this to 1 if your system has posix_memalign
|
|
-HAS_POSIX_MEMALIGN?=0
|
|
+HAS_POSIX_MEMALIGN?=1
|
|
|
|
# Current dynamips release
|
|
VERSION_TRAIN=0.2.8
|
|
@@ -23,8 +23,6 @@ VERSION=$(VERSION_TRAIN)$(VERSION_SUB)
|
|
VERSION_DEV=$(VERSION_TRAIN)-$(shell date +%Y%m%d-%H)
|
|
|
|
# Executable binary extension
|
|
-DESTDIR?=/usr
|
|
-BIN_EXT?=
|
|
|
|
CC?=gcc
|
|
LD=ld
|
|
@@ -35,7 +33,7 @@ LEX=flex
|
|
MIPS64_ARCH_INC_FILE=\"mips64_$(DYNAMIPS_ARCH)_trans.h\"
|
|
PPC32_ARCH_INC_FILE=\"ppc32_$(DYNAMIPS_ARCH)_trans.h\"
|
|
|
|
-CFLAGS+=-g -Wall -O3 -fomit-frame-pointer \
|
|
+CFLAGS+=-g -Wall -fomit-frame-pointer \
|
|
-DJIT_ARCH=\"$(DYNAMIPS_ARCH)\" -DJIT_CPU=CPU_$(DYNAMIPS_ARCH) \
|
|
-DMIPS64_ARCH_INC_FILE=$(MIPS64_ARCH_INC_FILE) \
|
|
-DPPC32_ARCH_INC_FILE=$(PPC32_ARCH_INC_FILE) \
|
|
@@ -56,9 +54,9 @@ ifeq ($(shell uname), FreeBSD)
|
|
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. -ldl /usr/lib/libelf.a $(PTHREAD_LIBS)
|
|
+ LIBS=-L/usr/lib -L. -ldl -lelf $(PTHREAD_LIBS)
|
|
DESTDIR=/usr
|
|
else
|
|
ifeq ($(shell uname -s), Darwin)
|
|
@@ -218,29 +216,29 @@ all: $(PROG) nvram_export
|
|
$(PROG): mips64_microcode_dump.inc ppc32_microcode_dump.inc \
|
|
$(LEX_C) $(C_OBJS) $(A_OBJS)
|
|
@echo "Linking $@"
|
|
- @$(CC) -o $@ $(C_OBJS) $(A_OBJS) $(LIBS)
|
|
+ $(CC) -o $@ $(C_OBJS) $(A_OBJS) $(LIBS)
|
|
|
|
udp_send$(BIN_EXT): udp_send.c net.c crc.c
|
|
@echo "Linking $@"
|
|
- @$(CC) -Wall $(CFLAGS) -o $@ udp_send.c net.c crc.c $(LIBS)
|
|
+ $(CC) -Wall $(CFLAGS) -o $@ udp_send.c net.c crc.c $(LIBS)
|
|
|
|
udp_recv$(BIN_EXT): udp_recv.c net.c crc.c
|
|
@echo "Linking $@"
|
|
- @$(CC) -Wall $(CFLAGS) -o $@ udp_recv.c net.c crc.c $(LIBS)
|
|
+ $(CC) -Wall $(CFLAGS) -o $@ udp_recv.c net.c crc.c $(LIBS)
|
|
|
|
rom2c$(BIN_EXT): rom2c.c
|
|
@echo "Linking $@"
|
|
- @$(CC) -Wall $(CFLAGS) -o $@ rom2c.c $(LIBS)
|
|
+ $(CC) -Wall $(CFLAGS) -o $@ rom2c.c $(LIBS)
|
|
|
|
mips64_microcode_dump.inc: rom2c$(BIN_EXT) mips64_microcode
|
|
- @./rom2c mips64_microcode mips64_microcode_dump.inc 0xbfc00000
|
|
+ ./rom2c mips64_microcode mips64_microcode_dump.inc 0xbfc00000
|
|
|
|
ppc32_microcode_dump.inc: rom2c$(BIN_EXT) ppc32_microcode
|
|
- @./rom2c ppc32_microcode ppc32_microcode_dump.inc 0xfff00000
|
|
+ ./rom2c ppc32_microcode ppc32_microcode_dump.inc 0xfff00000
|
|
|
|
asmdefs$(BIN_EXT): asmdefs.c mips64.h
|
|
@echo "Linking $@"
|
|
- @$(CC) -Wall $(CFLAGS) -o $@ asmdefs.c
|
|
+ $(CC) -Wall $(CFLAGS) -o $@ asmdefs.c
|
|
|
|
asmdefs.h: asmdefs$(BIN_EXT)
|
|
@echo "Building assembly definitions header file"
|
|
@@ -248,15 +246,15 @@ asmdefs.h: asmdefs$(BIN_EXT)
|
|
|
|
nvram_export$(BIN_EXT): nvram_export.c
|
|
@echo "Linking $@"
|
|
- @$(CC) -Wall $(CFLAGS) -o $@ nvram_export.c
|
|
+ $(CC) -Wall $(CFLAGS) -o $@ nvram_export.c
|
|
|
|
install: $(PROG) nvram_export
|
|
@echo "Installing"
|
|
- install -d $(DESTDIR)/bin $(DESTDIR)/man/man1 $(DESTDIR)/man/man7 $(DESTDIR)/etc
|
|
- install dynamips nvram_export $(DESTDIR)/bin
|
|
- install -m644 dynamips.1 $(DESTDIR)/man/man1
|
|
- install -m644 nvram_export.1 $(DESTDIR)/man/man1
|
|
- install -m644 hypervisor_mode.7 $(DESTDIR)/man/man7
|
|
+ install -d $(DESTDIR)/usr/bin $(DESTDIR)/usr/share/man/man1 $(DESTDIR)/usr/share/man/man7 $(DESTDIR)/etc
|
|
+ install dynamips nvram_export $(DESTDIR)/usr/bin
|
|
+ install -m644 dynamips.1 $(DESTDIR)/usr/share/man/man1
|
|
+ install -m644 nvram_export.1 $(DESTDIR)/usr/share/man/man1
|
|
+ install -m644 hypervisor_mode.7 $(DESTDIR)/usr/share/man/man7
|
|
# install -m644 example $(DESTDIR)/etc/dynamips
|
|
|
|
|
|
@@ -282,11 +280,11 @@ packdev:
|
|
|
|
.S.o:
|
|
@echo "Assembling $<"
|
|
- @$(CC) $(CFLAGS) $(INCLUDE) -c -o $*.o $<
|
|
+ $(CC) $(CFLAGS) $(INCLUDE) -c -o $*.o $<
|
|
|
|
.c.o:
|
|
@echo "Compiling $<"
|
|
- @$(CC) $(CFLAGS) $(INCLUDE) -c -o $*.o $<
|
|
+ $(CC) $(CFLAGS) $(INCLUDE) -c -o $*.o $<
|
|
|
|
.l.c:
|
|
$(LEX) -o$*.c $<
|