Commit 82ef5e24 authored by Kai Germaschewski's avatar Kai Germaschewski

Hand merged.

parents 1b5dd0c2 ead51f68
...@@ -162,7 +162,6 @@ LOG := $(patsubst %.sgml, %.log, $(BOOKS)) ...@@ -162,7 +162,6 @@ LOG := $(patsubst %.sgml, %.log, $(BOOKS))
OUT := $(patsubst %.sgml, %.out, $(BOOKS)) OUT := $(patsubst %.sgml, %.out, $(BOOKS))
clean: clean:
@rm -f core *~
@rm -f $(BOOKS) @rm -f $(BOOKS)
@rm -f $(DVI) $(AUX) $(TEX) $(LOG) $(OUT) @rm -f $(DVI) $(AUX) $(TEX) $(LOG) $(OUT)
@rm -f $(PNG-parportbook) $(EPS-parportbook) @rm -f $(PNG-parportbook) $(EPS-parportbook)
......
...@@ -4,9 +4,9 @@ SUBLEVEL = 41 ...@@ -4,9 +4,9 @@ SUBLEVEL = 41
EXTRAVERSION = EXTRAVERSION =
# *DOCUMENTATION* # *DOCUMENTATION*
# Too see a list of typical targets execute "make help" # To see a list of typical targets execute "make help"
# More info can be located in ./Documentation/kbuild # More info can be located in ./Documentation/kbuild
# Comments in this file is targeted only to the developer, do not # Comments in this file are targeted only to the developer, do not
# expect to learn how to build the kernel reading this file. # expect to learn how to build the kernel reading this file.
# We are using a recursive build, so we need to do a little thinking # We are using a recursive build, so we need to do a little thinking
...@@ -142,7 +142,7 @@ NM = $(CROSS_COMPILE)nm ...@@ -142,7 +142,7 @@ NM = $(CROSS_COMPILE)nm
STRIP = $(CROSS_COMPILE)strip STRIP = $(CROSS_COMPILE)strip
OBJCOPY = $(CROSS_COMPILE)objcopy OBJCOPY = $(CROSS_COMPILE)objcopy
OBJDUMP = $(CROSS_COMPILE)objdump OBJDUMP = $(CROSS_COMPILE)objdump
MAKEFILES = $(TOPDIR)/.config MAKEFILES = .config
GENKSYMS = /sbin/genksyms GENKSYMS = /sbin/genksyms
DEPMOD = /sbin/depmod DEPMOD = /sbin/depmod
KALLSYMS = /sbin/kallsyms KALLSYMS = /sbin/kallsyms
...@@ -387,17 +387,17 @@ targets += arch/$(ARCH)/vmlinux.lds.s ...@@ -387,17 +387,17 @@ targets += arch/$(ARCH)/vmlinux.lds.s
# Single targets # Single targets
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
%.s: %.c FORCE %.s: %.c scripts FORCE
+@$(call descend,$(@D),$@) +@$(call descend,$(@D),$@)
%.i: %.c FORCE %.i: %.c scripts FORCE
+@$(call descend,$(@D),$@) +@$(call descend,$(@D),$@)
%.o: %.c FORCE %.o: %.c scripts FORCE
+@$(call descend,$(@D),$@) +@$(call descend,$(@D),$@)
%.lst: %.c FORCE %.lst: %.c scripts FORCE
+@$(call descend,$(@D),$@) +@$(call descend,$(@D),$@)
%.s: %.S FORCE %.s: %.S scripts FORCE
+@$(call descend,$(@D),$@) +@$(call descend,$(@D),$@)
%.o: %.S FORCE %.o: %.S scripts FORCE
+@$(call descend,$(@D),$@) +@$(call descend,$(@D),$@)
# FIXME: The asm symlink changes when $(ARCH) changes. That's # FIXME: The asm symlink changes when $(ARCH) changes. That's
...@@ -883,7 +883,7 @@ if_changed_dep = $(if $(strip $? $(filter-out FORCE $(wildcard $^),$^)\ ...@@ -883,7 +883,7 @@ if_changed_dep = $(if $(strip $? $(filter-out FORCE $(wildcard $^),$^)\
@set -e; \ @set -e; \
$(if $($(quiet)cmd_$(1)),echo ' $($(quiet)cmd_$(1))';) \ $(if $($(quiet)cmd_$(1)),echo ' $($(quiet)cmd_$(1))';) \
$(cmd_$(1)); \ $(cmd_$(1)); \
$(TOPDIR)/scripts/fixdep $(depfile) $@ $(TOPDIR) '$(cmd_$(1))' > $(@D)/.$(@F).tmp; \ scripts/fixdep $(depfile) $@ '$(cmd_$(1))' > $(@D)/.$(@F).tmp; \
rm -f $(depfile); \ rm -f $(depfile); \
mv -f $(@D)/.$(@F).tmp $(@D)/.$(@F).cmd) mv -f $(@D)/.$(@F).tmp $(@D)/.$(@F).cmd)
......
...@@ -209,10 +209,10 @@ define rule_cc_ver_c ...@@ -209,10 +209,10 @@ define rule_cc_ver_c
$(if $($(quiet)cmd_cc_ver_c),echo ' $($(quiet)cmd_cc_ver_c)';) \ $(if $($(quiet)cmd_cc_ver_c),echo ' $($(quiet)cmd_cc_ver_c)';) \
$(cmd_cc_ver_c); \ $(cmd_cc_ver_c); \
if [ ! -r $(depfile) ]; then exit 1; fi; \ if [ ! -r $(depfile) ]; then exit 1; fi; \
$(TOPDIR)/scripts/fixdep $(depfile) $@ $(TOPDIR) '$(cmd_cc_ver_c)' > $(@D)/.$(@F).tmp; \ scripts/fixdep $(depfile) $@ '$(cmd_cc_ver_c)' > $(@D)/.$(@F).tmp; \
rm -f $(depfile); \ rm -f $(depfile); \
if [ ! -r $@ ] || cmp -s $@ $@.tmp; then \ if [ ! -r $@ ] || cmp -s $@ $@.tmp; then \
touch $(TOPDIR)/include/linux/modversions.h; \ touch include/linux/modversions.h; \
fi; \ fi; \
mv -f $@.tmp $@ mv -f $@.tmp $@
mv -f $(@D)/.$(@F).tmp $(@D)/.$(@F).cmd mv -f $(@D)/.$(@F).tmp $(@D)/.$(@F).cmd
...@@ -312,7 +312,7 @@ cmd_cc_o_c = $(CC) $(c_flags) -c -o $@ $< ...@@ -312,7 +312,7 @@ cmd_cc_o_c = $(CC) $(c_flags) -c -o $@ $<
$(call if_changed_dep,cc_o_c) $(call if_changed_dep,cc_o_c)
quiet_cmd_cc_lst_c = MKLST $(echo_target) quiet_cmd_cc_lst_c = MKLST $(echo_target)
cmd_cc_lst_c = $(CC) $(c_flags) -g -c -o $*.o $< && $(TOPDIR)/scripts/makelst $*.o $(TOPDIR)/System.map $(OBJDUMP) > $@ cmd_cc_lst_c = $(CC) $(c_flags) -g -c -o $*.o $< && sh scripts/makelst $*.o System.map $(OBJDUMP) > $@
%.lst: %.c FORCE %.lst: %.c FORCE
$(call if_changed_dep,cc_lst_c) $(call if_changed_dep,cc_lst_c)
...@@ -561,7 +561,7 @@ if_changed_dep = $(if $(strip $? $(filter-out FORCE $(wildcard $^),$^)\ ...@@ -561,7 +561,7 @@ if_changed_dep = $(if $(strip $? $(filter-out FORCE $(wildcard $^),$^)\
@set -e; \ @set -e; \
$(if $($(quiet)cmd_$(1)),echo ' $($(quiet)cmd_$(1))';) \ $(if $($(quiet)cmd_$(1)),echo ' $($(quiet)cmd_$(1))';) \
$(cmd_$(1)); \ $(cmd_$(1)); \
$(TOPDIR)/scripts/fixdep $(depfile) $@ $(TOPDIR) '$(cmd_$(1))' > $(@D)/.$(@F).tmp; \ scripts/fixdep $(depfile) $@ '$(cmd_$(1))' > $(@D)/.$(@F).tmp; \
rm -f $(depfile); \ rm -f $(depfile); \
mv -f $(@D)/.$(@F).tmp $(@D)/.$(@F).cmd) mv -f $(@D)/.$(@F).tmp $(@D)/.$(@F).cmd)
......
# Adaptec aacraid
EXTRA_CFLAGS += -I$(TOPDIR)/drivers/scsi
obj-$(CONFIG_SCSI_AACRAID) := aacraid.o obj-$(CONFIG_SCSI_AACRAID) := aacraid.o
aacraid-objs := linit.o aachba.o commctrl.o comminit.o commsup.o \ aacraid-objs := linit.o aachba.o commctrl.o comminit.o commsup.o \
......
...@@ -17,4 +17,4 @@ $(obj)/version.o: $(objtree)/include/linux/compile.h ...@@ -17,4 +17,4 @@ $(obj)/version.o: $(objtree)/include/linux/compile.h
$(objtree)/include/linux/compile.h: FORCE $(objtree)/include/linux/compile.h: FORCE
@echo -n ' Generating $@' @echo -n ' Generating $@'
@$(srctree)/scripts/mkcompile_h $@ "$(ARCH)" "$(CONFIG_SMP)" "$(CC) $(CFLAGS)" @sh $(srctree)/scripts/mkcompile_h $@ "$(ARCH)" "$(CONFIG_SMP)" "$(CC) $(CFLAGS)"
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
* *
* It is invoked as * It is invoked as
* *
* fixdep <depfile> <target> <topdir> <cmdline> * fixdep <depfile> <target> <cmdline>
* *
* and will read the dependency file <depfile> * and will read the dependency file <depfile>
* *
...@@ -111,7 +111,6 @@ ...@@ -111,7 +111,6 @@
#define INT_NFIG ntohl(0x4e464947) #define INT_NFIG ntohl(0x4e464947)
#define INT_FIG_ ntohl(0x4649475f) #define INT_FIG_ ntohl(0x4649475f)
char *topdir;
char *target; char *target;
char *depfile; char *depfile;
char *cmdline; char *cmdline;
...@@ -119,7 +118,7 @@ char *cmdline; ...@@ -119,7 +118,7 @@ char *cmdline;
void usage(void) void usage(void)
{ {
fprintf(stderr, "Usage: fixdep <depfile> <target> <topdir> <cmdline>\n"); fprintf(stderr, "Usage: fixdep <depfile> <target> <cmdline>\n");
exit(1); exit(1);
} }
...@@ -364,13 +363,12 @@ int main(int argc, char *argv[]) ...@@ -364,13 +363,12 @@ int main(int argc, char *argv[])
{ {
traps(); traps();
if (argc != 5) if (argc != 4)
usage(); usage();
depfile = argv[1]; depfile = argv[1];
target = argv[2]; target = argv[2];
topdir = argv[3]; cmdline = argv[3];
cmdline = argv[4];
print_cmdline(); print_cmdline();
print_deps(); print_deps();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment