From ad36ea696f84456ad3bd3d68660a6409a29efbe6 Mon Sep 17 00:00:00 2001 From: deraadt Date: Sun, 13 Jul 2014 21:11:40 +0000 Subject: [PATCH] ugly hanging tabs; ok jasper --- sys/arch/macppc/stand/Makefile | 4 ++-- sys/arch/macppc/stand/boot.mac/Makefile | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sys/arch/macppc/stand/Makefile b/sys/arch/macppc/stand/Makefile index 0c258a8c93c..928524089c6 100644 --- a/sys/arch/macppc/stand/Makefile +++ b/sys/arch/macppc/stand/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2013/11/02 15:51:15 deraadt Exp $ +# $OpenBSD: Makefile,v 1.8 2014/07/13 21:11:40 deraadt Exp $ # $NetBSD: Makefile,v 1.1 1996/09/30 16:34:59 ws Exp $ MANSUBDIR=macppc @@ -25,7 +25,7 @@ libdep: @echo ${.OBJDIR}/${SALIB} ${ZLIB} -${PROG}: +${PROG}: clean:: _SUBDIRUSE diff --git a/sys/arch/macppc/stand/boot.mac/Makefile b/sys/arch/macppc/stand/boot.mac/Makefile index 0457e3acae4..78ce07a9c4d 100644 --- a/sys/arch/macppc/stand/boot.mac/Makefile +++ b/sys/arch/macppc/stand/boot.mac/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.10 2014/07/13 13:07:30 miod Exp $ +# $OpenBSD: Makefile,v 1.11 2014/07/13 21:11:40 deraadt Exp $ # $NetBSD: Makefile,v 1.1 1996/09/30 16:35:05 ws Exp $ S= ${.CURDIR}/../../../.. R= .. .PATH: $(.CURDIR)/$(R) -RELOC= E00000 +RELOC= E00000 ENTRY= _entry NOMAN= PROG= boot.mac @@ -28,7 +28,8 @@ SRCS+= moddi3.c CPPFLAGS+= -I. -I${.CURDIR}/../../.. -I${.CURDIR}/../../../.. CPPFLAGS+= -DRELOC=0x${RELOC} -DCONSPEED=57600 -CPPFLAGS+= -DXCOFF_GLUE # for booting PCI Powermacs +# for booting PCI Powermacs +CPPFLAGS+= -DXCOFF_GLUE CFLAGS+= -fno-pie LIBS!= cd $(.CURDIR)/$(R); $(MAKE) libdep -- 2.20.1