diff options
| author | Kai Germaschewski <kai@tp1.ruhr-uni-bochum.de> | 2002-10-02 04:54:37 -0500 |
|---|---|---|
| committer | Kai Germaschewski <kai@tp1.ruhr-uni-bochum.de> | 2002-10-02 04:54:37 -0500 |
| commit | 6f16ca99262e6ccdf4a967f50f5d3a380e65b5d7 (patch) | |
| tree | 12497c639152c5d68b6c7b089cf1f260fadfa224 /scripts | |
| parent | 53065cc8d359213dac5a74bc9104895887f0620a (diff) | |
kbuild: Small quirks for separate obj / src trees
Add a couple of missing $(obj) and the like.
Also, remove the __chmod hack which made some files in the source tree
executable - hopefully, everybody's copy is by now ;)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile | 11 | ||||
| -rw-r--r-- | scripts/lxdialog/Makefile | 6 |
2 files changed, 8 insertions, 9 deletions
diff --git a/scripts/Makefile b/scripts/Makefile index 054afe4ef069..1265d9fca96d 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -9,18 +9,13 @@ # conmakehash: Create arrays for initializing the kernel console tables # tkparse: Used by xconfig -all: fixdep split-include docproc conmakehash __chmod +EXTRA_TARGETS := fixdep split-include docproc conmakehash # The following temporary rule will make sure that people's # trees get updated to the right permissions, since patch(1) # can't do it # --------------------------------------------------------------------------- -.PHONY: __chmod - -__chmod: kernel-doc mkcompile_h makelst - @chmod a+x $^ - host-progs := fixdep split-include conmakehash docproc tkparse tkparse-objs := tkparse.o tkcond.o tkgen.o @@ -30,7 +25,7 @@ include $(TOPDIR)/Rules.make # but it is not worth the effort to generate the dependencies. # The alternative solution to always generate it is fairly fast. # FORCE it to remake -$(obj)/kconfig.tk: $(srctree)/arch/$(ARCH)/config.in tkparse FORCE +$(obj)/kconfig.tk: $(srctree)/arch/$(ARCH)/config.in $(obj)/tkparse FORCE @echo ' Generating $@' @( \ if [ -f /usr/local/bin/wish ]; then \ @@ -51,7 +46,7 @@ $(obj)/kconfig.tk: $(srctree)/arch/$(ARCH)/config.in tkparse FORCE # Targets hardcoded and wellknow in top-level makefile .PHONY: lxdialog lxdialog: - $(MAKE) -C lxdialog all + $(call descend,lxdialog,) # fixdep is needed to compile other host programs $(obj)/split-include $(obj)/docproc $(addprefix $(obj)/,$(tkparse-objs)) \ diff --git a/scripts/lxdialog/Makefile b/scripts/lxdialog/Makefile index 153c8b99ffdd..4d10e93b6be0 100644 --- a/scripts/lxdialog/Makefile +++ b/scripts/lxdialog/Makefile @@ -20,10 +20,14 @@ host-progs := lxdialog lxdialog-objs := checklist.o menubox.o textbox.o yesno.o inputbox.o \ util.o lxdialog.o msgbox.o -all: ncurses lxdialog +EXTRA_TARGETS := lxdialog + +first_rule: ncurses include $(TOPDIR)/Rules.make +.PHONY: ncurses + ncurses: @echo "main() {}" > lxtemp.c @if $(HOSTCC) lxtemp.c $(HOST_LOADLIBES); then \ |