summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-01-16 04:41:29 (UTC)
committer kergoth <kergoth>2003-01-16 04:41:29 (UTC)
commit8485d32aac0500a21d3b9b89df66900b427b57ee (patch) (unidiff)
treefb048c03107230a99a106c5cdd5c5c577032ec1e
parent21cee2677c4a480f00675cdc9160e5d7e97e7122 (diff)
downloadopie-8485d32aac0500a21d3b9b89df66900b427b57ee.zip
opie-8485d32aac0500a21d3b9b89df66900b427b57ee.tar.gz
opie-8485d32aac0500a21d3b9b89df66900b427b57ee.tar.bz2
Move stamp-headers files into qtdir per holger's request some time ago.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile.test4
-rw-r--r--Rules.make8
2 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.test b/Makefile.test
index 7befb39..15cd128 100644
--- a/Makefile.test
+++ b/Makefile.test
@@ -40,71 +40,71 @@ $(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs)
40 fi; 40 fi;
41 @$(MAKE) -C scripts/kconfig conf; 41 @$(MAKE) -C scripts/kconfig conf;
42 ./scripts/kconfig/conf -s ./config.in 42 ./scripts/kconfig/conf -s ./config.in
43 43
44# config rules must have the $(configs) var defined 44# config rules must have the $(configs) var defined
45# at the time that they run. we must ensure that .depends.cfgs 45# at the time that they run. we must ensure that .depends.cfgs
46# is built and included by the time we reach this point. 46# is built and included by the time we reach this point.
47 47
48xconfig : 48xconfig :
49 $(call descend,scripts/kconfig,qconf) 49 $(call descend,scripts/kconfig,qconf)
50 LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(TOPDIR)/scripts/kconfig \ 50 LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(TOPDIR)/scripts/kconfig \
51 ./scripts/kconfig/qconf ./config.in 51 ./scripts/kconfig/qconf ./config.in
52 52
53menuconfig : scripts/lxdialog/lxdialog 53menuconfig : scripts/lxdialog/lxdialog
54 $(call descend,scripts/kconfig,mconf) 54 $(call descend,scripts/kconfig,mconf)
55 ./scripts/kconfig/mconf ./config.in 55 ./scripts/kconfig/mconf ./config.in
56 56
57config : 57config :
58 $(call descend,scripts/kconfig,conf) 58 $(call descend,scripts/kconfig,conf)
59 ./scripts/kconfig/conf ./config.in 59 ./scripts/kconfig/conf ./config.in
60 60
61oldconfig : 61oldconfig :
62 $(call descend,scripts/kconfig,conf) 62 $(call descend,scripts/kconfig,conf)
63 ./scripts/kconfig/conf -o ./config.in 63 ./scripts/kconfig/conf -o ./config.in
64 64
65randconfig : 65randconfig :
66 $(call descend,scripts/kconfig,conf) 66 $(call descend,scripts/kconfig,conf)
67 ./scripts/kconfig/conf -r ./config.in 67 ./scripts/kconfig/conf -r ./config.in
68 68
69allyesconfig : 69allyesconfig :
70 $(call descend,scripts/kconfig,conf) 70 $(call descend,scripts/kconfig,conf)
71 ./scripts/kconfig/conf -y ./config.in 71 ./scripts/kconfig/conf -y ./config.in
72 72
73allnoconfig : 73allnoconfig :
74 $(call descend,scripts/kconfig,conf) 74 $(call descend,scripts/kconfig,conf)
75 ./scripts/kconfig/conf -n ./config.in 75 ./scripts/kconfig/conf -n ./config.in
76 76
77defconfig : 77defconfig :
78 $(call descend,scripts/kconfig,conf) 78 $(call descend,scripts/kconfig,conf)
79 ./scripts/kconfig/conf -d ./config.in 79 ./scripts/kconfig/conf -d ./config.in
80 80
81 81
82export 82export
83 83
84ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) 84ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
85 85
86export include-config := 1 86export include-config := 1
87 87
88-include $(TOPDIR)/.config 88-include $(TOPDIR)/.config
89-include $(TOPDIR)/.depends 89-include $(TOPDIR)/.depends
90 90
91endif 91endif
92 92
93-include $(TOPDIR)/..config.cmd 93-include $(TOPDIR)/..config.cmd
94 94
95export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE)) 95export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))
96 96
97ifdef CONFIG_OPTIMIZATIONS 97ifdef CONFIG_OPTIMIZATIONS
98export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS)) 98export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS))
99export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE)) 99export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE))
100endif 100endif
101 101
102all clean: $(subdir-y) 102all clean: $(subdir-y)
103 103
104$(subdir-y) : $(if $(CONFIG_LIBQPE),$(TOPDIR)/stamp-headers) \ 104$(subdir-y) : $(if $(CONFIG_LIBQPE),$(QTDIR)/stamp-headers) \
105 $(if $(CONFIG_LIBQPE-X11),$(TOPDIR)/stamp-headers-x11) \ 105 $(if $(CONFIG_LIBQPE-X11),$(QTDIR)/stamp-headers-x11) \
106 $(TOPDIR)/library/custom.h 106 $(TOPDIR)/library/custom.h
107 107
108clean : $(TOPDIR)/.config 108clean : $(TOPDIR)/.config
109 109
110include $(TOPDIR)/Rules.make 110include $(TOPDIR)/Rules.make
diff --git a/Rules.make b/Rules.make
index 817c2bc..92286c6 100644
--- a/Rules.make
+++ b/Rules.make
@@ -1,90 +1,90 @@
1## targets ## 1## targets ##
2 2
3$(configs) : 3$(configs) :
4 $(call makecfg,$@) 4 $(call makecfg,$@)
5 5
6$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages 6$(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages
7 @echo Generating dependency information... 7 @echo Generating dependency information...
8# add to subdir-y, and add descend rules 8# add to subdir-y, and add descend rules
9 cat $(TOPDIR)/packages | grep -v '^#' | \ 9 cat $(TOPDIR)/packages | grep -v '^#' | \
10 awk '{print \ 10 awk '{print \
11 ".PHONY : " $$2 "\n" \ 11 ".PHONY : " $$2 "\n" \
12 "subdir-$$(" $$1 ") += " $$2 "\n\n"; \ 12 "subdir-$$(" $$1 ") += " $$2 "\n\n"; \
13 print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends 13 print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends
14 cat $(TOPDIR)/packages | grep -v '^#' | \ 14 cat $(TOPDIR)/packages | grep -v '^#' | \
15 perl -ne '($$cfg, $$dir, $$pro) = $$_ =~ /^(\S+)\s+(\S+)\s+(\S+)/; if ( -e "$$dir/$$pro" ) { print "$$dir/Makefile : $$dir/$$pro \$$(TOPDIR)/qmake/qmake\n\t\$$(call makefilegen,\$$@)\n\n"; }' \ 15 perl -ne '($$cfg, $$dir, $$pro) = $$_ =~ /^(\S+)\s+(\S+)\s+(\S+)/; if ( -e "$$dir/$$pro" ) { print "$$dir/Makefile : $$dir/$$pro \$$(TOPDIR)/qmake/qmake\n\t\$$(call makefilegen,\$$@)\n\n"; }' \
16 >> $(TOPDIR)/.depends 16 >> $(TOPDIR)/.depends
17# interpackage dependency generation 17# interpackage dependency generation
18 cat $(TOPDIR)/packages | \ 18 cat $(TOPDIR)/packages | \
19 $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends 19 $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends
20 20
21$(TOPDIR)/.depends.cfgs: 21$(TOPDIR)/.depends.cfgs:
22# config.in interdependencies 22# config.in interdependencies
23 @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs 23 @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs
24 @cat dirs | ( for i in `cat`; do if [ "`cat dirs|grep $$i 2>/dev/null|wc -l`" -ne "1" ]; then deps=`cat dirs|grep $$i| grep -v "^$$i$$"|for i in \`cat|sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g'\`; do echo $$i/config.in; done`; echo `echo $$i/config.in|sed -e 's,^$(TOPDIR)/,$$(TOPDIR)/,'` : $$deps; fi; done ) >> $@ 24 @cat dirs | ( for i in `cat`; do if [ "`cat dirs|grep $$i 2>/dev/null|wc -l`" -ne "1" ]; then deps=`cat dirs|grep $$i| grep -v "^$$i$$"|for i in \`cat|sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g'\`; do echo $$i/config.in; done`; echo `echo $$i/config.in|sed -e 's,^$(TOPDIR)/,$$(TOPDIR)/,'` : $$deps; fi; done ) >> $@
25 @-rm -f dirs 25 @-rm -f dirs
26 26
27$(TOPDIR)/stamp-headers : 27$(QTDIR)/stamp-headers :
28 @-rm -f $(TOPDIR)/stamp-headers* 28 @-rm -f $@*
29 mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ 29 mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \
30 $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private 30 $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private
31 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) 31 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
32 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) 32 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
33 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) 33 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
34 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) 34 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; )
35 ( cd include/opie && ln -sf ../../libsql/*.h .; ) 35 ( cd include/opie && ln -sf ../../libsql/*.h .; )
36 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) 36 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; )
37 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 37 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
38 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) 38 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
39 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h 39 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
40 ( cd $(QTDIR)/include; \ 40 ( cd $(QTDIR)/include; \
41 $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \ 41 $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \
42 qcopchannel_qws.h qwindowsystem_qws.h \ 42 qcopchannel_qws.h qwindowsystem_qws.h \
43 qfontmanager_qws.h qwsdefaultdecoration_qws.h)) 43 qfontmanager_qws.h qwsdefaultdecoration_qws.h))
44 touch $@ 44 touch $@
45 45
46$(TOPDIR)/stamp-headers-x11 : 46$(QTDIR)/stamp-headers-x11 :
47 @-rm -f $(TOPDIR)/stamp-headers* 47 @-rm -f $@*
48 mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ 48 mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \
49 $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private 49 $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private
50 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) 50 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
51 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) 51 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
52 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) 52 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
53 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) 53 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; )
54 ( cd include/opie && ln -sf ../../libsql/*.h .; ) 54 ( cd include/opie && ln -sf ../../libsql/*.h .; )
55 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) 55 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; )
56 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 56 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
57 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) 57 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
58 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h 58 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
59 ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; ) 59 ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; )
60 cd $(QTDIR)/include; $(patsubst %,ln -sf $(OPIEDIR)/x11/libqpe-x11/qt/%;,qgfx_qws.h qwsmouse_qws.h qcopchannel_qws.h qwindowsystem_qws.h qfontmanager_qws.h qwsdefaultdecoration_qws.h) 60 cd $(QTDIR)/include; $(patsubst %,ln -sf $(OPIEDIR)/x11/libqpe-x11/qt/%;,qgfx_qws.h qwsmouse_qws.h qcopchannel_qws.h qwindowsystem_qws.h qfontmanager_qws.h qwsdefaultdecoration_qws.h)
61 touch $@ 61 touch $@
62 62
63$(TOPDIR)/library/custom.h : $(TOPDIR)/.config 63$(TOPDIR)/library/custom.h : $(TOPDIR)/.config
64 @-rm -f $@ 64 @-rm -f $@
65 @$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\ 65 @$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\
66 ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@) 66 ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@)
67 @touch $@ 67 @touch $@
68 68
69$(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/conf scripts/kconfig/conf $(TOPDIR)/scripts/kconfig/mconf scripts/kconfig/mconf $(TOPDIR)/scripts/kconfig/qconf scripts/kconfig/qconf $(TOPDIR)/qmake/qmake : 69$(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/conf scripts/kconfig/conf $(TOPDIR)/scripts/kconfig/mconf scripts/kconfig/mconf $(TOPDIR)/scripts/kconfig/qconf scripts/kconfig/qconf $(TOPDIR)/qmake/qmake :
70 $(call descend,$(shell dirname $@),$(shell basename $@)) 70 $(call descend,$(shell dirname $@),$(shell basename $@))
71 71
72$(TOPDIR)/qmake/qmake : $(TOPDIR)/mkspecs/default 72$(TOPDIR)/qmake/qmake : $(TOPDIR)/mkspecs/default
73 73
74$(TOPDIR)/mkspecs/default : 74$(TOPDIR)/mkspecs/default :
75 ln -sf linux-g++ $@ 75 ln -sf linux-g++ $@
76 76
77## general rules ## 77## general rules ##
78 78
79define descend 79define descend
80 $(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2) 80 $(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2)
81endef 81endef
82 82
83define makefilegen 83define makefilegen
84 cd $(if $(1),$(shell dirname $(1))); $(TOPDIR)/qmake/qmake $(3) -o $(if $(1),$(shell basename $(1))) `cat $(OPIEDIR)/packages | grep " \`echo $(1)|sed -e 's,/Makefile$$,,'\`" | \ 84 cd $(if $(1),$(shell dirname $(1))); $(TOPDIR)/qmake/qmake $(3) -o $(if $(1),$(shell basename $(1))) `cat $(OPIEDIR)/packages | grep " \`echo $(1)|sed -e 's,/Makefile$$,,'\`" | \
85 head -1 | awk '{print $$3}'` 85 head -1 | awk '{print $$3}'`
86endef 86endef
87 87
88define makecfg 88define makecfg
89 $(TOPDIR)/scripts/makecfg.pl $1 $(OPIEDIR) 89 $(TOPDIR)/scripts/makecfg.pl $1 $(OPIEDIR)
90endef 90endef