diff options
| -rw-r--r-- | lib/libdisk/Makefile | 22 | ||||
| -rw-r--r-- | lib/libdisk/libdisk.3 | 9 | ||||
| -rw-r--r-- | lib/libdisk/libdisk.h | 3 |
3 files changed, 6 insertions, 28 deletions
diff --git a/lib/libdisk/Makefile b/lib/libdisk/Makefile index c47d303..1a38099 100644 --- a/lib/libdisk/Makefile +++ b/lib/libdisk/Makefile @@ -1,11 +1,11 @@ -# $Id: Makefile,v 1.23 1998/12/30 12:06:07 bde Exp $ +# $Id: Makefile,v 1.24 1998/12/30 13:29:11 jkh Exp $ LIB= disk SRCS= blocks.c disklabel.c dkcksum.c chunk.c disk.c change.c \ - create_chunk.c rules.c write_disk.c data.c + create_chunk.c rules.c write_disk.c CFLAGS+= -Wall -CLEANFILES+= tmp.c tst01 tst01.o data.c +CLEANFILES+= tmp.c tst01 tst01.o VPATH= ${.CURDIR}/../../sbin/disklabel NOPROFILE= yes NOSHARED= yes @@ -42,22 +42,6 @@ MLINKS+= libdisk.3 Open_Disk.3 \ .include <bsd.lib.mk> -BOOTS=/boot - -.if ${MACHINE_ARCH} == "i386" -data.c: ${.CURDIR}/libdisk.h ${BOOTS}/boot1 ${BOOTS}/boot2 - file2c 'const unsigned char boot1[] = {' '};' \ - < ${BOOTS}/boot1 > tmp.c - file2c 'const unsigned char boot2[] = {' '};' \ - < ${BOOTS}/boot2 >> tmp.c - mv -f tmp.c data.c -.elif ${MACHINE_ARCH} == "alpha" -data.c: ${.CURDIR}/libdisk.h ${BOOTS}/boot1 - file2c 'const unsigned char boot1[] = {' '};' \ - < ${BOOTS}/boot1 > tmp.c - mv -f tmp.c data.c -.endif - beforeinstall: ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/libdisk.h \ ${DESTDIR}/usr/include/libdisk.h diff --git a/lib/libdisk/libdisk.3 b/lib/libdisk/libdisk.3 index 6b56cf7..5657fd3 100644 --- a/lib/libdisk/libdisk.3 +++ b/lib/libdisk/libdisk.3 @@ -25,7 +25,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $Id: libdisk.3,v 1.6 1998/03/19 07:34:03 charnier Exp $ +.\" $Id: libdisk.3,v 1.7 1998/06/06 05:50:52 jkoshy Exp $ .\" " .Dd March 15, 1996 .Dt LIBDISK 3 @@ -63,7 +63,6 @@ .Sh SYNOPSIS .Fd #include <sys/types.h> .Fd #include <libdisk.h> -.Dv extern const u_char *boot1, boot2; .\" What is the correct way to cause a single line break ??? .Bd -literal .Dv extern const char *chunk_n[]; @@ -263,11 +262,7 @@ is called. .Fn Set_Boot_Blocks sets the boot-blocks for use on this disk. Gets written when .Fn Write_Disk -is called. The external variables -.Dv boot1 -and -.Dv boot2 -contain suitable data to be passed to this function. +is called. .Pp .Fn Write_Disk writes all the MBRs, disklabels, bootblocks and boot managers. diff --git a/lib/libdisk/libdisk.h b/lib/libdisk/libdisk.h index 3ae62ca..91b1817 100644 --- a/lib/libdisk/libdisk.h +++ b/lib/libdisk/libdisk.h @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * -* $Id: libdisk.h,v 1.28 1998/01/20 11:03:15 bde Exp $ +* $Id: libdisk.h,v 1.29 1998/10/06 11:57:08 dfr Exp $ * */ @@ -86,7 +86,6 @@ struct chunk { }; extern const char *chunk_n[]; -extern const u_char boot1[], boot2[]; const char * slice_type_name( int type, int subtype ); |
