|
diff --git a/Makefile b/Makefile index f61f940..7646446 100644 --- a/ Makefile+++ b/ Makefile |
|
@@ -95,19 +95,19 @@ endif |
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 $(OPIEDIR)/stamp-headers) \ |
108 | $(if $(CONFIG_LIBQPE-X11),$(QTDIR)/stamp-headers-x11) \ |
108 | $(if $(CONFIG_LIBQPE-X11),$(QTDIR)/stamp-headers-x11 $(OPIEDIR)/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 |
|
|
|
|
@@ -17,56 +17,64 @@ $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR) |
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 | $(QTDIR)/stamp-headers : |
27 | $(QTDIR)/stamp-headers : |
28 | @-rm -f $@* |
28 | @-rm -f $@* |
| |
29 | ( cd $(QTDIR)/include; \ |
| |
30 | $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \ |
| |
31 | qcopchannel_qws.h qwindowsystem_qws.h \ |
| |
32 | qfontmanager_qws.h qwsdefaultdecoration_qws.h)) |
| |
33 | touch $@ |
| |
34 | |
| |
35 | $(QTDIR)/stamp-headers-x11 : |
| |
36 | @-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) |
| |
38 | touch $@ |
| |
39 | |
| |
40 | $(OPIEDIR)/stamp-headers : |
| |
41 | @-rm -f $@* |
29 | mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ |
42 | mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ |
30 | $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private |
43 | $(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; ) |
44 | ( 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 .; ) |
45 | ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) |
33 | ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) |
46 | ( 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; ) |
47 | ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) |
35 | ( cd include/opie && ln -sf ../../libsql/*.h .; ) |
48 | ( cd include/opie && ln -sf ../../libsql/*.h .; ) |
36 | ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) |
49 | ( 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 \ |
50 | ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ |
38 | ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) |
51 | ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) |
39 | ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h |
52 | ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h |
40 | ( cd $(QTDIR)/include; \ |
| |
41 | $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \ |
| |
42 | qcopchannel_qws.h qwindowsystem_qws.h \ |
| |
43 | qfontmanager_qws.h qwsdefaultdecoration_qws.h)) |
| |
44 | touch $@ |
53 | touch $@ |
45 | |
54 | |
46 | $(QTDIR)/stamp-headers-x11 : |
55 | $(OPIEDIR)/stamp-headers-x11 : |
47 | @-rm -f $@* |
56 | @-rm -f $@* |
48 | mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ |
57 | mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ |
49 | $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private |
58 | $(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; ) |
59 | ( 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 .; ) |
60 | ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) |
52 | ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) |
61 | ( 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; ) |
62 | ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) |
54 | ( cd include/opie && ln -sf ../../libsql/*.h .; ) |
63 | ( cd include/opie && ln -sf ../../libsql/*.h .; ) |
55 | ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) |
64 | ( 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 \ |
65 | ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ |
57 | ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) |
66 | ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) |
58 | ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h |
67 | ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h |
59 | ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; ) |
68 | ( 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) |
| |
61 | touch $@ |
69 | touch $@ |
62 | |
70 | |
63 | $(TOPDIR)/library/custom.h : $(TOPDIR)/.config |
71 | $(TOPDIR)/library/custom.h : $(TOPDIR)/.config |
64 | @-rm -f $@ |
72 | @-rm -f $@ |
65 | @$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\ |
73 | @$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\ |
66 | ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@) |
74 | ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@) |
67 | @touch $@ |
75 | @touch $@ |
68 | |
76 | |
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 : |
77 | $(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 $@)) |
78 | $(call descend,$(shell dirname $@),$(shell basename $@)) |
71 | |
79 | |
72 | $(TOPDIR)/qmake/qmake : $(TOPDIR)/mkspecs/default |
80 | $(TOPDIR)/qmake/qmake : $(TOPDIR)/mkspecs/default |
|