mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-28 10:10:29 +00:00
Big cleanups and code reduction.
This commit is contained in:
1 parent
8fa9d1fb3a
commit
90ed71c809
37 files changed
+494
-387
No files matched your search
+3
-2
@@ -1,5 +1,3 @@
|
||||
AUTOMAKE_OPTIONS = gnits
|
||||
|
||||
EXTRA_PROGRAMS = grub
|
||||
sbin_PROGRAMS = $(sbingrub)
|
||||
CLEANFILES = $(EXTRA_PROGRAMS)
|
||||
@@ -10,4 +8,7 @@ grub_SOURCES = main.c asmstub.c
|
||||
grub_LDADD = boot.o common.o char_io.o cmdline.o disk_io.o gunzip.o \
|
||||
fsys_ffs.o fsys_ext2fs.o fsys_fat.o stage2.o
|
||||
|
||||
# FIXME: Automake hackery.
|
||||
DEP_FILES = .deps/main.P .deps/asmstub.P $(wildcard .deps/*.P)
|
||||
|
||||
@SHARED_SRC_RULES@
|
||||
+7
-5
@@ -65,11 +65,11 @@ MAKEINFO = @MAKEINFO@
|
||||
OBJCOPY = @OBJCOPY@
|
||||
PACKAGE = @PACKAGE@
|
||||
VERSION = @VERSION@
|
||||
host_cpu = @host_cpu@
|
||||
host_vendor = @host_vendor@
|
||||
sbingrub = @sbingrub@
|
||||
stage2debug = @stage2debug@
|
||||
|
||||
AUTOMAKE_OPTIONS = gnits
|
||||
|
||||
EXTRA_PROGRAMS = grub
|
||||
sbin_PROGRAMS = $(sbingrub)
|
||||
CLEANFILES = $(EXTRA_PROGRAMS)
|
||||
@@ -79,6 +79,9 @@ INCLUDES = -I$(top_srcdir)/shared_src
|
||||
grub_SOURCES = main.c asmstub.c
|
||||
grub_LDADD = boot.o common.o char_io.o cmdline.o disk_io.o gunzip.o \
|
||||
fsys_ffs.o fsys_ext2fs.o fsys_fat.o stage2.o
|
||||
|
||||
# FIXME: Automake hackery.
|
||||
DEP_FILES = .deps/main.P .deps/asmstub.P $(wildcard .deps/*.P)
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
CONFIG_CLEAN_FILES =
|
||||
PROGRAMS = $(sbin_PROGRAMS)
|
||||
@@ -102,7 +105,6 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
||||
|
||||
TAR = tar
|
||||
GZIP = --best
|
||||
DEP_FILES = .deps/asmstub.P .deps/main.P
|
||||
SOURCES = $(grub_SOURCES)
|
||||
OBJECTS = $(grub_OBJECTS)
|
||||
|
||||
@@ -111,7 +113,7 @@ all: Makefile $(PROGRAMS)
|
||||
.SUFFIXES:
|
||||
.SUFFIXES: .S .c .o .s
|
||||
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
|
||||
cd $(top_srcdir) && $(AUTOMAKE) --gnits grub/Makefile
|
||||
cd $(top_srcdir) && $(AUTOMAKE) --gnu grub/Makefile
|
||||
|
||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
|
||||
cd $(top_builddir) \
|
||||
@@ -197,7 +199,7 @@ distdir: $(DISTFILES)
|
||||
top_distdir=`cd $(top_distdir) && pwd`; \
|
||||
distdir=`cd $(distdir) && pwd`; \
|
||||
cd $(top_srcdir) \
|
||||
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnits grub/Makefile
|
||||
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu grub/Makefile
|
||||
@for file in $(DISTFILES); do \
|
||||
d=$(srcdir); \
|
||||
test -f $(distdir)/$$file \
|
||||
|
||||
Reference in new issue
Block a user