summaryrefslogtreecommitdiff
Unidiff
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
@@ -92,19 +92,19 @@ endif
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
@@ -15,45 +15,45 @@ $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)
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 .; )