dynamips-Makefile.patch

   1 --- Makefile    2007-05-26 11:52:33.000000000 +0200
   2 +++ dynamips-0.2.7/Makefile     2007-09-11 21:15:40.508475542 +0200
   3 @@ -32,7 +32,7 @@
   4  MIPS64_ARCH_INC_FILE=\"mips64_$(DYNAMIPS_ARCH)_trans.h\"
   5  PPC32_ARCH_INC_FILE=\"ppc32_$(DYNAMIPS_ARCH)_trans.h\"
   6
   7 -CFLAGS+=-g -Wall -O3 -fomit-frame-pointer \
   8 +CFLAGS+= $(RPM_CFLAGS) -fomit-frame-pointer \
   9         -DJIT_ARCH=\"$(DYNAMIPS_ARCH)\" -DJIT_CPU=CPU_$(DYNAMIPS_ARCH) \
  10         -DMIPS64_ARCH_INC_FILE=$(MIPS64_ARCH_INC_FILE) \
  11         -DPPC32_ARCH_INC_FILE=$(PPC32_ARCH_INC_FILE) \
  12 @@ -51,9 +51,9 @@
  13  else
  14  ifeq ($(shell uname), Linux)
  15     PTHREAD_LIBS?=-lpthread
  16 -#   PCAP_LIB=-lpcap
  17 -   CFLAGS+=-I/usr/include -I. $(PTHREAD_CFLAGS)
  18 -   LIBS=-L/usr/lib -L. /usr/lib/libelf.a $(PTHREAD_LIBS)
  19 +   PCAP_LIB=-lpcap
  20 +   CFLAGS+=-I. $(PTHREAD_CFLAGS)
  21 +   LIBS=-L. -lelf $(PTHREAD_LIBS)
  22     DESTDIR=/usr
  23  else
  24  ifeq ($(shell uname -s), Darwin)
  25 @@ -201,15 +201,15 @@
  26  $(PROG): mips64_microcode_dump.inc ppc32_microcode_dump.inc \
  27         $(LEX_C) $(C_OBJS) $(A_OBJS)
  28         @echo "Linking $@"
  29 -       @$(CC) -o $@ $(C_OBJS) $(A_OBJS) $(LIBS)
  30 +       $(CC) -o $@ $(C_OBJS) $(A_OBJS) $(LIBS)
  31
  32  udp_send$(BIN_EXT): udp_send.c net.c
  33         @echo "Linking $@"
  34 -       @$(CC) -Wall $(CFLAGS) -o $@ udp_send.c net.c $(LIBS)
  35 +       $(CC) -Wall $(CFLAGS) -o $@ udp_send.c net.c $(LIBS)
  36
  37  rom2c$(BIN_EXT): rom2c.c
  38         @echo "Linking $@"
  39 -       @$(CC) -Wall $(CFLAGS) -o $@ rom2c.c $(LIBS)
  40 +       $(CC) -Wall $(CFLAGS) -o $@ rom2c.c $(LIBS)
  41
  42  mips64_microcode_dump.inc: rom2c$(BIN_EXT) mips64_microcode
  43         @./rom2c mips64_microcode mips64_microcode_dump.inc 0xbfc00000
  44 @@ -219,7 +219,7 @@
  45
  46  asmdefs$(BIN_EXT): asmdefs.c mips64.h
  47         @echo "Linking $@"
  48 -       @$(CC) -Wall $(CFLAGS) -o $@ asmdefs.c
  49 +       $(CC) -Wall $(CFLAGS) -o $@ asmdefs.c
  50
  51  asmdefs.h: asmdefs$(BIN_EXT)
  52         @echo "Building assembly definitions header file"
  53 @@ -227,7 +227,7 @@
  54
  55  nvram_export$(BIN_EXT): nvram_export.c
  56         @echo "Linking $@"
  57 -       @$(CC) -Wall $(CFLAGS) -o $@ nvram_export.c
  58 +       $(CC) -Wall $(CFLAGS) -o $@ nvram_export.c
  59
  60  install: $(PROG) nvram_export
  61         @echo "Installing"
  62 @@ -261,11 +261,11 @@
  63
  64  .S.o:
  65         @echo "Assembling $<"
  66 -       @$(CC) $(CFLAGS) $(INCLUDE) -c -o $*.o $<
  67 +       $(CC) $(CFLAGS) $(INCLUDE) -c -o $*.o $<
  68
  69  .c.o:
  70         @echo "Compiling $<"
  71 -       @$(CC) $(CFLAGS) $(INCLUDE) -c -o $*.o $<
  72 +       $(CC) $(CFLAGS) $(INCLUDE) -c -o $*.o $<
  73
  74  .l.c:
  75         $(LEX) -o$*.c $<