Commit 6f16ca99 authored by Kai Germaschewski's avatar Kai Germaschewski

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 ;)
parent 53065cc8
...@@ -63,7 +63,7 @@ hisax-objs-$(CONFIG_HISAX_ENTERNOW_PCI) += enternow_pci.o amd7930_fn.o ...@@ -63,7 +63,7 @@ hisax-objs-$(CONFIG_HISAX_ENTERNOW_PCI) += enternow_pci.o amd7930_fn.o
hisax-objs += $(hisax-objs-y) hisax-objs += $(hisax-objs-y)
CERT := $(shell md5sum -c md5sums.asc >> /dev/null;echo $$?) CERT := $(shell cd $(src); md5sum -c md5sums.asc > /dev/null 2> /dev/null ;echo $$?)
CFLAGS_cert.o := -DCERTIFICATION=$(CERT) CFLAGS_cert.o := -DCERTIFICATION=$(CERT)
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
...@@ -40,6 +40,6 @@ $(obj)/names.o: $(obj)/devlist.h $(obj)/classlist.h ...@@ -40,6 +40,6 @@ $(obj)/names.o: $(obj)/devlist.h $(obj)/classlist.h
# And that's how to generate them # And that's how to generate them
$(obj)/devlist.h: $(src)/pci.ids $(obj)/gen-devlist $(obj)/devlist.h: $(src)/pci.ids $(obj)/gen-devlist
$(obj)/gen-devlist < $< ( cd $(obj); ./gen-devlist ) < $<
$(obj)/classlist.h: $(obj)/devlist.h $(obj)/classlist.h: $(obj)/devlist.h
...@@ -18,4 +18,4 @@ $(obj)/names.o: $(obj)/devlist.h ...@@ -18,4 +18,4 @@ $(obj)/names.o: $(obj)/devlist.h
# And that's how to generate them # And that's how to generate them
$(obj)/devlist.h: $(src)/zorro.ids $(obj)/gen-devlist $(obj)/devlist.h: $(src)/zorro.ids $(obj)/gen-devlist
$(obj)/gen-devlist < $< ( cd $(obj); ./gen-devlist ) < $<
...@@ -9,18 +9,13 @@ ...@@ -9,18 +9,13 @@
# conmakehash: Create arrays for initializing the kernel console tables # conmakehash: Create arrays for initializing the kernel console tables
# tkparse: Used by xconfig # 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 # The following temporary rule will make sure that people's
# trees get updated to the right permissions, since patch(1) # trees get updated to the right permissions, since patch(1)
# can't do it # can't do it
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
.PHONY: __chmod
__chmod: kernel-doc mkcompile_h makelst
@chmod a+x $^
host-progs := fixdep split-include conmakehash docproc tkparse host-progs := fixdep split-include conmakehash docproc tkparse
tkparse-objs := tkparse.o tkcond.o tkgen.o tkparse-objs := tkparse.o tkcond.o tkgen.o
...@@ -30,7 +25,7 @@ include $(TOPDIR)/Rules.make ...@@ -30,7 +25,7 @@ include $(TOPDIR)/Rules.make
# but it is not worth the effort to generate the dependencies. # but it is not worth the effort to generate the dependencies.
# The alternative solution to always generate it is fairly fast. # The alternative solution to always generate it is fairly fast.
# FORCE it to remake # 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 $@' @echo ' Generating $@'
@( \ @( \
if [ -f /usr/local/bin/wish ]; then \ if [ -f /usr/local/bin/wish ]; then \
...@@ -51,7 +46,7 @@ $(obj)/kconfig.tk: $(srctree)/arch/$(ARCH)/config.in tkparse FORCE ...@@ -51,7 +46,7 @@ $(obj)/kconfig.tk: $(srctree)/arch/$(ARCH)/config.in tkparse FORCE
# Targets hardcoded and wellknow in top-level makefile # Targets hardcoded and wellknow in top-level makefile
.PHONY: lxdialog .PHONY: lxdialog
lxdialog: lxdialog:
$(MAKE) -C lxdialog all $(call descend,lxdialog,)
# fixdep is needed to compile other host programs # fixdep is needed to compile other host programs
$(obj)/split-include $(obj)/docproc $(addprefix $(obj)/,$(tkparse-objs)) \ $(obj)/split-include $(obj)/docproc $(addprefix $(obj)/,$(tkparse-objs)) \
......
...@@ -20,10 +20,14 @@ host-progs := lxdialog ...@@ -20,10 +20,14 @@ host-progs := lxdialog
lxdialog-objs := checklist.o menubox.o textbox.o yesno.o inputbox.o \ lxdialog-objs := checklist.o menubox.o textbox.o yesno.o inputbox.o \
util.o lxdialog.o msgbox.o util.o lxdialog.o msgbox.o
all: ncurses lxdialog EXTRA_TARGETS := lxdialog
first_rule: ncurses
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
.PHONY: ncurses
ncurses: ncurses:
@echo "main() {}" > lxtemp.c @echo "main() {}" > lxtemp.c
@if $(HOSTCC) lxtemp.c $(HOST_LOADLIBES); then \ @if $(HOSTCC) lxtemp.c $(HOST_LOADLIBES); then \
......
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