Deleted Added
full compact
Makefile (227726) Makefile (235156)
1# $FreeBSD: head/sys/boot/i386/loader/Makefile 227726 2011-11-19 14:42:06Z miwi $
1# $FreeBSD: head/sys/boot/i386/loader/Makefile 235156 2012-05-09 08:07:08Z avg $
2
3.include <bsd.own.mk>
4MK_SSP= no
5
6LOADER?= loader
7PROG= ${LOADER}.sym
8INTERNALPROG=
9NEWVERSWHAT?= "bootstrap loader" x86

--- 5 unchanged lines hidden (view full) ---

15.if defined(LOADER_FIREWIRE_SUPPORT)
16CFLAGS+= -DLOADER_FIREWIRE_SUPPORT
17LIBFIREWIRE= ${.OBJDIR}/../libfirewire/libfirewire.a
18.endif
19
20# Set by zfsloader Makefile
21.if defined(LOADER_ZFS_SUPPORT)
22CFLAGS+= -DLOADER_ZFS_SUPPORT
2
3.include <bsd.own.mk>
4MK_SSP= no
5
6LOADER?= loader
7PROG= ${LOADER}.sym
8INTERNALPROG=
9NEWVERSWHAT?= "bootstrap loader" x86

--- 5 unchanged lines hidden (view full) ---

15.if defined(LOADER_FIREWIRE_SUPPORT)
16CFLAGS+= -DLOADER_FIREWIRE_SUPPORT
17LIBFIREWIRE= ${.OBJDIR}/../libfirewire/libfirewire.a
18.endif
19
20# Set by zfsloader Makefile
21.if defined(LOADER_ZFS_SUPPORT)
22CFLAGS+= -DLOADER_ZFS_SUPPORT
23LIBZFS= ${.OBJDIR}/../../zfs/libzfsboot.a
24.else
25LIBZFS=
23LIBZFSBOOT= ${.OBJDIR}/../../zfs/libzfsboot.a
26.endif
27
28# Enable PXE TFTP or NFS support, not both.
29.if defined(LOADER_TFTP_SUPPORT)
30CFLAGS+= -DLOADER_TFTP_SUPPORT
31.else
32CFLAGS+= -DLOADER_NFS_SUPPORT
33.endif

--- 80 unchanged lines hidden (view full) ---

114.if !exists(${DESTDIR}/boot/menu.rc)
115FILES+= menu.rc
116.endif
117.endif
118
119# XXX crt0.o needs to be first for pxeboot(8) to work
120OBJS= ${BTXCRT}
121
24.endif
25
26# Enable PXE TFTP or NFS support, not both.
27.if defined(LOADER_TFTP_SUPPORT)
28CFLAGS+= -DLOADER_TFTP_SUPPORT
29.else
30CFLAGS+= -DLOADER_NFS_SUPPORT
31.endif

--- 80 unchanged lines hidden (view full) ---

112.if !exists(${DESTDIR}/boot/menu.rc)
113FILES+= menu.rc
114.endif
115.endif
116
117# XXX crt0.o needs to be first for pxeboot(8) to work
118OBJS= ${BTXCRT}
119
122DPADD= ${LIBFICL} ${LIBFIREWIRE} ${LIBZFS} ${LIBI386} ${LIBSTAND}
123LDADD= ${LIBFICL} ${LIBFIREWIRE} ${LIBZFS} ${LIBI386} ${LIBSTAND}
120DPADD= ${LIBFICL} ${LIBFIREWIRE} ${LIBZFSBOOT} ${LIBI386} ${LIBSTAND}
121LDADD= ${LIBFICL} ${LIBFIREWIRE} ${LIBZFSBOOT} ${LIBI386} ${LIBSTAND}
124
125.include <bsd.prog.mk>
126
127.if ${MACHINE_CPUARCH} == "amd64"
128beforedepend ${OBJS}: machine
129CLEANFILES+= machine
130machine:
131 ln -sf ${.CURDIR}/../../../i386/include machine
132.endif
122
123.include <bsd.prog.mk>
124
125.if ${MACHINE_CPUARCH} == "amd64"
126beforedepend ${OBJS}: machine
127CLEANFILES+= machine
128machine:
129 ln -sf ${.CURDIR}/../../../i386/include machine
130.endif