-rw-r--r-- | Makefile.test | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/Makefile.test b/Makefile.test index a98eb0d..9af15dc 100644 --- a/Makefile.test +++ b/Makefile.test | |||
@@ -35,17 +35,17 @@ $(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs) | |||
35 | cp $(TOPDIR)/def-configs/opie $@; \ | 35 | cp $(TOPDIR)/def-configs/opie $@; \ |
36 | fi; | 36 | fi; |
37 | @$(MAKE) -C scripts/kconfig conf; | 37 | @$(MAKE) -C scripts/kconfig conf; |
38 | ./scripts/kconfig/conf -s ./config.in | 38 | ./scripts/kconfig/conf -s ./config.in |
39 | 39 | ||
40 | # config rules must have the $(configs) var defined | 40 | # config rules must have the $(configs) var defined |
41 | # at the time that they run. we must ensure that .depends.cfgs | 41 | # at the time that they run. we must ensure that .depends.cfgs |
42 | # is built and included by the time we reach this point. | 42 | # is built and included by the time we reach this point. |
43 | 43 | ||
44 | xconfig : | 44 | xconfig : |
45 | $(call descend,scripts/kconfig,qconf) | 45 | $(call descend,scripts/kconfig,qconf) |
46 | LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(TOPDIR)/scripts/kconfig \ | 46 | LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(TOPDIR)/scripts/kconfig \ |
47 | ./scripts/kconfig/qconf ./config.in | 47 | ./scripts/kconfig/qconf ./config.in |
48 | 48 | ||
49 | menuconfig : scripts/lxdialog/lxdialog | 49 | menuconfig : scripts/lxdialog/lxdialog |
50 | $(call descend,scripts/kconfig,mconf) | 50 | $(call descend,scripts/kconfig,mconf) |
51 | ./scripts/kconfig/mconf ./config.in | 51 | ./scripts/kconfig/mconf ./config.in |
@@ -70,25 +70,21 @@ allnoconfig : | |||
70 | $(call descend,scripts/kconfig,conf) | 70 | $(call descend,scripts/kconfig,conf) |
71 | ./scripts/kconfig/conf -n ./config.in | 71 | ./scripts/kconfig/conf -n ./config.in |
72 | 72 | ||
73 | defconfig : | 73 | defconfig : |
74 | $(call descend,scripts/kconfig,conf) | 74 | $(call descend,scripts/kconfig,conf) |
75 | ./scripts/kconfig/conf -d ./config.in | 75 | ./scripts/kconfig/conf -d ./config.in |
76 | 76 | ||
77 | 77 | ||
78 | ifeq ($(if $(filter clean%,$(MAKECMDGOALS)),clean,notclean),notclean) | ||
79 | -include $(TOPDIR)/.config | 78 | -include $(TOPDIR)/.config |
80 | endif | ||
81 | ifeq ($(shell if [ -e $(TOPDIR)/..config.cmd ]; then echo exists; fi),exists) | ||
82 | -include $(TOPDIR)/..config.cmd | 79 | -include $(TOPDIR)/..config.cmd |
83 | endif | ||
84 | ifeq ($(if $(filter clean%,$(MAKECMDGOALS)),clean,notclean),notclean) | ||
85 | -include $(TOPDIR)/.depends | 80 | -include $(TOPDIR)/.depends |
86 | endif | ||
87 | 81 | ||
88 | export QMAKESPEC=$(QMAKESPECSDIR)/qws/$(patsubst "%",%,$(CONFIG_SPECFILE)) | 82 | export QMAKESPEC=$(QMAKESPECSDIR)/qws/$(patsubst "%",%,$(CONFIG_SPECFILE)) |
89 | 83 | ||
90 | all : $(subdir-y) | 84 | all clean: $(subdir-y) |
85 | |||
86 | $(subdir-y) : $(TOPDIR)/stamp-headers $(TOPDIR)/library/custom.h | ||
91 | 87 | ||
92 | $(subdir-y) : $(TOPDIR)/stamp-headers | 88 | clean : $(TOPDIR)/.config |
93 | 89 | ||
94 | include $(TOPDIR)/Rules.make | 90 | include $(TOPDIR)/Rules.make |