Commit a79b7643 authored by Kai Germaschewski's avatar Kai Germaschewski

Merge tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5

into tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5.make
parents b073e7f2 65b809d0
......@@ -48,11 +48,35 @@ ifndef KBUILD_VERBOSE
KBUILD_VERBOSE = 1
endif
# Decide whether to build built-in, modular, or both
# Decide whether to build built-in, modular, or both.
# Normally, just do built-in.
KBUILD_MODULES := 1
KBUILD_MODULES :=
KBUILD_BUILTIN := 1
# If we have only "make modules", don't compile built-in objects.
ifeq ($(MAKECMDGOALS),modules)
KBUILD_BUILTIN :=
endif
# If we have "make <whatever> modules", compile modules
# in addition to whatever we do anyway.
ifneq ($(filter modules,$(MAKECMDGOALS)),)
KBUILD_MODULES := 1
endif
# Just "make" or "make all" shall build modules as well
ifeq ($(MAKECMDGOALS),)
KBUILD_MODULES := 1
endif
ifneq ($(filter all,$(MAKECMDGOALS)),)
KBUILD_MODULES := 1
endif
export KBUILD_MODULES KBUILD_BUILTIN
# Beautify output
......@@ -120,6 +144,8 @@ export CPPFLAGS EXPORT_FLAGS NOSTDINC_FLAGS
export CFLAGS CFLAGS_KERNEL CFLAGS_MODULE
export AFLAGS AFLAGS_KERNEL AFLAGS_MODULE
SUBDIRS := init kernel mm fs ipc lib drivers sound net
noconfig_targets := xconfig menuconfig config oldconfig randconfig \
defconfig allyesconfig allnoconfig allmodconfig \
clean mrproper distclean \
......@@ -182,7 +208,7 @@ endif
# Link components for vmlinux
# ---------------------------------------------------------------------------
SUBDIRS := init kernel mm fs ipc lib drivers sound net
INIT := init/init.o
CORE_FILES := kernel/kernel.o mm/mm.o fs/fs.o ipc/ipc.o
LIBS := lib/lib.a
......@@ -254,6 +280,7 @@ $(SUBDIRS): .hdepend prepare
.PHONY: prepare
prepare: include/linux/version.h include/asm include/config/MARKER
@echo ' Starting the build. KBUILD_BUILTIN=$(KBUILD_BUILTIN) KBUILD_MODULES=$(KBUILD_MODULES)'
# Single targets
# ---------------------------------------------------------------------------
......@@ -384,8 +411,7 @@ MODFLAGS += -include $(HPATH)/linux/modversions.h
endif
.PHONY: modules
modules:
@$(MAKE) KBUILD_BUILTIN= $(SUBDIRS)
modules: $(SUBDIRS)
# Install modules
......@@ -549,6 +575,7 @@ CLEAN_FILES += \
drivers/char/consolemap_deftbl.c drivers/video/promcon_tbl.c \
drivers/char/conmakehash \
drivers/char/drm/*-mod.c \
drivers/char/defkeymap.c drivers/char/qtronixmap.c \
drivers/pci/devlist.h drivers/pci/classlist.h drivers/pci/gen-devlist \
drivers/zorro/devlist.h drivers/zorro/gen-devlist \
sound/oss/bin2hex sound/oss/hex2hex \
......@@ -559,7 +586,9 @@ CLEAN_FILES += \
drivers/scsi/aic7xxx/aicasm/aicasm_scan.c \
drivers/scsi/aic7xxx/aicasm/y.tab.h \
drivers/scsi/aic7xxx/aicasm/aicasm \
drivers/scsi/53c700_d.h \
drivers/scsi/53c700_d.h drivers/scsi/sim710_d.h \
drivers/scsi/53c7xx_d.h drivers/scsi/53c7xx_u.h \
drivers/scsi/53c8xx_d.h drivers/scsi/53c8xx_u.h \
net/khttpd/make_times_h \
net/khttpd/times.h \
submenu*
......
......@@ -22,6 +22,30 @@ else
TOPDIR_REL := $(subst $(space),,$(foreach d,$(subst /, ,$(RELDIR)),../))
endif
# Some paths for the Makefiles to use
# ---------------------------------------------------------------------------
# Usage:
#
# $(obj)/target.o : target.o in the build dir
# $(src)/target.c : target.c in the source dir
# $(objtree)/include/linux/version.h : Some file relative to the build
# dir root
# $(srctree)/include/linux/module.h : Some file relative to the source
# dir root
#
# Those can only be used in the section after
# include $(TOPDIR)/Rules.make, i.e for generated files and the like.
# Intentionally.
#
# We don't support separate source / object yet, so these are just
# placeholders for now
obj := .
src := .
objtree := $(TOPDIR)
srctree := $(TOPDIR)
# Figure out what we need to build from the various variables
# ===========================================================================
......@@ -382,6 +406,13 @@ targets += $(host-progs-single) $(host-progs-multi-objs) $(host-progs-multi)
endif # ! modules_install
endif # ! fastdep
# Shipped files
# ===========================================================================
%:: %_shipped
@echo ' CP $(RELDIR)/$@'
@cp $< $@
# ===========================================================================
# Generic stuff
# ===========================================================================
......
......@@ -110,6 +110,8 @@ vmlinux: arch/i386/vmlinux.lds
.PHONY: zImage bzImage compressed zlilo bzlilo zdisk bzdisk install \
clean archclean archmrproper
all: bzImage
zImage: vmlinux
@$(MAKEBOOT) zImage
......
......@@ -216,13 +216,11 @@ host-progs := conmakehash
include $(TOPDIR)/Rules.make
consolemap_deftbl.c: $(FONTMAPFILE) conmakehash
./conmakehash $< > $@
$(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE) $(obj)/conmakehash
$(obj)/conmakehash $< > $@
.DELETE_ON_ERROR:
defkeymap.c: defkeymap.map
$(obj)/defkeymap.c: $(src)/defkeymap.map
set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@
qtronixmap.c: qtronixmap.map
$(obj)/qtronixmap.c: $(src)/qtronixmap.map
set -e ; loadkeys --mktable $< | sed -e 's/^static *//' > $@
This diff is collapsed.
......@@ -23,14 +23,14 @@ include $(TOPDIR)/Rules.make
# Dependencies on generates files need to be listed explicitly
sm_afsk1200.o: sm_tbl_afsk1200.h
sm_afsk2400_7.o: sm_tbl_afsk2400_7.h
sm_afsk2400_8.o: sm_tbl_afsk2400_8.h
sm_afsk2666.o: sm_tbl_afsk2666.h
sm_psk4800.o: sm_tbl_psk4800.h
sm_hapn4800.o: sm_tbl_hapn4800.h
sm_fsk9600.o: sm_tbl_fsk9600.h
sm_tbl_%: gentbl
./gentbl
$(obj)/sm_afsk1200.o: $(obj)/sm_tbl_afsk1200.h
$(obj)/sm_afsk2400_7.o: $(obj)/sm_tbl_afsk2400_7.h
$(obj)/sm_afsk2400_8.o: $(obj)/sm_tbl_afsk2400_8.h
$(obj)/sm_afsk2666.o: $(obj)/sm_tbl_afsk2666.h
$(obj)/sm_psk4800.o: $(obj)/sm_tbl_psk4800.h
$(obj)/sm_hapn4800.o: $(obj)/sm_tbl_hapn4800.h
$(obj)/sm_fsk9600.o: $(obj)/sm_tbl_fsk9600.h
$(obj)/sm_tbl_%: $(obj)/gentbl
$<
......@@ -34,7 +34,13 @@ host-progs := gen-devlist
include $(TOPDIR)/Rules.make
names.o: devlist.h classlist.h
# Dependencies on generated files need to be listed explicitly
devlist.h classlist.h: pci.ids gen-devlist
./gen-devlist <pci.ids
$(obj)/names.o: $(obj)/devlist.h $(obj)/classlist.h
# And that's how to generate them
$(obj)/devlist.h: $(src)/pci.ids $(obj)/gen-devlist
$(obj)/gen-devlist < $<
$(obj)/classlist.h: $(obj)/devlist.h
This diff is collapsed.
This diff is collapsed.
#undef A_NCR53c7xx_msg_abort
#undef A_NCR53c7xx_msg_reject
#undef A_NCR53c7xx_sink
#undef A_NCR53c7xx_zero
#undef A_NOP_insn
#undef A_addr_dsa
#undef A_addr_reconnect_dsa_head
#undef A_addr_scratch
#undef A_addr_temp
#undef A_dmode_memory_to_memory
#undef A_dmode_memory_to_ncr
#undef A_dmode_ncr_to_memory
#undef A_dsa_check_reselect
#undef A_dsa_cmdout
#undef A_dsa_cmnd
#undef A_dsa_datain
#undef A_dsa_dataout
#undef A_dsa_end
#undef A_dsa_fields_start
#undef A_dsa_msgin
#undef A_dsa_msgout
#undef A_dsa_msgout_other
#undef A_dsa_next
#undef A_dsa_restore_pointers
#undef A_dsa_save_data_pointer
#undef A_dsa_select
#undef A_dsa_sscf_710
#undef A_dsa_status
#undef A_dsa_temp_addr_array_value
#undef A_dsa_temp_addr_dsa_value
#undef A_dsa_temp_addr_new_value
#undef A_dsa_temp_addr_next
#undef A_dsa_temp_addr_residual
#undef A_dsa_temp_addr_saved_pointer
#undef A_dsa_temp_addr_saved_residual
#undef A_dsa_temp_lun
#undef A_dsa_temp_next
#undef A_dsa_temp_sync
#undef A_dsa_temp_target
#undef A_emulfly
#undef A_int_debug_break
#undef A_int_debug_panic
#undef A_int_err_check_condition
#undef A_int_err_no_phase
#undef A_int_err_selected
#undef A_int_err_unexpected_phase
#undef A_int_err_unexpected_reselect
#undef A_int_msg_1
#undef A_int_msg_sdtr
#undef A_int_msg_wdtr
#undef A_int_norm_aborted
#undef A_int_norm_command_complete
#undef A_int_norm_disconnected
#undef A_int_norm_emulateintfly
#undef A_int_norm_reselect_complete
#undef A_int_norm_reset
#undef A_int_norm_select_complete
#undef A_int_test_1
#undef A_int_test_2
#undef A_int_test_3
#undef A_msg_buf
#undef A_reconnect_dsa_head
#undef A_reselected_identify
#undef A_reselected_tag
#undef A_saved_dsa
#undef A_schedule
#undef A_test_dest
#undef A_test_src
#undef Ent_accept_message
#undef Ent_cmdout_cmdout
#undef Ent_command_complete
#undef Ent_command_complete_msgin
#undef Ent_data_transfer
#undef Ent_datain_to_jump
#undef Ent_debug_break
#undef Ent_dsa_code_begin
#undef Ent_dsa_code_check_reselect
#undef Ent_dsa_code_fix_jump
#undef Ent_dsa_code_restore_pointers
#undef Ent_dsa_code_save_data_pointer
#undef Ent_dsa_code_template
#undef Ent_dsa_code_template_end
#undef Ent_dsa_schedule
#undef Ent_dsa_zero
#undef Ent_end_data_transfer
#undef Ent_initiator_abort
#undef Ent_msg_in
#undef Ent_msg_in_restart
#undef Ent_other_in
#undef Ent_other_out
#undef Ent_other_transfer
#undef Ent_reject_message
#undef Ent_reselected_check_next
#undef Ent_reselected_ok
#undef Ent_respond_message
#undef Ent_select
#undef Ent_select_msgout
#undef Ent_target_abort
#undef Ent_test_1
#undef Ent_test_2
#undef Ent_test_2_msgout
#undef Ent_wait_reselect
......@@ -131,42 +131,32 @@ cpqfc-objs := cpqfcTSinit.o cpqfcTScontrol.o cpqfcTSi2c.o \
include $(TOPDIR)/Rules.make
53c7,8xx.o: 53c8xx_d.h 53c8xx_u.h
53c7xx.o: 53c7xx_d.h 53c7xx_u.h
sim710.o: sim710_d.h
53c700.o $(MODVERDIR)/53c700.ver: 53c700_d.h
# If you want to play with the firmware, uncomment
# GENERATE_FIRMWARE := 1
ifdef GENERATE_FIRMWARE
53c8xx_d.h: 53c7,8xx.scr script_asm.pl
ln -sf 53c7,8xx.scr fake8.c
$(CPP) $(CPPFLAGS) -traditional -DCHIP=810 fake8.c | grep -v '^#' | $(PERL) script_asm.pl
mv script.h 53c8xx_d.h
mv scriptu.h 53c8xx_u.h
rm fake8.c
$(CPP) -traditional -DCHIP=810 - < $< | grep -v '^#' | $(PERL) script_asm.pl $@ $(@:_d.h=_u.h)
53c8xx_u.h: 53c8xx_d.h
53c7,8xx.o: 53c8xx_u.h
53c7xx_d.h: 53c7xx.scr script_asm.pl
ln -sf 53c7xx.scr fake7.c
$(CPP) $(CPPFLAGS) -traditional -DCHIP=710 fake7.c | grep -v '^#' | $(PERL) -s script_asm.pl -ncr7x0_family
mv script.h 53c7xx_d.h
mv scriptu.h 53c7xx_u.h
rm fake7.c
$(CPP) -traditional -DCHIP=710 - < $< | grep -v '^#' | $(PERL) -s script_asm.pl -ncr7x0_family $@ $(@:_d.h=_u.h)
53c7xx_u.h: 53c7xx_d.h
53c7xx.o : 53c7xx_d.h
sim710_d.h: sim710.scr script_asm.pl
ln -sf sim710.scr fake7.c
$(CPP) $(CPPFLAGS) -traditional -DCHIP=710 fake7.c | grep -v '^#' | $(PERL) -s script_asm.pl -ncr7x0_family
mv script.h sim710_d.h
mv scriptu.h sim710_u.h
rm fake7.c
$(CPP) -traditional -DCHIP=710 - < $< | grep -v '^#' | $(PERL) -s script_asm.pl -ncr7x0_family $@ $(@:_d.h=_u.h)
sim710_u.h: sim710_d.h
sim710.o : sim710_d.h
53c700_d.h: 53c700.scr script_asm.pl
$(PERL) -s script_asm.pl -ncr7x0_family < 53c700.scr
rm -f scriptu.h
mv script.h 53c700_d.h
$(PERL) -s script_asm.pl -ncr7x0_family $@ $(@:_d.h=_u.h) < $<
53c700.o: 53c700_d.h
endif
\ No newline at end of file
......@@ -33,12 +33,8 @@ ifeq ($(CONFIG_AIC7XXX_BUILD_FIRMWARE),y)
aic7xxx_seq.h aic7xxx_reg.h: aic7xxx.seq aic7xxx.reg aicasm/aicasm
aicasm/aicasm -I. -r aic7xxx_reg.h -o aic7xxx_seq.h aic7xxx.seq
else
aic7xxx_seq.h aic7xxx_reg.h: %.h : shipped_%.h
cp $< $@
aicasm/aicasm: aicasm/*.[chyl]
$(MAKE) -C aicasm
endif
aicasm/aicasm: aicasm/*.[chyl]
$(MAKE) -C aicasm
......@@ -53,7 +53,8 @@ $debug = 0; # Print general debugging messages
$debug_external = 0; # Print external/forward reference messages
$list_in_array = 1; # Emit original SCRIPTS assembler in comments in
# script.h
$prefix = ''; # define all arrays having this prefix so we
#$prefix; # (set by perl -s)
# define all arrays having this prefix so we
# don't have name space collisions after
# assembling this file in different ways for
# different host adapters
......@@ -382,12 +383,10 @@ print STDERR "looking for data in $conditional\n" if ($debug);
}
}
# Parse command line
foreach $arg (@argv) {
if ($arg =~ /^-prefix\s*=\s*([_a-zA-Z][_a-zA-Z0-9]*)$/i) {
$prefix = $1
}
}
# Parse command line
$output = shift;
$outputu = shift;
# Main loop
while (<STDIN>) {
......
#undef A_dsa_cmnd
#undef A_dsa_datain
#undef A_dsa_dataout
#undef A_dsa_msgin
#undef A_dsa_msgout
#undef A_dsa_select
#undef A_dsa_size
#undef A_dsa_status
#undef A_had_cmdout
#undef A_had_datain
#undef A_had_dataout
#undef A_had_extmsg
#undef A_had_msgin
#undef A_had_msgout
#undef A_had_select
#undef A_had_status
#undef A_int_bad_extmsg1a
#undef A_int_bad_extmsg1b
#undef A_int_bad_extmsg2a
#undef A_int_bad_extmsg2b
#undef A_int_bad_extmsg3a
#undef A_int_bad_extmsg3b
#undef A_int_bad_msg1
#undef A_int_bad_msg2
#undef A_int_bad_msg3
#undef A_int_cmd_bad_phase
#undef A_int_cmd_complete
#undef A_int_data_bad_phase
#undef A_int_disc1
#undef A_int_disc2
#undef A_int_disc3
#undef A_int_msg_sdtr1
#undef A_int_msg_sdtr2
#undef A_int_msg_sdtr3
#undef A_int_no_msgout1
#undef A_int_no_msgout2
#undef A_int_no_msgout3
#undef A_int_not_cmd_complete
#undef A_int_not_rej
#undef A_int_resel_not_msgin
#undef A_int_reselected
#undef A_int_sel_no_ident
#undef A_int_sel_not_cmd
#undef A_int_selected
#undef A_int_status_not_msgin
#undef A_msgin_buf
#undef A_reselected_identify
#undef Ent_do_select
#undef Ent_done_ident
#undef Ent_end_data_trans
#undef Ent_patch_input_data
#undef Ent_patch_new_dsa
#undef Ent_patch_output_data
#undef Ent_reselect
#undef Ent_resume_cmd
#undef Ent_resume_msgin1a
#undef Ent_resume_msgin1b
#undef Ent_resume_msgin2a
#undef Ent_resume_msgin2b
#undef Ent_resume_msgin3a
#undef Ent_resume_msgin3b
#undef Ent_resume_pmm
#undef Ent_resume_rej_ident
#undef Ent_wait_disc1
#undef Ent_wait_disc2
#undef Ent_wait_disc3
#undef Ent_wait_disc_complete
......@@ -122,17 +122,12 @@ obj-$(CONFIG_FBCON_HGA) += fbcon-hga.o
obj-$(CONFIG_FBCON_STI) += fbcon-sti.o
obj-$(CONFIG_FBCON_ACCEL) += fbcon-accel.o
host-progs := ../conmakehash
host-progs := ../char/conmakehash
include $(TOPDIR)/Rules.make
clean:
rm -f core *.o *.a *.s
promcon_tbl.c: prom.uni ../char/conmakehash
../char/conmakehash prom.uni | \
$(obj)/promcon_tbl.c: $(src)/prom.uni $(obj)/../char/conmakehash
$(obj)/../char/conmakehash $< | \
sed -e '/#include <[^>]*>/p' -e 's/types/init/' \
-e 's/dfont\(_uni.*\]\)/promfont\1 __initdata/' > promcon_tbl.c
promcon_tbl.o: promcon_tbl.c $(TOPDIR)/include/linux/types.h
-e 's/dfont\(_uni.*\]\)/promfont\1 __initdata/' > $@
......@@ -11,7 +11,11 @@ host-progs := gen_devlist
include $(TOPDIR)/Rules.make
names.o: devlist.h
# Dependencies on generated files need to be listed explicitly
devlist.h: zorro.ids gen-devlist
./gen-devlist <zorro.ids
$(obj)/names.o: $(obj)/devlist.h
# And that's how to generate them
$(obj)/devlist.h: $(src)/zorro.ids $(obj)/gen-devlist
$(obj)/gen-devlist < $<
......@@ -10,17 +10,13 @@ include $(TOPDIR)/Rules.make
# dependencies on generated files need to be listed explicitly
version.o: ../include/linux/compile.h
# 'make dep' may add a dependency on $(TOPDIR)/include/linux/compile.h
$(TOPDIR)/include/linux/compile.h: ../include/linux/compile.h ;
$(obj)/version.o: $(objtree)/include/linux/compile.h
# compile.h changes depending on hostname, generation number, etc,
# so we regenerate it always.
# mkcompile_h will make sure to only update the
# actual file if its content has changed.
../include/linux/compile.h: FORCE
$(objtree)/include/linux/compile.h: FORCE
@echo -n ' Generating $@'
@../scripts/mkcompile_h $@ "$(ARCH)" "$(CONFIG_SMP)" "$(CC) $(CFLAGS)"
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