--- qemu/roms/SLOF/clients/takeover/Makefile	2018/04/24 18:59:08	1.1
+++ qemu/roms/SLOF/clients/takeover/Makefile	2018/04/24 19:44:53	1.1.1.3
@@ -1,5 +1,5 @@
 # *****************************************************************************
-# * Copyright (c) 2004, 2008 IBM Corporation
+# * Copyright (c) 2004, 2011 IBM Corporation
 # * All rights reserved.
 # * This program and the accompanying materials
 # * are made available under the terms of the BSD License
@@ -16,13 +16,14 @@ SNKDIR = $(TOPCMNDIR)/clients/net-snk
 
 CFLAGS += -fno-builtin -I$(LIBCMNDIR)/libc/include
 CFLAGS += -I$(SNKDIR)/include -I. $(CPUARCHDEF)
-CFLAGS += -I$(INCLBRDDIR) -I.. -I$(INCLCMNDIR)/$(CPUARCH)
+CFLAGS += -I$(INCLBRDDIR) -I$(INCLCMNDIR) -I$(INCLCMNDIR)/$(CPUARCH)
 CFLAGS += -O2 -msoft-float -Wa,-mregnames $(RELEASE)
 
 OBJS = $(SNKDIR)/kernel/kernel.o
 OBJS += $(SNKDIR)/oflib/oflib.o
 OBJS += $(SNKDIR)/libc/time/timer.o
-OBJS += $(LIBCMNDIR)/libc.a entry.o main.o of.elf takeover.o
+OBJS += entry.o main.o of.elf takeover.o
+OBJS += $(LIBCMNDIR)/libelf.a $(LIBCMNDIR)/libc.a
 
 %.o: %.S
 	$(CC) $(CFLAGS) -c $^
@@ -36,8 +37,8 @@ takeover.elf: ppc32wrap.o takeover.elf32
 		$(LDFLAGS) $^ -o $@
 
 takeover.elf64: entry.o main.o takeover.o $(SNKDIR)/libc/time/timer.o of.elf
-	make -C $(LIBCMNDIR) libc
-	make -C $(CLIENTSDIR)
+	$(MAKE) -C $(LIBCMNDIR) libc
+	$(MAKE) -C $(CLIENTSDIR)
 	$(LD) $(LDFLAGS) -o $@ -Tclient.lds $(OBJS)
 
 of.elf: ../../boot_rom.bin
@@ -48,11 +49,11 @@ takeover.elf32: takeover.elf64
 	$(OBJCOPY) --input-target=binary --binary-architecture=powerpc -O elf32-powerpc takeover.tmp $@
 
 ppc32wrap.o: ppc32wrap.S
-	$(CROSS)gcc -m32 -a32 $(CFLAGS) -c $< -o $@
+	$(CROSS)gcc -m32 $(CFLAGS) -c $< -o $@
 
 clean distclean:
-	make -C $(LIBCMNDIR) $@
-	make -C $(CLIENTSDIR) $@
+	$(MAKE) -C $(LIBCMNDIR) $@
+	$(MAKE) -C $(CLIENTSDIR) $@
 	$(RM) *.o *.bin *.elf
 	$(RM) takeover.elf32 takeover.elf64 takeover.tmp
 %.o: %.oco