1 --- grub-0.93/configure.in~ 2002-11-29 20:12:08.000000000 +0000
2 +++ grub-0.93/configure.in 2004-01-04 12:03:05.000000000 +0000
6 dnl Because recent automake complains about AS, set it here.
12 --- grub-0.93/stage1/Makefile.am~ 2002-09-08 02:58:08.000000000 +0100
13 +++ grub-0.93/stage1/Makefile.am 2004-01-04 12:31:38.000000000 +0000
15 CLEANFILES = $(nodist_pkgdata_DATA)
17 # We can't use builtins or standard includes.
18 -AM_ASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc
19 +AM_CCASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc $(DEFAULT_INCLUDES)
20 LDFLAGS = -nostdlib -Wl,-N,-Ttext,7C00
22 noinst_PROGRAMS = stage1.exec
23 --- grub-0.93/stage2/Makefile.am~ 2002-11-29 18:00:53.000000000 +0000
24 +++ grub-0.93/stage2/Makefile.am 2004-01-04 12:30:29.000000000 +0000
28 INCLUDES = -I$(top_srcdir)/stage1
29 +AM_CCASFLAGS = $(DEFAULT_INCLUDES) $(INCLUDES)
31 # The library for /sbin/grub.
32 noinst_LIBRARIES = libgrub.a
34 fsys_vstafs.c fsys_xfs.c gunzip.c hercules.c md5.c serial.c \
35 smp-imps.c stage2.c terminfo.c tparm.c
36 pre_stage2_exec_CFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS)
37 -pre_stage2_exec_ASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS)
38 +pre_stage2_exec_CCASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS) $(AM_CCASFLAGS)
39 pre_stage2_exec_LDFLAGS = $(PRE_STAGE2_LINK)
43 echo "#define STAGE2_SIZE $$6" > stage2_size.h
45 start_exec_SOURCES = start.S
46 -start_exec_ASFLAGS = $(STAGE2_COMPILE)
47 +start_exec_CCASFLAGS = $(STAGE2_COMPILE) $(AM_CCASFLAGS)
48 start_exec_LDFLAGS = $(START_LINK)
50 # XXX: automake doesn't provide a way to specify dependencies for object
52 stage1_5.c fsys_ext2fs.c bios.c
53 e2fs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_EXT2FS=1 \
55 -e2fs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_EXT2FS=1 \
57 +e2fs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_EXT2FS=1 \
58 + -DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
59 e2fs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
61 # For fat_stage1_5 target.
63 stage1_5.c fsys_fat.c bios.c
64 fat_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FAT=1 \
66 -fat_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FAT=1 \
68 +fat_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FAT=1 \
69 + -DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
70 fat_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
72 # For ffs_stage1_5 target.
74 stage1_5.c fsys_ffs.c bios.c
75 ffs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FFS=1 \
77 -ffs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FFS=1 \
79 +ffs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_FFS=1 \
80 + -DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
81 ffs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
83 # For minix_stage1_5 target.
85 stage1_5.c fsys_minix.c bios.c
86 minix_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_MINIX=1 \
88 -minix_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_MINIX=1 \
90 +minix_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_MINIX=1 \
91 + -DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
92 minix_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
94 # For reiserfs_stage1_5 target.
96 disk_io.c stage1_5.c fsys_reiserfs.c bios.c
97 reiserfs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_REISERFS=1 \
99 -reiserfs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_REISERFS=1 \
101 +reiserfs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_REISERFS=1 \
102 + -DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
103 reiserfs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
105 # For vstafs_stage1_5 target.
107 disk_io.c stage1_5.c fsys_vstafs.c bios.c
108 vstafs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_VSTAFS=1 \
110 -vstafs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_VSTAFS=1 \
112 +vstafs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_VSTAFS=1 \
113 + -DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
114 vstafs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
116 # For jfs_stage1_5 target.
118 disk_io.c stage1_5.c fsys_jfs.c bios.c
119 jfs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_JFS=1 \
121 -jfs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_JFS=1 \
123 +jfs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_JFS=1 \
124 + -DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
125 jfs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
127 # For xfs_stage1_5 target.
128 @@ -190,16 +191,16 @@
129 disk_io.c stage1_5.c fsys_xfs.c bios.c
130 xfs_stage1_5_exec_CFLAGS = $(STAGE1_5_COMPILE) -DFSYS_XFS=1 \
132 -xfs_stage1_5_exec_ASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_XFS=1 \
134 +xfs_stage1_5_exec_CCASFLAGS = $(STAGE1_5_COMPILE) -DFSYS_XFS=1 \
135 + -DNO_BLOCK_FILES=1 $(AM_CCASFLAGS)
136 xfs_stage1_5_exec_LDFLAGS = $(STAGE1_5_LINK)
138 # For diskless target.
139 diskless_exec_SOURCES = $(pre_stage2_exec_SOURCES)
140 diskless_exec_CFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS) \
142 -diskless_exec_ASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS) \
143 - -DSUPPORT_DISKLESS=1
144 +diskless_exec_CCASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS) \
145 + -DSUPPORT_DISKLESS=1 $(AM_CCASFLAGS)
146 diskless_exec_LDFLAGS = $(PRE_STAGE2_LINK)
147 diskless_exec_LDADD = ../netboot/libdrivers.a
151 # For nbloader target.
152 nbloader_exec_SOURCES = nbloader.S
153 -nbloader_exec_ASFLAGS = $(STAGE2_COMPILE)
154 +nbloader_exec_CCASFLAGS = $(STAGE2_COMPILE) $(AM_CCASFLAGS)
155 nbloader_exec_LDFLAGS = $(NBLOADER_LINK)
157 # XXX: See the comment for start_exec-start.o.
160 # For pxeloader target.
161 pxeloader_exec_SOURCES = pxeloader.S
162 -pxeloader_exec_ASFLAGS = $(STAGE2_COMPILE)
163 +pxeloader_exec_CCASFLAGS = $(STAGE2_COMPILE) $(AM_CCASFLAGS)
164 pxeloader_exec_LDFLAGS = $(PXELOADER_LINK)
166 # XXX: See the comment for start_exec-start.o.