summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-01-16 18:42:22 (UTC)
committer kergoth <kergoth>2003-01-16 18:42:22 (UTC)
commit0d4f9c31c5d86e4a2667719fd7d1cba26b00d263 (patch) (unidiff)
treebd355c651cf8a7230027fcae20770aa27e2ec438
parentb1eabaff62a868f00fe2c27b2b963249f0760ace (diff)
downloadopie-0d4f9c31c5d86e4a2667719fd7d1cba26b00d263.zip
opie-0d4f9c31c5d86e4a2667719fd7d1cba26b00d263.tar.gz
opie-0d4f9c31c5d86e4a2667719fd7d1cba26b00d263.tar.bz2
new lkc uses .config.cmd, not ..config.cmd
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 2741105..f61f940 100644
--- a/Makefile
+++ b/Makefile
@@ -46,68 +46,68 @@ $(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs)
46# at the time that they run. we must ensure that .depends.cfgs 46# at the time that they run. we must ensure that .depends.cfgs
47# is built and included by the time we reach this point. 47# is built and included by the time we reach this point.
48 48
49xconfig : 49xconfig :
50 $(call descend,scripts/kconfig,qconf) 50 $(call descend,scripts/kconfig,qconf)
51 LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(TOPDIR)/scripts/kconfig \ 51 LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(TOPDIR)/scripts/kconfig \
52 ./scripts/kconfig/qconf ./config.in 52 ./scripts/kconfig/qconf ./config.in
53 53
54menuconfig : scripts/lxdialog/lxdialog 54menuconfig : scripts/lxdialog/lxdialog
55 $(call descend,scripts/kconfig,mconf) 55 $(call descend,scripts/kconfig,mconf)
56 ./scripts/kconfig/mconf ./config.in 56 ./scripts/kconfig/mconf ./config.in
57 57
58config : 58config :
59 $(call descend,scripts/kconfig,conf) 59 $(call descend,scripts/kconfig,conf)
60 ./scripts/kconfig/conf ./config.in 60 ./scripts/kconfig/conf ./config.in
61 61
62oldconfig : 62oldconfig :
63 $(call descend,scripts/kconfig,conf) 63 $(call descend,scripts/kconfig,conf)
64 ./scripts/kconfig/conf -o ./config.in 64 ./scripts/kconfig/conf -o ./config.in
65 65
66randconfig : 66randconfig :
67 $(call descend,scripts/kconfig,conf) 67 $(call descend,scripts/kconfig,conf)
68 ./scripts/kconfig/conf -r ./config.in 68 ./scripts/kconfig/conf -r ./config.in
69 69
70allyesconfig : 70allyesconfig :
71 $(call descend,scripts/kconfig,conf) 71 $(call descend,scripts/kconfig,conf)
72 ./scripts/kconfig/conf -y ./config.in 72 ./scripts/kconfig/conf -y ./config.in
73 73
74allnoconfig : 74allnoconfig :
75 $(call descend,scripts/kconfig,conf) 75 $(call descend,scripts/kconfig,conf)
76 ./scripts/kconfig/conf -n ./config.in 76 ./scripts/kconfig/conf -n ./config.in
77 77
78defconfig : 78defconfig :
79 $(call descend,scripts/kconfig,conf) 79 $(call descend,scripts/kconfig,conf)
80 ./scripts/kconfig/conf -d ./config.in 80 ./scripts/kconfig/conf -d ./config.in
81 81
82 82
83export 83export
84 84
85ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) 85ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
86 86
87export include-config := 1 87export include-config := 1
88 88
89-include $(TOPDIR)/.config 89-include $(TOPDIR)/.config
90-include $(TOPDIR)/.depends 90-include $(TOPDIR)/.depends
91 91
92endif 92endif
93 93
94-include $(TOPDIR)/..config.cmd 94-include $(TOPDIR)/.config.cmd
95 95
96SUBDIRS = $(subdir-y) 96SUBDIRS = $(subdir-y)
97 97
98export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) 98export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))
99 99
100ifdef CONFIG_OPTIMIZATIONS 100ifdef CONFIG_OPTIMIZATIONS
101export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS)) 101export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS))
102export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE)) 102export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE))
103endif 103endif
104 104
105all clean lupdate lrelease install ipk: $(SUBDIRS) 105all clean lupdate lrelease install ipk: $(SUBDIRS)
106 106
107$(subdir-y) : $(if $(CONFIG_LIBQPE),$(QTDIR)/stamp-headers) \ 107$(subdir-y) : $(if $(CONFIG_LIBQPE),$(QTDIR)/stamp-headers) \
108 $(if $(CONFIG_LIBQPE-X11),$(QTDIR)/stamp-headers-x11) \ 108 $(if $(CONFIG_LIBQPE-X11),$(QTDIR)/stamp-headers-x11) \
109 $(TOPDIR)/library/custom.h 109 $(TOPDIR)/library/custom.h
110 110
111clean : $(TOPDIR)/.config 111clean : $(TOPDIR)/.config
112 112
113include $(TOPDIR)/Rules.make 113include $(TOPDIR)/Rules.make