summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-02-25 23:15:18 (UTC)
committer mickeyl <mickeyl>2004-02-25 23:15:18 (UTC)
commit6f0aa2686fd58a152b4b37cef2f0f8f906a2a2c7 (patch) (unidiff)
tree8147b57da84c5764deb5b1c0bc96a59f2de268ea
parentbc02df62015414179f2890e9bef9e4eddd95d0f5 (diff)
downloadopie-6f0aa2686fd58a152b4b37cef2f0f8f906a2a2c7.zip
opie-6f0aa2686fd58a152b4b37cef2f0f8f906a2a2c7.tar.gz
opie-6f0aa2686fd58a152b4b37cef2f0f8f906a2a2c7.tar.bz2
add the missing header creation. i always wonder how you guys compile
stuff without these changes... do you create them by hand? :D
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Rules.make1
1 files changed, 1 insertions, 0 deletions
diff --git a/Rules.make b/Rules.make
index bc00d7e..16b4ffa 100644
--- a/Rules.make
+++ b/Rules.make
@@ -68,96 +68,97 @@ $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)
68 perl -ne '($$cfg, $$dir, $$pro) = $$_ =~ /^(\S+)\s+(\S+)\s+(\S+)/; if ( -e "$$dir/$$pro" ) { print "$$dir/Makefile : $$dir/$$pro \$$(QMAKE) \$$(OPIEDIR)/gen.pro \$$(OPIEDIR)/.config\n\t\$$(call makefilegen,\$$@)\n\n"; }' \ 68 perl -ne '($$cfg, $$dir, $$pro) = $$_ =~ /^(\S+)\s+(\S+)\s+(\S+)/; if ( -e "$$dir/$$pro" ) { print "$$dir/Makefile : $$dir/$$pro \$$(QMAKE) \$$(OPIEDIR)/gen.pro \$$(OPIEDIR)/.config\n\t\$$(call makefilegen,\$$@)\n\n"; }' \
69 >> $(TOPDIR)/.depends 69 >> $(TOPDIR)/.depends
70# interpackage dependency generation 70# interpackage dependency generation
71 @cat $(TOPDIR)/packages | \ 71 @cat $(TOPDIR)/packages | \
72 $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends 72 $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends
73 73
74$(TOPDIR)/.depends.cfgs: 74$(TOPDIR)/.depends.cfgs:
75# config.in interdependencies 75# config.in interdependencies
76 @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs 76 @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs
77 @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 ) >> $@ 77 @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 ) >> $@
78 @-rm -f dirs 78 @-rm -f dirs
79 79
80$(QTDIR)/stamp-headers : 80$(QTDIR)/stamp-headers :
81 @-rm -f $(QTDIR)/stamp-headers* 81 @-rm -f $(QTDIR)/stamp-headers*
82 ( cd $(QTDIR)/include; \ 82 ( cd $(QTDIR)/include; \
83 $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \ 83 $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \
84 qcopchannel_qws.h qwindowsystem_qws.h \ 84 qcopchannel_qws.h qwindowsystem_qws.h \
85 qfontmanager_qws.h qwsdefaultdecoration_qws.h)) 85 qfontmanager_qws.h qwsdefaultdecoration_qws.h))
86 touch $@ 86 touch $@
87 87
88$(QTDIR)/stamp-headers-x11 : 88$(QTDIR)/stamp-headers-x11 :
89 @-rm -f $(QTDIR)/stamp-headers* 89 @-rm -f $(QTDIR)/stamp-headers*
90 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) 90 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)
91 touch $@ 91 touch $@
92 92
93$(OPIEDIR)/stamp-headers : 93$(OPIEDIR)/stamp-headers :
94 @-rm -f $(OPIEDIR)/stamp-headers* 94 @-rm -f $(OPIEDIR)/stamp-headers*
95 mkdir -p $(TOPDIR)/include/qpe \ 95 mkdir -p $(TOPDIR)/include/qpe \
96 $(TOPDIR)/include/qtopia \ 96 $(TOPDIR)/include/qtopia \
97 $(TOPDIR)/include/opie \ 97 $(TOPDIR)/include/opie \
98 $(TOPDIR)/include/opie2 \ 98 $(TOPDIR)/include/opie2 \
99 $(TOPDIR)/include/qtopia/private 99 $(TOPDIR)/include/qtopia/private
100 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) 100 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
101 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) 101 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
102 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) 102 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
103 # libopie1 103 # libopie1
104 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) 104 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; )
105 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) 105 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; )
106 ( cd include/opie && ln -sf ../../libopie/big-screen/*.h .; ) 106 ( cd include/opie && ln -sf ../../libopie/big-screen/*.h .; )
107 # libopie2 107 # libopie2
108 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; ) 108 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; )
109 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/device/*.h .; ) 109 ( cd include/opie2 && ln -sf ../../libopie2/opiecore/device/*.h .; )
110 ( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; ) 110 ( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; )
111 ( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; ) 111 ( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; )
112 ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; ) 112 ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; )
113 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; ) 113 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; )
114 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/*.h .; ) 114 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/*.h .; )
115 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/backends/*.h .; ) 115 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/backends/*.h .; )
116 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/ui/*.h .; )
116 ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; ) 117 ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; )
117 ( cd include/opie2 && ln -sf ../../libopie2/opieui/fileselector/*.h .; ) 118 ( cd include/opie2 && ln -sf ../../libopie2/opieui/fileselector/*.h .; )
118 ( cd include/opie2 && ln -sf ../../libopie2/opieui/big-screen/*.h .; ) 119 ( cd include/opie2 && ln -sf ../../libopie2/opieui/big-screen/*.h .; )
119 ( cd include/opie2 && ln -sf ../../libqtaux/*.h .; ) 120 ( cd include/opie2 && ln -sf ../../libqtaux/*.h .; )
120 # all 121 # all
121 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 122 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
122 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) 123 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
123 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h 124 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
124 touch $@ 125 touch $@
125 126
126$(OPIEDIR)/stamp-headers-x11 : 127$(OPIEDIR)/stamp-headers-x11 :
127 @-rm -f $(OPIEDIR)/stamp-headers* 128 @-rm -f $(OPIEDIR)/stamp-headers*
128 mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ 129 mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \
129 $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private 130 $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private
130 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) 131 ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
131 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) 132 ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
132 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) 133 ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
133 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) 134 ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; )
134 ( cd include/opie && ln -sf ../../libsql/*.h .; ) 135 ( cd include/opie && ln -sf ../../libsql/*.h .; )
135 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) 136 ( cd include/opie && ln -sf ../../libopie/pim/*.h .; )
136 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 137 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
137 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) 138 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
138 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h 139 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
139 ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; ) 140 ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; )
140 touch $@ 141 touch $@
141 142
142$(TOPDIR)/library/custom.h : $(TOPDIR)/.config 143$(TOPDIR)/library/custom.h : $(TOPDIR)/.config
143 @-rm -f $@ 144 @-rm -f $@
144 @$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\ 145 @$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\
145 ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@) 146 ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@)
146 @touch $@ 147 @touch $@
147 148
148$(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf $(TOPDIR)/scripts/kconfig/conf $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/qmake/qmake: 149$(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf $(TOPDIR)/scripts/kconfig/conf $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/qmake/qmake:
149 @$(call descend,$(shell dirname $@),$(shell basename $@)) 150 @$(call descend,$(shell dirname $@),$(shell basename $@))
150 151
151menuconfig: $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf ./config.in 152menuconfig: $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf ./config.in
152 $(TOPDIR)/scripts/kconfig/mconf ./config.in 153 $(TOPDIR)/scripts/kconfig/mconf ./config.in
153 @touch ./.config.stamp 154 @touch ./.config.stamp
154 155
155xconfig: $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in 156xconfig: $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in
156 $(TOPDIR)/scripts/kconfig/qconf ./config.in 157 $(TOPDIR)/scripts/kconfig/qconf ./config.in
157 @touch .config.stamp 158 @touch .config.stamp
158 159
159gconfig: $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in 160gconfig: $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in
160 $(TOPDIR)/scripts/kconfig/gconf ./config.in 161 $(TOPDIR)/scripts/kconfig/gconf ./config.in
161 @touch .config.stamp 162 @touch .config.stamp
162 163
163config: $(TOPDIR)/scripts/kconfig/conf ./config.in 164config: $(TOPDIR)/scripts/kconfig/conf ./config.in