new lkc uses .config.cmd, not ..config.cmd

author: kergoth <kergoth> 2003-01-16 18:42:22 (UTC)
committer: kergoth <kergoth> 2003-01-16 18:42:22 (UTC)
commit: 0d4f9c31c5d86e4a2667719fd7d1cba26b00d263 (patch) (unidiff)
tree: bd355c651cf8a7230027fcae20770aa27e2ec438
parent: b1eabaff62a868f00fe2c27b2b963249f0760ace (diff)
download: opie-0d4f9c31c5d86e4a2667719fd7d1cba26b00d263.zip
opie-0d4f9c31c5d86e4a2667719fd7d1cba26b00d263.tar.gz
opie-0d4f9c31c5d86e4a2667719fd7d1cba26b00d263.tar.bz2
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)
 # at the time that they run. we must ensure that .depends.cfgs
 # is built and included by the time we reach this point.
 xconfig :
        $(call descend,scripts/kconfig,qconf)
        LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(TOPDIR)/scripts/kconfig \
                ./scripts/kconfig/qconf ./config.in
 menuconfig : scripts/lxdialog/lxdialog
        $(call descend,scripts/kconfig,mconf)
        ./scripts/kconfig/mconf ./config.in
 config :
        $(call descend,scripts/kconfig,conf)
        ./scripts/kconfig/conf ./config.in
 
 oldconfig :
        $(call descend,scripts/kconfig,conf)
        ./scripts/kconfig/conf -o ./config.in
 
 randconfig :
        $(call descend,scripts/kconfig,conf)
        ./scripts/kconfig/conf -r ./config.in
 
 allyesconfig :
        $(call descend,scripts/kconfig,conf)
        ./scripts/kconfig/conf -y ./config.in
 
 allnoconfig :
        $(call descend,scripts/kconfig,conf)
        ./scripts/kconfig/conf -n ./config.in
 
 defconfig :
        $(call descend,scripts/kconfig,conf)
        ./scripts/kconfig/conf -d ./config.in
 export
 ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
 export include-config := 1
 -include $(TOPDIR)/.config
 -include $(TOPDIR)/.depends
 endif
-include $(TOPDIR)/..config.cmd
+-include $(TOPDIR)/.config.cmd
 SUBDIRS = $(subdir-y)
 export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))
 ifdef CONFIG_OPTIMIZATIONS
 export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS))
 export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE))
 endif
 all clean lupdate lrelease install ipk: $(SUBDIRS) 
 $(subdir-y) : $(if $(CONFIG_LIBQPE),$(QTDIR)/stamp-headers) \
        $(if $(CONFIG_LIBQPE-X11),$(QTDIR)/stamp-headers-x11) \
        $(TOPDIR)/library/custom.h
 clean : $(TOPDIR)/.config
 include $(TOPDIR)/Rules.make
author	kergoth <kergoth>	2003-01-16 18:42:22 (UTC)
committer	kergoth <kergoth>	2003-01-16 18:42:22 (UTC)
commit	0d4f9c31c5d86e4a2667719fd7d1cba26b00d263 (patch) (unidiff)
tree	bd355c651cf8a7230027fcae20770aa27e2ec438
parent	b1eabaff62a868f00fe2c27b2b963249f0760ace (diff)
download	opie-0d4f9c31c5d86e4a2667719fd7d1cba26b00d263.zip opie-0d4f9c31c5d86e4a2667719fd7d1cba26b00d263.tar.gz opie-0d4f9c31c5d86e4a2667719fd7d1cba26b00d263.tar.bz2

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
49	xconfig :	49	xconfig :
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
54	menuconfig : scripts/lxdialog/lxdialog	54	menuconfig : 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
58	config :	58	config :
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
62	oldconfig :	62	oldconfig :
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
66	randconfig :	66	randconfig :
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
70	allyesconfig :	70	allyesconfig :
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
74	allnoconfig :	74	allnoconfig :
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
78	defconfig :	78	defconfig :
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
83	export	83	export
84		84
85	ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)	85	ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
86		86
87	export include-config := 1	87	export include-config := 1
88		88
89	-include $(TOPDIR)/.config	89	-include $(TOPDIR)/.config
90	-include $(TOPDIR)/.depends	90	-include $(TOPDIR)/.depends
91		91
92	endif	92	endif
93		93
94	-include $(TOPDIR)/..config.cmd	94	-include $(TOPDIR)/.config.cmd
95		95
96	SUBDIRS = $(subdir-y)	96	SUBDIRS = $(subdir-y)
97		97
98	export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))	98	export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))
99		99
100	ifdef CONFIG_OPTIMIZATIONS	100	ifdef CONFIG_OPTIMIZATIONS
101	export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS))	101	export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS))
102	export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE))	102	export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE))
103	endif	103	endif
104		104
105	all clean lupdate lrelease install ipk: $(SUBDIRS)	105	all 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
111	clean : $(TOPDIR)/.config	111	clean : $(TOPDIR)/.config
112		112
113	include $(TOPDIR)/Rules.make	113	include $(TOPDIR)/Rules.make