-rw-r--r-- | Rules.make | 12 | ||||
-rw-r--r-- | config.in | 4 | ||||
-rw-r--r-- | include.pro | 2 |
3 files changed, 17 insertions, 1 deletions
@@ -1,63 +1,73 @@ | |||
1 | ## targets ## | 1 | ## targets ## |
2 | 2 | ||
3 | $(configs) : | 3 | $(configs) : |
4 | $(call makecfg,$@) | 4 | $(call makecfg,$@) |
5 | 5 | ||
6 | $(TOPDIR)/gen.pro : $(TOPDIR)/.config | ||
7 | echo > $@ | ||
8 | ifneq ($(CONFIG_DEBUG),) | ||
9 | echo CONFIG += debug >> $@ | ||
10 | echo CONFIG -= release >> $@ | ||
11 | else | ||
12 | echo CONFIG -= debug >> $@ | ||
13 | echo CONFIG += release >> $@ | ||
14 | endif | ||
15 | |||
6 | $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages | 16 | $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages |
7 | @echo Generating dependency information... | 17 | @echo Generating dependency information... |
8 | # add to subdir-y, and add descend rules | 18 | # add to subdir-y, and add descend rules |
9 | @cat $(TOPDIR)/packages | grep -v '^#' | \ | 19 | @cat $(TOPDIR)/packages | grep -v '^#' | \ |
10 | awk '{print \ | 20 | awk '{print \ |
11 | ".PHONY : " $$2 "\n" \ | 21 | ".PHONY : " $$2 "\n" \ |
12 | "subdir-$$(" $$1 ") += " $$2 "\n\n"; \ | 22 | "subdir-$$(" $$1 ") += " $$2 "\n\n"; \ |
13 | print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends | 23 | print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends |
14 | cat $(TOPDIR)/packages | grep -v '^#' | \ | 24 | 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 \$$(QMAKE)\n\t\$$(call makefilegen,\$$@)\n\n"; }' \ | 25 | perl -ne '($$cfg, $$dir, $$pro) = $$_ =~ /^(\S+)\s+(\S+)\s+(\S+)/; if ( -e "$$dir/$$pro" ) { print "$$dir/Makefile : $$dir/$$pro \$$(QMAKE) \$$(OPIEDIR)/gen.pro\n\t\$$(call makefilegen,\$$@)\n\n"; }' \ |
16 | >> $(TOPDIR)/.depends | 26 | >> $(TOPDIR)/.depends |
17 | # interpackage dependency generation | 27 | # interpackage dependency generation |
18 | @cat $(TOPDIR)/packages | \ | 28 | @cat $(TOPDIR)/packages | \ |
19 | $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends | 29 | $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends |
20 | 30 | ||
21 | $(TOPDIR)/.depends.cfgs: | 31 | $(TOPDIR)/.depends.cfgs: |
22 | # config.in interdependencies | 32 | # config.in interdependencies |
23 | @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs | 33 | @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 ) >> $@ | 34 | @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 | 35 | @-rm -f dirs |
26 | 36 | ||
27 | $(QTDIR)/stamp-headers : | 37 | $(QTDIR)/stamp-headers : |
28 | @-rm -f $@* | 38 | @-rm -f $@* |
29 | ( cd $(QTDIR)/include; \ | 39 | ( cd $(QTDIR)/include; \ |
30 | $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \ | 40 | $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \ |
31 | qcopchannel_qws.h qwindowsystem_qws.h \ | 41 | qcopchannel_qws.h qwindowsystem_qws.h \ |
32 | qfontmanager_qws.h qwsdefaultdecoration_qws.h)) | 42 | qfontmanager_qws.h qwsdefaultdecoration_qws.h)) |
33 | touch $@ | 43 | touch $@ |
34 | 44 | ||
35 | $(QTDIR)/stamp-headers-x11 : | 45 | $(QTDIR)/stamp-headers-x11 : |
36 | @-rm -f $@* | 46 | @-rm -f $@* |
37 | 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) | 47 | 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) |
38 | touch $@ | 48 | touch $@ |
39 | 49 | ||
40 | $(OPIEDIR)/stamp-headers : | 50 | $(OPIEDIR)/stamp-headers : |
41 | @-rm -f $@* | 51 | @-rm -f $@* |
42 | mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ | 52 | mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ |
43 | $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private | 53 | $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private |
44 | ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) | 54 | ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) |
45 | ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) | 55 | ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) |
46 | ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) | 56 | ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) |
47 | ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) | 57 | ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) |
48 | ( cd include/opie && ln -sf ../../libsql/*.h .; ) | 58 | ( cd include/opie && ln -sf ../../libsql/*.h .; ) |
49 | ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) | 59 | ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) |
50 | ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ | 60 | ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ |
51 | ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) | 61 | ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) |
52 | ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h | 62 | ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h |
53 | touch $@ | 63 | touch $@ |
54 | 64 | ||
55 | $(OPIEDIR)/stamp-headers-x11 : | 65 | $(OPIEDIR)/stamp-headers-x11 : |
56 | @-rm -f $@* | 66 | @-rm -f $@* |
57 | mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ | 67 | mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ |
58 | $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private | 68 | $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private |
59 | ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) | 69 | ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) |
60 | ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) | 70 | ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) |
61 | ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) | 71 | ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) |
62 | ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) | 72 | ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) |
63 | ( cd include/opie && ln -sf ../../libsql/*.h .; ) | 73 | ( cd include/opie && ln -sf ../../libsql/*.h .; ) |
@@ -1,88 +1,92 @@ | |||
1 | mainmenu "Opie Configuration" | 1 | mainmenu "Opie Configuration" |
2 | menu "Build Parameters" | 2 | menu "Build Parameters" |
3 | 3 | ||
4 | #choice | 4 | #choice |
5 | # prompt "Build Processor family" | 5 | # prompt "Build Processor family" |
6 | # default BUILD_X86 | 6 | # default BUILD_X86 |
7 | # help | 7 | # help |
8 | # Please select the architecture of the machine you will be | 8 | # Please select the architecture of the machine you will be |
9 | # building the OpenZaurus buildroot on. | 9 | # building the OpenZaurus buildroot on. |
10 | # | 10 | # |
11 | # config BUILD_X86 | 11 | # config BUILD_X86 |
12 | # boolean "X86 Architecture" | 12 | # boolean "X86 Architecture" |
13 | # | 13 | # |
14 | #endchoice | 14 | #endchoice |
15 | 15 | ||
16 | choice | 16 | choice |
17 | prompt "Target Machine" | 17 | prompt "Target Machine" |
18 | default TARGET_X86 | 18 | default TARGET_X86 |
19 | help | 19 | help |
20 | Please select the architecture of the machine you will be | 20 | Please select the architecture of the machine you will be |
21 | building the OpenZaurus buildroot for. | 21 | building the OpenZaurus buildroot for. |
22 | 22 | ||
23 | config TARGET_X86 | 23 | config TARGET_X86 |
24 | boolean "Intel X86" | 24 | boolean "Intel X86" |
25 | 25 | ||
26 | config TARGET_SHARP | 26 | config TARGET_SHARP |
27 | boolean "Sharp Zaurus SL-5x00 - stock" | 27 | boolean "Sharp Zaurus SL-5x00 - stock" |
28 | 28 | ||
29 | # config TARGET_OZ | 29 | # config TARGET_OZ |
30 | # boolean "Sharp Zaurus SL-5x00 - OpenZaurus" | 30 | # boolean "Sharp Zaurus SL-5x00 - OpenZaurus" |
31 | 31 | ||
32 | config TARGET_IPAQ | 32 | config TARGET_IPAQ |
33 | boolean "Ipaq" | 33 | boolean "Ipaq" |
34 | 34 | ||
35 | endchoice | 35 | endchoice |
36 | 36 | ||
37 | config OPTIMIZE | 37 | config OPTIMIZE |
38 | boolean "Use optimizations" | 38 | boolean "Use optimizations" |
39 | default "y" if ! TARGET_X86 | 39 | default "y" if ! TARGET_X86 |
40 | 40 | ||
41 | config DEBUG | ||
42 | boolean "Enable debug builds" | ||
43 | default "n" | ||
44 | |||
41 | config SPECFILE | 45 | config SPECFILE |
42 | string | 46 | string |
43 | default "qws/linux-generic-g++" if TARGET_X86 && (! X11) | 47 | default "qws/linux-generic-g++" if TARGET_X86 && (! X11) |
44 | default "linux-g++" if TARGET_X86 && X11 | 48 | default "linux-g++" if TARGET_X86 && X11 |
45 | default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11) | 49 | default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11) |
46 | default "linux-g++" if TARGET_SHARP && X11 | 50 | default "linux-g++" if TARGET_SHARP && X11 |
47 | # default "linux-oz-g++" if TARGET_OZ | 51 | # default "linux-oz-g++" if TARGET_OZ |
48 | default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11) | 52 | default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11) |
49 | default "linux-g++" if TARGET_IPAQ && X11 | 53 | default "linux-g++" if TARGET_IPAQ && X11 |
50 | 54 | ||
51 | config CUSTOMFILE | 55 | config CUSTOMFILE |
52 | string | 56 | string |
53 | default "custom-ipaq.h" if TARGET_IPAQ | 57 | default "custom-ipaq.h" if TARGET_IPAQ |
54 | default "custom-sharp.h" if TARGET_SHARP | 58 | default "custom-sharp.h" if TARGET_SHARP |
55 | 59 | ||
56 | 60 | ||
57 | config OPTIMIZATIONS | 61 | config OPTIMIZATIONS |
58 | string "Optimization flags" | 62 | string "Optimization flags" |
59 | depends OPTIMIZE | 63 | depends OPTIMIZE |
60 | default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_IPAQ | 64 | default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_IPAQ |
61 | default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SHARP | 65 | default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SHARP |
62 | 66 | ||
63 | #config CROSS | 67 | #config CROSS |
64 | # string "Crosscompilation prefix" | 68 | # string "Crosscompilation prefix" |
65 | # default "arm-linux-" | 69 | # default "arm-linux-" |
66 | # help | 70 | # help |
67 | # Crosscompilation prefix is the prefix which will be prepended | 71 | # Crosscompilation prefix is the prefix which will be prepended |
68 | # to all compilation commands. For example, a crosscompilation prefix | 72 | # to all compilation commands. For example, a crosscompilation prefix |
69 | # of arm-linux-, results in the build calling arm-linux-gcc as its CC. | 73 | # of arm-linux-, results in the build calling arm-linux-gcc as its CC. |
70 | 74 | ||
71 | endmenu | 75 | endmenu |
72 | 76 | ||
73 | menu "Base" | 77 | menu "Base" |
74 | choice | 78 | choice |
75 | prompt "Qpe Library Selection" | 79 | prompt "Qpe Library Selection" |
76 | default LIBQPE | 80 | default LIBQPE |
77 | 81 | ||
78 | source library/config.in | 82 | source library/config.in |
79 | source x11/config.in | 83 | source x11/config.in |
80 | endchoice | 84 | endchoice |
81 | source libopie/config.in | 85 | source libopie/config.in |
82 | source core/opie-login/config.in | 86 | source core/opie-login/config.in |
83 | source core/opiealarm/config.in | 87 | source core/opiealarm/config.in |
84 | source core/launcher/config.in | 88 | source core/launcher/config.in |
85 | endmenu | 89 | endmenu |
86 | 90 | ||
87 | comment "" | 91 | comment "" |
88 | 92 | ||
diff --git a/include.pro b/include.pro index da2da04..4f1144f 100644 --- a/include.pro +++ b/include.pro | |||
@@ -23,48 +23,50 @@ INSTALLS += pics | |||
23 | 23 | ||
24 | # sounds, default path is $$prefix/sounds/$$TARGET | 24 | # sounds, default path is $$prefix/sounds/$$TARGET |
25 | sounds.path = $$prefix/sounds/$$TARGET | 25 | sounds.path = $$prefix/sounds/$$TARGET |
26 | sounds.files = sounds/* | 26 | sounds.files = sounds/* |
27 | INSTALLS += sounds | 27 | INSTALLS += sounds |
28 | 28 | ||
29 | # init scripts, default path is /etc/init.d | 29 | # init scripts, default path is /etc/init.d |
30 | init.path = /etc/init.d | 30 | init.path = /etc/init.d |
31 | init.files = init.d/* | 31 | init.files = init.d/* |
32 | INSTALLS += init | 32 | INSTALLS += init |
33 | 33 | ||
34 | # data, default path is /usr/share/$$TARGET | 34 | # data, default path is /usr/share/$$TARGET |
35 | data.path = /usr/share/$$TARGET | 35 | data.path = /usr/share/$$TARGET |
36 | data.files = share/* | 36 | data.files = share/* |
37 | INSTALLS += data | 37 | INSTALLS += data |
38 | 38 | ||
39 | etc.path = $$prefix/etc/ | 39 | etc.path = $$prefix/etc/ |
40 | etc.files = etc/* | 40 | etc.files = etc/* |
41 | INSTALLS += etc | 41 | INSTALLS += etc |
42 | 42 | ||
43 | apps.path = $$prefix/apps/ | 43 | apps.path = $$prefix/apps/ |
44 | apps.files = apps/* | 44 | apps.files = apps/* |
45 | INSTALLS += apps | 45 | INSTALLS += apps |
46 | 46 | ||
47 | # sounds, default path is $$prefix/sounds/$$TARGET | 47 | # sounds, default path is $$prefix/sounds/$$TARGET |
48 | sounds.path = $$prefix/sounds/$$TARGET | 48 | sounds.path = $$prefix/sounds/$$TARGET |
49 | sounds.files = sounds/* | 49 | sounds.files = sounds/* |
50 | INSTALLS += sounds | 50 | INSTALLS += sounds |
51 | 51 | ||
52 | # anything in nonstandard paths | 52 | # anything in nonstandard paths |
53 | root.path = / | 53 | root.path = / |
54 | root.files = root/* | 54 | root.files = root/* |
55 | INSTALLS += root | 55 | INSTALLS += root |
56 | 56 | ||
57 | # new targets | 57 | # new targets |
58 | 58 | ||
59 | lupdate.target = lupdate | 59 | lupdate.target = lupdate |
60 | lupdate.commands = lupdate -noobsolete $(PRO) | 60 | lupdate.commands = lupdate -noobsolete $(PRO) |
61 | 61 | ||
62 | lrelease.target = lrelease | 62 | lrelease.target = lrelease |
63 | lrelease.commands = lrelease $(PRO) | 63 | lrelease.commands = lrelease $(PRO) |
64 | 64 | ||
65 | ipk.target = ipk | 65 | ipk.target = ipk |
66 | ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; ) | 66 | ipk.commands = tmp=`mktemp -d /tmp/ipkg-opie.XXXXXXXXXX` && ( $(MAKE) INSTALL_ROOT="$$$$tmp" install && ipkg-build $$$$tmp; rm -rf $$$$tmp; ) |
67 | 67 | ||
68 | QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk | 68 | QMAKE_EXTRA_UNIX_TARGETS += lupdate lrelease ipk |
69 | QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib | 69 | QMAKE_LFLAGS += -Wl,-rpath=$$prefix/lib |
70 | QMAKE_LIBDIR += $(OPIEDIR)/lib | 70 | QMAKE_LIBDIR += $(OPIEDIR)/lib |
71 | |||
72 | include ( $(OPIEDIR)/gen.pro ) | ||