Explorar el Código

Makefile: fixup make distclean after kconfig build in BUILD_DIR

We don't actually need to explicitly clean the kconfig stuff, as distclean
already removes the entire BUILD_DIR, but fix up the packag/config makefile
to do the right thing if make clean/distclean is called manually for
completeness.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Peter Korsgaard hace 15 años
padre
commit
8e29430410
Se han modificado 2 ficheros con 4 adiciones y 4 borrados
  1. 0 1
      Makefile
  2. 4 3
      package/config/Makefile

+ 0 - 1
Makefile

@@ -578,7 +578,6 @@ ifeq ($(O),output)
 	rm -rf $(O)
 endif
 	rm -rf $(CONFIG_DIR)/.config $(CONFIG_DIR)/.config.old $(CONFIG_DIR)/.config.cmd $(CONFIG_DIR)/.auto.deps
-	-$(MAKE) -C $(CONFIG) distclean
 
 flush:
 	rm -f $(BUILD_DIR)/tgt-config.cache

+ 4 - 3
package/config/Makefile

@@ -2,6 +2,7 @@ src := .
 top_srcdir=../../
 top_builddir=../../
 srctree := .
+obj ?= .
 
 include Makefile.kconfig
 #HOSTCFLAGS+=-Dinline="" -include foo.h
@@ -42,11 +43,11 @@ $(obj)/%:: $(src)/%_shipped
 	$(Q)cat $< > $@
 
 clean:
-	$(Q)rm -f $(clean-files)
+	$(Q)rm -f $(addprefix $(obj)/,$(clean-files))
 distclean: clean
-	$(Q)rm -f $(lxdialog) $(conf-objs) $(mconf-objs) $(kxgettext-objs) \
+	$(Q)rm -f $(addprefix $(obj)/,$(lxdialog) $(conf-objs) $(mconf-objs) $(kxgettext-objs) \
 		$(hostprogs-y) $(qconf-cxxobjs) $(qconf-objs) $(gconf-objs) \
-		mconf .depend
+		mconf .depend)
 
 FORCE:
 .PHONY: FORCE clean distclean