summaryrefslogtreecommitdiff
path: root/sys/arch/loongson
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2012-11-04 16:30:45 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2012-11-04 16:30:45 +0000
commit6633caad97a1b5886bbb15900db766d4707e3d3d (patch)
tree29c9a926d2bbc416e7a56542028d75361293344a /sys/arch/loongson
parent67a0ec4d319d1d34c1dd7d04db825def9c9d7e64 (diff)
Simplify Makefiles a bit, removing redundant stuff. ok espie@
Diffstat (limited to 'sys/arch/loongson')
-rw-r--r--sys/arch/loongson/stand/boot/Makefile4
-rw-r--r--sys/arch/loongson/stand/boot/Makefile.inc6
2 files changed, 4 insertions, 6 deletions
diff --git a/sys/arch/loongson/stand/boot/Makefile b/sys/arch/loongson/stand/boot/Makefile
index 4d79852d7d1..7af3ad10f83 100644
--- a/sys/arch/loongson/stand/boot/Makefile
+++ b/sys/arch/loongson/stand/boot/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.3 2012/08/31 16:13:59 pascal Exp $
+# $OpenBSD: Makefile,v 1.4 2012/11/04 16:30:44 matthieu Exp $
NOMAN=
#MAN= boot.8
#MLINKS= boot.8 boot.conf.5
.if ${MACHINE} == "loongson"
PROG= boot
-.include "${.CURDIR}/../boot/Makefile.inc"
+.include "${.CURDIR}/Makefile.inc"
.else
NOPROG=
.endif
diff --git a/sys/arch/loongson/stand/boot/Makefile.inc b/sys/arch/loongson/stand/boot/Makefile.inc
index 804b2e456bf..5119b6dcdd0 100644
--- a/sys/arch/loongson/stand/boot/Makefile.inc
+++ b/sys/arch/loongson/stand/boot/Makefile.inc
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.2 2010/02/17 21:25:49 miod Exp $
-
-.include "${.CURDIR}/../Makefile.inc"
+# $OpenBSD: Makefile.inc,v 1.3 2012/11/04 16:30:44 matthieu Exp $
NOMAN=
S= ${.CURDIR}/../../../..
@@ -39,4 +37,4 @@ CLEANFILES+= machine mips64
.endif
${PROG}: ${OBJS} ${LIBSA}
- ${LD} ${LDFLAGS} -o ${PROG} ${OBJS} -L${LIBSADIR} ${LIBSA}
+ ${LD} ${LDFLAGS} -o ${PROG} ${OBJS} ${LIBSA}