diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2014-08-23 22:12:21 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2014-08-23 22:12:21 -0400 |
| commit | 8cd497a117e918617990cccb9477c73ec5d60f53 (patch) | |
| tree | 82d4d6fc8bd4884a9768f3837ac51ec76fc27063 | |
| parent | 662d05d313bbd6bbf4c867c04a1352a858fc3f53 (diff) | |
| download | kutter-8cd497a117e918617990cccb9477c73ec5d60f53.tar.gz kutter-8cd497a117e918617990cccb9477c73ec5d60f53.tar.xz kutter-8cd497a117e918617990cccb9477c73ec5d60f53.zip | |
build: Update kconfig to work outside of kbuild make system.
Minor tweaks to the kconfig Makefile to work with local build system.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
| -rw-r--r-- | scripts/kconfig/Makefile | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 9c4d2412..1c129361 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -33,8 +33,9 @@ oldconfig: $(obj)/conf $< --$@ $(Kconfig) silentoldconfig: $(obj)/conf + @echo " Build Kconfig config file" $(Q)mkdir -p include/config include/generated - $< --$@ $(Kconfig) + $(Q)$< --$@ $(Kconfig) localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf $(Q)mkdir -p include/config include/generated @@ -94,12 +95,8 @@ savedefconfig: $(obj)/conf $< --$@=defconfig $(Kconfig) defconfig: $(obj)/conf -ifeq ($(KBUILD_DEFCONFIG),) - $< --defconfig $(Kconfig) -else - @echo "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'" - $(Q)$< --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig) -endif + @echo " Build default config" + $(Q)$< --defconfig=/dev/null $(Kconfig) %_defconfig: $(obj)/conf $(Q)$< --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig) @@ -319,3 +316,16 @@ $(obj)/%.moc: $(src)/%.h $(obj)/.tmp_qtcheck $(obj)/gconf.glade.h: $(obj)/gconf.glade $(Q)intltool-extract --type=gettext/glade --srcdir=$(srctree) \ $(obj)/gconf.glade + +VPATH := $(srctree) + +$(obj)/%:: $(src)/%_shipped + $(Q)cat $< > $@ + +host-cobjs := $(sort $(foreach m,$(hostprogs-y),$($(m)-objs))) +host-cobjs := $(addprefix $(obj)/,$(host-cobjs)) +hostprogs-y := $(addprefix $(obj)/,$(hostprogs-y)) +$(host-cobjs) : $(obj)/%.o : $(src)/%.c + $(Q)$(HOSTCC) -I$(obj) -I$(srctree)/$(src) $(HOSTCFLAGS) $(HOSTCFLAGS_$(@F)) $(HOST_EXTRACFLAGS) -c -o $@ $< +$(hostprogs-y) : $(obj)/% : $(host-cobjs) + $(Q)$(HOSTCC) $(HOSTLDFLAGS) -o $@ $(addprefix $(obj)/,$($(@F)-objs)) $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F)) |