[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] Fixups to work with automake 1.6
From: |
Jeremy Katz |
Subject: |
[PATCH] Fixups to work with automake 1.6 |
Date: |
01 Oct 2002 17:16:09 -0400 |
automake 1.6 has AS and ASFLAGS as reserved variables used internally.
The following patch changes them to CCAS and CCASFLAGS per the autotools
documentation.
Cheers,
Jeremy
Index: ChangeLog
===================================================================
RCS file: /cvsroot/grub/grub/ChangeLog,v
retrieving revision 1.522
diff -u -r1.522 ChangeLog
--- ChangeLog 13 Sep 2002 11:49:56 -0000 1.522
+++ ChangeLog 1 Oct 2002 21:09:31 -0000
@@ -1,3 +1,38 @@
+2002-10-01 Jeremy Katz <address@hidden>
+
+ * stage2/Makefile.am (pre_stage2_exec_ASFLAGS): Renamed to ...
+ (pre_stage2_exec_CCASFLAGS): ... this.
+ (e2fs_stage1_5_exec_ASFLAGS): Renamed to ...
+ (e2fs_stage1_5_exec_CCASFLAGS): ... this.
+ (fat_stage1_5_exec_ASFLAGS): Renamed to ...
+ (fat_stage1_5_exec_CCASFLAGS): ... this.
+ (ffs_stage1_5_exec_ASFLAGS): Renamed to ...
+ (ffs_stage1_5_exec_CCASFLAGS): ... this.
+ (minix_stage1_5_exec_ASFLAGS): Renamed to ...
+ (minix_stage1_5_exec_CCASFLAGS): ... this.
+ (reiserfs_stage1_5_exec_ASFLAGS): Renamed to ...
+ (reiserfs_stage1_5_exec_CCASFLAGS): ... this.
+ (vstatfs_stage1_5_exec_ASFLAGS): Renamed to ...
+ (vstatfs_stage1_5_exec_CCASFLAGS): ... this.
+ (jfs_stage1_5_exec_ASFLAGS): Renamed to ...
+ (jfs_stage1_5_exec_CCASFLAGS): ... this.
+ (xfs_stage1_5_exec_ASFLAGS): Renamed to ...
+ (xfs_stage1_5_exec_CCASFLAGS): ... this.
+ (diskless_exec_ASFLAGS): Renamed to ...
+ (diskless_exec_CCASFLAGS): ... this.
+ (nbloader_exec_ASFLAGS): Renamed to ...
+ (nbloader_exec_CCASFLAGS): ... this.
+ (pxeloader_exec_ASFLAGS): Renamed to ...
+ (pxeloader_exec_CCASFLAGS): ... this.
+
+ * stage1/Makefile.am (AM_ASFLAGS): Renamed to ...
+ (AM_CCASFLAGS): ... this.
+
+ * configure.in (ASFLAGS): Renamed to ...
+ (CCASFLAGS): ... this due to automake 1.6 reserved variable.
+ (AS): Renamed to ...
+ (CCAS): ... this due to automake 1.6 reserved variable.
+
2002-09-13 Yoshinori K. Okuji <address@hidden>
* stage2/serial.c (fill_input_buf): Take a new argument NOWAIT.
Index: configure.in
===================================================================
RCS file: /cvsroot/grub/grub/configure.in,v
retrieving revision 1.72
diff -u -r1.72 configure.in
--- configure.in 8 Sep 2002 02:01:14 -0000 1.72
+++ configure.in 1 Oct 2002 21:09:31 -0000
@@ -54,8 +54,8 @@
_AM_DEPENDENCIES(CC)
dnl Because recent automake complains about AS, set it here.
-AS="$CC"
-AC_SUBST(AS)
+CCAS="$CC"
+AC_SUBST(CCAS)
AC_ARG_WITH(binutils,
[ --with-binutils=DIR search the directory DIR to find binutils])
@@ -606,9 +606,9 @@
AC_SUBST(NET_EXTRAFLAGS)
AC_SUBST(NETBOOT_DRIVERS)
-dnl Because recent automake complains about ASFLAGS, set it here.
-ASFLAGS='$(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)'
-AC_SUBST(ASFLAGS)
+dnl Because recent automake complains about CCASFLAGS, set it here.
+CCASFLAGS='$(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)'
+AC_SUBST(CCASFLAGS)
dnl Output.
Index: stage1/Makefile.am
===================================================================
RCS file: /cvsroot/grub/grub/stage1/Makefile.am,v
retrieving revision 1.14
diff -u -r1.14 Makefile.am
--- stage1/Makefile.am 4 Jul 2001 07:33:48 -0000 1.14
+++ stage1/Makefile.am 1 Oct 2002 21:09:31 -0000
@@ -4,7 +4,7 @@
CLEANFILES = $(nodist_pkgdata_DATA)
# We can't use builtins or standard includes.
-AM_ASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc
+AM_CCASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc
LDFLAGS = -nostdlib -Wl,-N,-Ttext,7C00
noinst_PROGRAMS = stage1.exec
Index: stage2/Makefile.am
===================================================================
RCS file: /cvsroot/grub/grub/stage2/Makefile.am,v
retrieving revision 1.39
diff -u -r1.39 Makefile.am
--- stage2/Makefile.am 11 Jun 2002 16:36:54 -0000 1.39
+++ stage2/Makefile.am 1 Oct 2002 21:09:31 -0000
@@ -88,7 +88,7 @@
fsys_vstafs.c fsys_xfs.c gunzip.c hercules.c md5.c serial.c \
smp-imps.c stage2.c
pre_stage2_exec_CFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS)
-pre_stage2_exec_ASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS)
+pre_stage2_exec_CCASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS)
pre_stage2_exec_LDFLAGS = $(PRE_STAGE2_LINK)
if NETBOOT_SUPPORT
@@ -109,7 +109,7 @@
echo "#define STAGE2_SIZE $$6" > stage2_size.h
start_exec_SOURCES = start.S
-start_exec_ASFLAGS = $(STAGE2_COMPILE)
+start_exec_CCASFLAGS = $(STAGE2_COMPILE)
start_exec_LDFLAGS = $(START_LINK)
# XXX: automake doesn't provide a way to specify dependencies for object
@@ -127,7 +127,7 @@
stage1_5.c fsys_ext2fs.c bios.c
e2fs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_EXT2FS=1 \
-DNO_BLOCK_FILES=1
-e2fs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_EXT2FS=1 \
+e2fs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_EXT2FS=1 \
-DNO_BLOCK_FILES=1
e2fs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
@@ -136,7 +136,7 @@
stage1_5.c fsys_fat.c bios.c
fat_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FAT=1 \
-DNO_BLOCK_FILES=1
-fat_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FAT=1 \
+fat_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FAT=1 \
-DNO_BLOCK_FILES=1
fat_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
@@ -145,7 +145,7 @@
stage1_5.c fsys_ffs.c bios.c
ffs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FFS=1 \
-DNO_BLOCK_FILES=1
-ffs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FFS=1 \
+ffs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FFS=1 \
-DNO_BLOCK_FILES=1
ffs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
@@ -154,7 +154,7 @@
stage1_5.c fsys_minix.c bios.c
minix_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_MINIX=1 \
-DNO_BLOCK_FILES=1
-minix_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_MINIX=1 \
+minix_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_MINIX=1 \
-DNO_BLOCK_FILES=1
minix_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
@@ -163,7 +163,7 @@
disk_io.c stage1_5.c fsys_reiserfs.c bios.c
reiserfs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_REISERFS=1 \
-DNO_BLOCK_FILES=1
-reiserfs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_REISERFS=1 \
+reiserfs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_REISERFS=1 \
-DNO_BLOCK_FILES=1
reiserfs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
@@ -172,7 +172,7 @@
disk_io.c stage1_5.c fsys_vstafs.c bios.c
vstafs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_VSTAFS=1 \
-DNO_BLOCK_FILES=1
-vstafs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_VSTAFS=1 \
+vstafs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_VSTAFS=1 \
-DNO_BLOCK_FILES=1
vstafs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
@@ -181,7 +181,7 @@
disk_io.c stage1_5.c fsys_jfs.c bios.c
jfs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_JFS=1 \
-DNO_BLOCK_FILES=1
-jfs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_JFS=1 \
+jfs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_JFS=1 \
-DNO_BLOCK_FILES=1
jfs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
@@ -190,7 +190,7 @@
disk_io.c stage1_5.c fsys_xfs.c bios.c
xfs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_XFS=1 \
-DNO_BLOCK_FILES=1
-xfs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_XFS=1 \
+xfs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_XFS=1 \
-DNO_BLOCK_FILES=1
xfs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
@@ -198,7 +198,7 @@
diskless_exec_SOURCES = $(pre_stage2_exec_SOURCES)
diskless_exec_CFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS) \
-DSUPPORT_DISKLESS=1
-diskless_exec_ASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS) \
+diskless_exec_CCASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS) \
-DSUPPORT_DISKLESS=1
diskless_exec_LDFLAGS = $(PRE_STAGE2_LINK)
diskless_exec_LDADD = ../netboot/libdrivers.a
@@ -210,7 +210,7 @@
# For nbloader target.
nbloader_exec_SOURCES = nbloader.S
-nbloader_exec_ASFLAGS = $(STAGE2_COMPILE)
+nbloader_exec_CCASFLAGS = $(STAGE2_COMPILE)
nbloader_exec_LDFLAGS = $(NBLOADER_LINK)
# XXX: See the comment for start_exec-start.o.
@@ -223,7 +223,7 @@
# For pxeloader target.
pxeloader_exec_SOURCES = pxeloader.S
-pxeloader_exec_ASFLAGS = $(STAGE2_COMPILE)
+pxeloader_exec_CCASFLAGS = $(STAGE2_COMPILE)
pxeloader_exec_LDFLAGS = $(PXELOADER_LINK)
# XXX: See the comment for start_exec-start.o.
- [PATCH] Fixups to work with automake 1.6,
Jeremy Katz <=