Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
3e27ffa8
Commit
3e27ffa8
authored
Oct 05, 2002
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
http://linux-isdn.bkbits.net/linux-2.5.make
into home.transmeta.com:/home/torvalds/v2.5/linux
parents
727a7d1e
16aadefd
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
24 deletions
+24
-24
Makefile
Makefile
+16
-16
Rules.make
Rules.make
+1
-1
arch/i386/Makefile
arch/i386/Makefile
+5
-5
arch/i386/boot/Makefile
arch/i386/boot/Makefile
+2
-2
No files found.
Makefile
View file @
3e27ffa8
...
@@ -187,7 +187,7 @@ scripts/docproc scripts/fixdep scripts/split-include : scripts ;
...
@@ -187,7 +187,7 @@ scripts/docproc scripts/fixdep scripts/split-include : scripts ;
.PHONY
:
scripts
.PHONY
:
scripts
scripts
:
scripts
:
@
$(
call
descend,scripts,
)
+
@
$(
call
descend,scripts,
)
# Objects we will link into vmlinux / subdirs we need to visit
# Objects we will link into vmlinux / subdirs we need to visit
# ---------------------------------------------------------------------------
# ---------------------------------------------------------------------------
...
@@ -374,7 +374,7 @@ $(sort $(vmlinux-objs)): $(SUBDIRS) ;
...
@@ -374,7 +374,7 @@ $(sort $(vmlinux-objs)): $(SUBDIRS) ;
.PHONY
:
$(SUBDIRS)
.PHONY
:
$(SUBDIRS)
$(SUBDIRS)
:
.hdepend prepare
$(SUBDIRS)
:
.hdepend prepare
@
$(
call
descend,
$@
,
)
+
@
$(
call
descend,
$@
,
)
# Things we need done before we descend to build or make
# Things we need done before we descend to build or make
# module versions are listed in "prepare"
# module versions are listed in "prepare"
...
@@ -397,17 +397,17 @@ targets += arch/$(ARCH)/vmlinux.lds.s
...
@@ -397,17 +397,17 @@ targets += arch/$(ARCH)/vmlinux.lds.s
# ---------------------------------------------------------------------------
# ---------------------------------------------------------------------------
%.s
:
%.c FORCE
%.s
:
%.c FORCE
@
$(
call
descend,
$
(
@D
)
,
$
(
@F
))
+
@
$(
call
descend,
$
(
@D
)
,
$
(
@F
))
%.i
:
%.c FORCE
%.i
:
%.c FORCE
@
$(
call
descend,
$
(
@D
)
,
$
(
@F
))
+
@
$(
call
descend,
$
(
@D
)
,
$
(
@F
))
%.o
:
%.c FORCE
%.o
:
%.c FORCE
@
$(
call
descend,
$
(
@D
)
,
$
(
@F
))
+
@
$(
call
descend,
$
(
@D
)
,
$
(
@F
))
%.lst
:
%.c FORCE
%.lst
:
%.c FORCE
@
$(
call
descend,
$
(
@D
)
,
$
(
@F
))
+
@
$(
call
descend,
$
(
@D
)
,
$
(
@F
))
%.s
:
%.S FORCE
%.s
:
%.S FORCE
@
$(
call
descend,
$
(
@D
)
,
$
(
@F
))
+
@
$(
call
descend,
$
(
@D
)
,
$
(
@F
))
%.o
:
%.S FORCE
%.o
:
%.S FORCE
@
$(
call
descend,
$
(
@D
)
,
$
(
@F
))
+
@
$(
call
descend,
$
(
@D
)
,
$
(
@F
))
# FIXME: The asm symlink changes when $(ARCH) changes. That's
# FIXME: The asm symlink changes when $(ARCH) changes. That's
# hard to detect, but I suppose "make mrproper" is a good idea
# hard to detect, but I suppose "make mrproper" is a good idea
...
@@ -492,7 +492,7 @@ include/linux/modversions.h: scripts/fixdep prepare FORCE
...
@@ -492,7 +492,7 @@ include/linux/modversions.h: scripts/fixdep prepare FORCE
$
(
update-if-changed
)
$
(
update-if-changed
)
$(patsubst %,_sfdep_%,$(SUBDIRS))
:
FORCE
$(patsubst %,_sfdep_%,$(SUBDIRS))
:
FORCE
@
$(
call
descend,
$(
patsubst
_sfdep_%,%,
$@
)
,fastdep
)
+
@
$(
call
descend,
$(
patsubst
_sfdep_%,%,
$@
)
,fastdep
)
else
# !CONFIG_MODVERSIONS
else
# !CONFIG_MODVERSIONS
...
@@ -544,7 +544,7 @@ _modinst_post:
...
@@ -544,7 +544,7 @@ _modinst_post:
.PHONY
:
$(patsubst %
,
_modinst_%
,
$(SUBDIRS))
.PHONY
:
$(patsubst %
,
_modinst_%
,
$(SUBDIRS))
$(patsubst %, _modinst_%, $(SUBDIRS))
:
$(patsubst %, _modinst_%, $(SUBDIRS))
:
@
$(
call
descend,
$(
patsubst
_modinst_%,%,
$@
)
,modules_install
)
+
@
$(
call
descend,
$(
patsubst
_modinst_%,%,
$@
)
,modules_install
)
else
# CONFIG_MODULES
else
# CONFIG_MODULES
...
@@ -642,11 +642,11 @@ ifeq ($(filter-out $(noconfig_targets),$(MAKECMDGOALS)),)
...
@@ -642,11 +642,11 @@ ifeq ($(filter-out $(noconfig_targets),$(MAKECMDGOALS)),)
make_with_config
make_with_config
xconfig
:
xconfig
:
@
$(
call
descend,scripts,scripts/kconfig.tk
)
+
@
$(
call
descend,scripts,scripts/kconfig.tk
)
wish
-f
scripts/kconfig.tk
wish
-f
scripts/kconfig.tk
menuconfig
:
menuconfig
:
@
$(
call
descend,scripts,lxdialog
)
+
@
$(
call
descend,scripts,lxdialog
)
$(CONFIG_SHELL)
$(src)
/scripts/Menuconfig
arch
/
$(ARCH)
/config.in
$(CONFIG_SHELL)
$(src)
/scripts/Menuconfig
arch
/
$(ARCH)
/config.in
config
:
config
:
...
@@ -732,7 +732,7 @@ clean: archclean
...
@@ -732,7 +732,7 @@ clean: archclean
-name
.
\*
.tmp
-o
-name
.
\*
.d
\)
-type
f
-print
\
-name
.
\*
.tmp
-o
-name
.
\*
.d
\)
-type
f
-print
\
|
grep
-v
lxdialog/ | xargs
rm
-f
|
grep
-v
lxdialog/ | xargs
rm
-f
@
rm
-f
$(CLEAN_FILES)
@
rm
-f
$(CLEAN_FILES)
@
$(
call
descend,Documentation/DocBook,clean
)
+
@
$(
call
descend,Documentation/DocBook,clean
)
mrproper
:
clean archmrproper
mrproper
:
clean archmrproper
@
echo
'Making mrproper'
@
echo
'Making mrproper'
...
@@ -741,8 +741,8 @@ mrproper: clean archmrproper
...
@@ -741,8 +741,8 @@ mrproper: clean archmrproper
-type
f
-print
| xargs
rm
-f
-type
f
-print
| xargs
rm
-f
@
rm
-rf
$(MRPROPER_DIRS)
@
rm
-rf
$(MRPROPER_DIRS)
@
rm
-f
$(MRPROPER_FILES)
@
rm
-f
$(MRPROPER_FILES)
@
$(
call
descend,scripts,mrproper
)
+
@
$(
call
descend,scripts,mrproper
)
@
$(
call
descend,Documentation/DocBook,mrproper
)
+
@
$(
call
descend,Documentation/DocBook,mrproper
)
distclean
:
mrproper
distclean
:
mrproper
@
echo
'Making distclean'
@
echo
'Making distclean'
...
@@ -829,7 +829,7 @@ help:
...
@@ -829,7 +829,7 @@ help:
# Documentation targets
# Documentation targets
# ---------------------------------------------------------------------------
# ---------------------------------------------------------------------------
sgmldocs psdocs pdfdocs htmldocs
:
scripts
sgmldocs psdocs pdfdocs htmldocs
:
scripts
@
$(
call
descend,Documentation/DocBook,
$@
)
+
@
$(
call
descend,Documentation/DocBook,
$@
)
# Scripts to check various things for consistency
# Scripts to check various things for consistency
# ---------------------------------------------------------------------------
# ---------------------------------------------------------------------------
...
...
Rules.make
View file @
3e27ffa8
...
@@ -482,7 +482,7 @@ cmd_gzip = gzip -f -9 < $< > $@
...
@@ -482,7 +482,7 @@ cmd_gzip = gzip -f -9 < $< > $@
.PHONY
:
$(subdir-ym)
.PHONY
:
$(subdir-ym)
$(subdir-ym)
:
$(subdir-ym)
:
@
$(
call
descend,
$@
,
$(MAKECMDGOALS)
)
+
@
$(
call
descend,
$@
,
$(MAKECMDGOALS)
)
# Add FORCE to the prequisites of a target to force it to be always rebuilt.
# Add FORCE to the prequisites of a target to force it to be always rebuilt.
# ---------------------------------------------------------------------------
# ---------------------------------------------------------------------------
...
...
arch/i386/Makefile
View file @
3e27ffa8
...
@@ -71,20 +71,20 @@ BOOTIMAGE=arch/i386/boot/bzImage
...
@@ -71,20 +71,20 @@ BOOTIMAGE=arch/i386/boot/bzImage
zImage zlilo zdisk
:
BOOTIMAGE=arch/i386/boot/zImage
zImage zlilo zdisk
:
BOOTIMAGE=arch/i386/boot/zImage
zImage bzImage
:
vmlinux
zImage bzImage
:
vmlinux
@
$(
call
makeboot,
$(BOOTIMAGE)
)
+
@
$(
call
makeboot,
$(BOOTIMAGE)
)
compressed
:
zImage
compressed
:
zImage
zlilo bzlilo
:
vmlinux
zlilo bzlilo
:
vmlinux
@
$(
call
makeboot,BOOTIMAGE
=
$(BOOTIMAGE)
zlilo
)
+
@
$(
call
makeboot,BOOTIMAGE
=
$(BOOTIMAGE)
zlilo
)
zdisk bzdisk
:
vmlinux
zdisk bzdisk
:
vmlinux
@
$(
call
makeboot,BOOTIMAGE
=
$(BOOTIMAGE)
zdisk
)
+
@
$(
call
makeboot,BOOTIMAGE
=
$(BOOTIMAGE)
zdisk
)
install
:
vmlinux
install
:
vmlinux
@
$(
call
makeboot,BOOTIMAGE
=
$(BOOTIMAGE)
install
)
+
@
$(
call
makeboot,BOOTIMAGE
=
$(BOOTIMAGE)
install
)
archclean
:
archclean
:
@
$(
call
makeboot,clean
)
+
@
$(
call
makeboot,clean
)
archmrproper
:
archmrproper
:
arch/i386/boot/Makefile
View file @
3e27ffa8
...
@@ -62,7 +62,7 @@ $(obj)/setup $(obj)/bootsect: %: %.o FORCE
...
@@ -62,7 +62,7 @@ $(obj)/setup $(obj)/bootsect: %: %.o FORCE
$(
call
if_changed,ld
)
$(
call
if_changed,ld
)
$(obj)/compressed/vmlinux
:
FORCE
$(obj)/compressed/vmlinux
:
FORCE
@
$(
call
descend,
$(obj)
/compressed,IMAGE_OFFSET
=
$(IMAGE_OFFSET)
\
+
@
$(
call
descend,
$(obj)
/compressed,IMAGE_OFFSET
=
$(IMAGE_OFFSET)
\
$(obj)
/compressed/vmlinux
)
$(obj)
/compressed/vmlinux
)
...
@@ -83,7 +83,7 @@ clean:
...
@@ -83,7 +83,7 @@ clean:
@
echo
'Cleaning up (boot)'
@
echo
'Cleaning up (boot)'
@
rm
-f
$(
addprefix
$(obj)
/,tools/build vmlinux.bin bvmlinux.bin
\
@
rm
-f
$(
addprefix
$(obj)
/,tools/build vmlinux.bin bvmlinux.bin
\
bootsect zImage bsetup bbootsect bzImage
)
bootsect zImage bsetup bbootsect bzImage
)
@
$(
call
descend,
$(obj)
/compressed
)
clean
+
@
$(
call
descend,
$(obj)
/compressed
)
clean
archhelp
:
archhelp
:
@
echo
'* bzImage - Compressed kernel image (arch/
$(ARCH)
/boot/bzImage)'
@
echo
'* bzImage - Compressed kernel image (arch/
$(ARCH)
/boot/bzImage)'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment