Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 108269
b: refs/heads/master
c: 3794f3e
h: refs/heads/master
i:
  108267: c6501f8
v: v3
  • Loading branch information
Randy Dunlap authored and Linus Torvalds committed Aug 12, 2008
1 parent f991307 commit f9a0c10
Show file tree
Hide file tree
Showing 16 changed files with 119 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bc2aa80e18a1b43ea2b8066500006b729c4ba4a7
refs/heads/master: 3794f3e812ef707a4f7931742274d1d0ca6597b4
7 changes: 7 additions & 0 deletions trunk/Documentation/DocBook/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,13 @@ C-procfs-example = procfs_example.xml
C-procfs-example2 = $(addprefix $(obj)/,$(C-procfs-example))
$(obj)/procfs-guide.xml: $(C-procfs-example2)

# List of programs to build
##oops, this is a kernel module::hostprogs-y := procfs_example
obj-m += procfs_example.o

# Tell kbuild to always build the programs
always := $(hostprogs-y)

notfoundtemplate = echo "*** You have to install docbook-utils or xmlto ***"; \
exit 1
db2xtemplate = db2TYPE -o $(dir $@) $<
Expand Down
3 changes: 3 additions & 0 deletions trunk/Documentation/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
obj-m := DocBook/ accounting/ auxdisplay/ connector/ \
filesystems/configfs/ ia64/ networking/ \
pcmcia/ spi/ video4linux/ vm/ watchdog/src/
10 changes: 10 additions & 0 deletions trunk/Documentation/accounting/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# kbuild trick to avoid linker error. Can be omitted if a module is built.
obj- := dummy.o

# List of programs to build
hostprogs-y := getdelays

# Tell kbuild to always build the programs
always := $(hostprogs-y)

HOSTCFLAGS_getdelays.o += -I$(objtree)/usr/include
10 changes: 10 additions & 0 deletions trunk/Documentation/auxdisplay/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# kbuild trick to avoid linker error. Can be omitted if a module is built.
obj- := dummy.o

# List of programs to build
hostprogs-y := cfag12864b-example

# Tell kbuild to always build the programs
always := $(hostprogs-y)

HOSTCFLAGS_cfag12864b-example.o += -I$(objtree)/usr/include
11 changes: 11 additions & 0 deletions trunk/Documentation/connector/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
ifneq ($(CONFIG_CONNECTOR),)
obj-m += cn_test.o
endif

# List of programs to build
hostprogs-y := ucon

# Tell kbuild to always build the programs
always := $(hostprogs-y)

HOSTCFLAGS_ucon.o += -I$(objtree)/usr/include
3 changes: 3 additions & 0 deletions trunk/Documentation/filesystems/configfs/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ifneq ($(CONFIG_CONFIGFS_FS),)
obj-m += configfs_example_explicit.o configfs_example_macros.o
endif
8 changes: 8 additions & 0 deletions trunk/Documentation/ia64/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# kbuild trick to avoid linker error. Can be omitted if a module is built.
obj- := dummy.o

# List of programs to build
hostprogs-y := aliasing-test

# Tell kbuild to always build the programs
always := $(hostprogs-y)
8 changes: 8 additions & 0 deletions trunk/Documentation/networking/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# kbuild trick to avoid linker error. Can be omitted if a module is built.
obj- := dummy.o

# List of programs to build
hostprogs-y := ifenslave

# Tell kbuild to always build the programs
always := $(hostprogs-y)
10 changes: 10 additions & 0 deletions trunk/Documentation/pcmcia/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# kbuild trick to avoid linker error. Can be omitted if a module is built.
obj- := dummy.o

# List of programs to build
hostprogs-y := crc32hash

# Tell kbuild to always build the programs
always := $(hostprogs-y)

HOSTCFLAGS_crc32hash.o += -I$(objtree)/usr/include
11 changes: 11 additions & 0 deletions trunk/Documentation/spi/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# kbuild trick to avoid linker error. Can be omitted if a module is built.
obj- := dummy.o

# List of programs to build
hostprogs-y := spidev_test spidev_fdx

# Tell kbuild to always build the programs
always := $(hostprogs-y)

HOSTCFLAGS_spidev_test.o += -I$(objtree)/usr/include
HOSTCFLAGS_spidev_fdx.o += -I$(objtree)/usr/include
8 changes: 8 additions & 0 deletions trunk/Documentation/video4linux/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# kbuild trick to avoid linker error. Can be omitted if a module is built.
obj- := dummy.o

# List of programs to build
hostprogs-y := v4lgrab

# Tell kbuild to always build the programs
always := $(hostprogs-y)
8 changes: 8 additions & 0 deletions trunk/Documentation/vm/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# kbuild trick to avoid linker error. Can be omitted if a module is built.
obj- := dummy.o

# List of programs to build
hostprogs-y := slabinfo

# Tell kbuild to always build the programs
always := $(hostprogs-y)
8 changes: 8 additions & 0 deletions trunk/Documentation/watchdog/src/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# kbuild trick to avoid linker error. Can be omitted if a module is built.
obj- := dummy.o

# List of programs to build
hostprogs-y := watchdog-simple watchdog-test

# Tell kbuild to always build the programs
always := $(hostprogs-y)
5 changes: 4 additions & 1 deletion trunk/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -821,6 +821,9 @@ ifdef CONFIG_HEADERS_CHECK
endif
ifdef CONFIG_SAMPLES
$(Q)$(MAKE) $(build)=samples
endif
ifdef CONFIG_BUILD_DOCSRC
$(Q)$(MAKE) $(build)=Documentation
endif
$(call vmlinux-modpost)
$(call if_changed_rule,vmlinux__)
Expand Down Expand Up @@ -1166,7 +1169,7 @@ MRPROPER_FILES += .config .config.old include/asm .version .old_version \
#
clean: rm-dirs := $(CLEAN_DIRS)
clean: rm-files := $(CLEAN_FILES)
clean-dirs := $(addprefix _clean_,$(srctree) $(vmlinux-alldirs))
clean-dirs := $(addprefix _clean_,$(srctree) $(vmlinux-alldirs) Documentation)

PHONY += $(clean-dirs) clean archclean
$(clean-dirs):
Expand Down
9 changes: 9 additions & 0 deletions trunk/lib/Kconfig.debug
Original file line number Diff line number Diff line change
Expand Up @@ -735,6 +735,15 @@ config FIREWIRE_OHCI_REMOTE_DMA

If unsure, say N.

menuconfig BUILD_DOCSRC
bool "Build targets in Documentation/ tree"
depends on HEADERS_CHECK
help
This option attempts to build objects from the source files in the
kernel Documentation/ tree.

Say N if you are unsure.

source "samples/Kconfig"

source "lib/Kconfig.kgdb"

0 comments on commit f9a0c10

Please sign in to comment.