author | mickeyl <mickeyl> | 2003-08-10 15:35:41 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-08-10 15:35:41 (UTC) |
commit | 8fc23aabab70d85a1a082f1e52c7fdea7a932002 (patch) (unidiff) | |
tree | ceac3c8cdcd41e2fe4ad2d87f8c9baae926106fd /Makefile | |
parent | 371c96fa4b2b85bceb8bb91862d355fc14bb971d (diff) | |
download | opie-8fc23aabab70d85a1a082f1e52c7fdea7a932002.zip opie-8fc23aabab70d85a1a082f1e52c7fdea7a932002.tar.gz opie-8fc23aabab70d85a1a082f1e52c7fdea7a932002.tar.bz2 |
fix generated configs for calc2 (which resulted in just an empty menu)
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,109 +1,109 @@ | |||
1 | #!/usr/bin/make -f | 1 | #!/usr/bin/make -f |
2 | 2 | ||
3 | export TOPDIR:=$(shell pwd) | 3 | export TOPDIR:=$(shell pwd) |
4 | 4 | ||
5 | include $(TOPDIR)/Vars.make | 5 | include $(TOPDIR)/Vars.make |
6 | ifneq ($(wildcard $(TOPDIR)/Vars.local),) | 6 | ifneq ($(wildcard $(TOPDIR)/Vars.local),) |
7 | include $(TOPDIR)/Vars.local | 7 | include $(TOPDIR)/Vars.local |
8 | endif | 8 | endif |
9 | 9 | ||
10 | noconfig_targets := xconfig menuconfig config oldconfig randconfig \ | 10 | noconfig_targets := xconfig menuconfig config oldconfig randconfig \ |
11 | defconfig allyesconfig allnoconfig allmodconfig \ | 11 | defconfig allyesconfig allnoconfig allmodconfig \ |
12 | clean-configs $(TOPDIR)/scripts/subst $(TOPDIR)/scripts/filesubst \ | 12 | clean-configs $(TOPDIR)/scripts/subst $(TOPDIR)/scripts/filesubst \ |
13 | ipks | 13 | ipks |
14 | 14 | ||
15 | configs += $(TOPDIR)/core/applets/config.in $(TOPDIR)/core/apps/config.in $(TOPDIR)/core/multimedia/config.in $(TOPDIR)/core/pim/config.in $(TOPDIR)/core/pim/today/plugins/config.in $(TOPDIR)/core/settings/config.in $(TOPDIR)/development/config.in $(TOPDIR)/inputmethods/config.in $(TOPDIR)/libopie/pim/config.in $(TOPDIR)/noncore/applets/config.in $(TOPDIR)/noncore/apps/opie-console/test/config.in $(TOPDIR)/noncore/apps/config.in $(TOPDIR)/noncore/comm/config.in $(TOPDIR)/noncore/decorations/config.in $(TOPDIR)/noncore/games/config.in $(TOPDIR)/noncore/graphics/config.in $(TOPDIR)/noncore/multimedia/config.in $(TOPDIR)/noncore/net/config.in $(TOPDIR)/noncore/net/opietooth/config.in $(TOPDIR)/noncore/settings/config.in $(TOPDIR)/noncore/styles/config.in $(TOPDIR)/noncore/tools/calc2/config.in $(TOPDIR)/noncore/tools/config.in $(TOPDIR)/noncore/todayplugins/config.in | 15 | configs += $(TOPDIR)/core/applets/config.in $(TOPDIR)/core/apps/config.in $(TOPDIR)/core/multimedia/config.in $(TOPDIR)/core/pim/config.in $(TOPDIR)/core/pim/today/plugins/config.in $(TOPDIR)/core/settings/config.in $(TOPDIR)/development/config.in $(TOPDIR)/inputmethods/config.in $(TOPDIR)/libopie/pim/config.in $(TOPDIR)/noncore/applets/config.in $(TOPDIR)/noncore/apps/opie-console/test/config.in $(TOPDIR)/noncore/apps/config.in $(TOPDIR)/noncore/comm/config.in $(TOPDIR)/noncore/decorations/config.in $(TOPDIR)/noncore/games/config.in $(TOPDIR)/noncore/graphics/config.in $(TOPDIR)/noncore/multimedia/config.in $(TOPDIR)/noncore/net/config.in $(TOPDIR)/noncore/net/opietooth/config.in $(TOPDIR)/noncore/settings/config.in $(TOPDIR)/noncore/styles/config.in $(TOPDIR)/noncore/tools/config.in $(TOPDIR)/noncore/todayplugins/config.in |
16 | 16 | ||
17 | # $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs) | 17 | # $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs) |
18 | # in order to have a full set of config.in files. | 18 | # in order to have a full set of config.in files. |
19 | # .depends depends on $(TOPDIR)/.config | 19 | # .depends depends on $(TOPDIR)/.config |
20 | # everything else depends on .depends, to ensure the dependencies are | 20 | # everything else depends on .depends, to ensure the dependencies are |
21 | # intact. | 21 | # intact. |
22 | # | 22 | # |
23 | # NOTE: The order in which things happen in this makefile is | 23 | # NOTE: The order in which things happen in this makefile is |
24 | # -critical-. Do not rearrange this! | 24 | # -critical-. Do not rearrange this! |
25 | 25 | ||
26 | all : $(TOPDIR)/.config | 26 | all : $(TOPDIR)/.config |
27 | 27 | ||
28 | # | 28 | # |
29 | # The IPK creation is a very slow process. If you want to only create some | 29 | # The IPK creation is a very slow process. If you want to only create some |
30 | # IPKs, e.g. the ones in library, then do | 30 | # IPKs, e.g. the ones in library, then do |
31 | #make ipks IPK_START=library | 31 | #make ipks IPK_START=library |
32 | # and then only the *.control files in this directory will be processed | 32 | # and then only the *.control files in this directory will be processed |
33 | ipks: $(OPIEDIR)/scripts/subst $(OPIEDIR)/scripts/filesubst FORCE $(TOPDIR)/.config | 33 | ipks: $(OPIEDIR)/scripts/subst $(OPIEDIR)/scripts/filesubst FORCE $(TOPDIR)/.config |
34 | @find $(OPIEDIR)/$(IPK_START) -type f -name \*.control | ( for ctrl in `cat`; do \ | 34 | @find $(OPIEDIR)/$(IPK_START) -type f -name \*.control | ( for ctrl in `cat`; do \ |
35 | prerm=`echo $$ctrl|sed -e 's,\.control$$,.prerm,'`; \ | 35 | prerm=`echo $$ctrl|sed -e 's,\.control$$,.prerm,'`; \ |
36 | preinst=`echo $$ctrl|sed -e 's,\.control$$,.preinst,'`; \ | 36 | preinst=`echo $$ctrl|sed -e 's,\.control$$,.preinst,'`; \ |
37 | postrm=`echo $$ctrl|sed -e 's,\.control$$,.postrm,'`; \ | 37 | postrm=`echo $$ctrl|sed -e 's,\.control$$,.postrm,'`; \ |
38 | postinst=`echo $$ctrl|sed -e 's,\.control$$,.postinst,'`; \ | 38 | postinst=`echo $$ctrl|sed -e 's,\.control$$,.postinst,'`; \ |
39 | echo "Building ipk of $$ctrl"; \ | 39 | echo "Building ipk of $$ctrl"; \ |
40 | cd $(OPIEDIR); $(OPIEDIR)/scripts/mkipkg --subst=$(OPIEDIR)/scripts/subst --filesubst=$(OPIEDIR)/scripts/filesubst --control=$$ctrl --prerm=$$prerm --preinst=$$preinst --postrm=$$postrm --postinst=$$postinst --strip=$(STRIP) $(OPIEDIR); \ | 40 | cd $(OPIEDIR); $(OPIEDIR)/scripts/mkipkg --subst=$(OPIEDIR)/scripts/subst --filesubst=$(OPIEDIR)/scripts/filesubst --control=$$ctrl --prerm=$$prerm --preinst=$$preinst --postrm=$$postrm --postinst=$$postinst --strip=$(STRIP) $(OPIEDIR); \ |
41 | done ) | 41 | done ) |
42 | 42 | ||
43 | $(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs | 43 | $(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs |
44 | 44 | ||
45 | all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs | 45 | all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs |
46 | 46 | ||
47 | clean-configs : | 47 | clean-configs : |
48 | @echo "Wiping generated config.in files..." | 48 | @echo "Wiping generated config.in files..." |
49 | @-rm -f $(configs) | 49 | @-rm -f $(configs) |
50 | 50 | ||
51 | ifneq ($(wildcard $(TOPDIR)/.depends.cfgs),) | 51 | ifneq ($(wildcard $(TOPDIR)/.depends.cfgs),) |
52 | include $(TOPDIR)/.depends.cfgs | 52 | include $(TOPDIR)/.depends.cfgs |
53 | endif | 53 | endif |
54 | 54 | ||
55 | all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs) | 55 | all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs) |
56 | 56 | ||
57 | $(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs) | 57 | $(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs) |
58 | $(call descend,scripts/kconfig,conf) | 58 | $(call descend,scripts/kconfig,conf) |
59 | @if [ ! -e $@ ]; then \ | 59 | @if [ ! -e $@ ]; then \ |
60 | cp $(TOPDIR)/def-configs/opie $@; \ | 60 | cp $(TOPDIR)/def-configs/opie $@; \ |
61 | fi | 61 | fi |
62 | @$(MAKE) -C scripts/kconfig conf | 62 | @$(MAKE) -C scripts/kconfig conf |
63 | ./scripts/kconfig/conf -s ./config.in | 63 | ./scripts/kconfig/conf -s ./config.in |
64 | 64 | ||
65 | export | 65 | export |
66 | 66 | ||
67 | ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) | 67 | ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) |
68 | 68 | ||
69 | export include-config := 1 | 69 | export include-config := 1 |
70 | 70 | ||
71 | -include $(TOPDIR)/.config | 71 | -include $(TOPDIR)/.config |
72 | -include $(TOPDIR)/.depends | 72 | -include $(TOPDIR)/.depends |
73 | endif | 73 | endif |
74 | 74 | ||
75 | -include $(TOPDIR)/.config.cmd | 75 | -include $(TOPDIR)/.config.cmd |
76 | 76 | ||
77 | SUBDIRS = $(subdir-y) | 77 | SUBDIRS = $(subdir-y) |
78 | 78 | ||
79 | all clean install ipk: $(SUBDIRS) | 79 | all clean install ipk: $(SUBDIRS) |
80 | 80 | ||
81 | lupdate lrelease: | 81 | lupdate lrelease: |
82 | @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done | 82 | @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done |
83 | 83 | ||
84 | opie-lupdate opie-lrelease messages: | 84 | opie-lupdate opie-lrelease messages: |
85 | @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done; | 85 | @for i in $(SUBDIRS); do $(MAKE) -C $$i $@; done; |
86 | 86 | ||
87 | # from kde | 87 | # from kde |
88 | qtmessages: | 88 | qtmessages: |
89 | cd $(QTDIR)/src ; \ | 89 | cd $(QTDIR)/src ; \ |
90 | sed -e "s,#define,," xml/qxml.cpp > qxml_clean.cpp ;\ | 90 | sed -e "s,#define,," xml/qxml.cpp > qxml_clean.cpp ;\ |
91 | find . -name "*.cpp" | grep -v moc_ > list ;\ | 91 | find . -name "*.cpp" | grep -v moc_ > list ;\ |
92 | for file in qfiledialog qcolordialog qprintdialog \ | 92 | for file in qfiledialog qcolordialog qprintdialog \ |
93 | qurloperator qftp qhttp qlocal qerrormessage; do \ | 93 | qurloperator qftp qhttp qlocal qerrormessage; do \ |
94 | grep -v $$file list > list.new && mv list.new list ;\ | 94 | grep -v $$file list > list.new && mv list.new list ;\ |
95 | done ;\ | 95 | done ;\ |
96 | xgettext -C -ktr -kQT_TRANSLATE_NOOP -n `cat list` -o $(OPIEDIR)/qt-messages.pot | 96 | xgettext -C -ktr -kQT_TRANSLATE_NOOP -n `cat list` -o $(OPIEDIR)/qt-messages.pot |
97 | 97 | ||
98 | $(subdir-y) : $(if $(CONFIG_LIBQPE),$(QTDIR)/stamp-headers $(OPIEDIR)/stamp-headers) \ | 98 | $(subdir-y) : $(if $(CONFIG_LIBQPE),$(QTDIR)/stamp-headers $(OPIEDIR)/stamp-headers) \ |
99 | $(if $(CONFIG_LIBQPE-X11),$(QTDIR)/stamp-headers-x11 $(OPIEDIR)/stamp-headers-x11 ) \ | 99 | $(if $(CONFIG_LIBQPE-X11),$(QTDIR)/stamp-headers-x11 $(OPIEDIR)/stamp-headers-x11 ) \ |
100 | $(TOPDIR)/library/custom.h | 100 | $(TOPDIR)/library/custom.h |
101 | 101 | ||
102 | clean : $(TOPDIR)/.config | 102 | clean : $(TOPDIR)/.config |
103 | make -C bin clean | 103 | make -C bin clean |
104 | make -C lib clean | 104 | make -C lib clean |
105 | make -C plugins clean | 105 | make -C plugins clean |
106 | 106 | ||
107 | apidox : doc/generate_apidox | 107 | apidox : doc/generate_apidox |
108 | 108 | ||
109 | include $(TOPDIR)/Rules.make | 109 | include $(TOPDIR)/Rules.make |