author | mickeyl <mickeyl> | 2004-01-21 23:41:53 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-01-21 23:41:53 (UTC) |
commit | a428ff7937dae04b1b51d3e91f46c74f4f869543 (patch) (unidiff) | |
tree | 35e266a250a893ad3eb7b934296538ea82722954 /Rules.make | |
parent | cc5d48b188c21ff873300179264ab354d4c8aa09 (diff) | |
download | opie-a428ff7937dae04b1b51d3e91f46c74f4f869543.zip opie-a428ff7937dae04b1b51d3e91f46c74f4f869543.tar.gz opie-a428ff7937dae04b1b51d3e91f46c74f4f869543.tar.bz2 |
catch up with moves on cvs server
-rw-r--r-- | Rules.make | 22 |
1 files changed, 14 insertions, 8 deletions
@@ -83,62 +83,68 @@ $(QTDIR)/stamp-headers : | |||
83 | qcopchannel_qws.h qwindowsystem_qws.h \ | 83 | qcopchannel_qws.h qwindowsystem_qws.h \ |
84 | qfontmanager_qws.h qwsdefaultdecoration_qws.h)) | 84 | qfontmanager_qws.h qwsdefaultdecoration_qws.h)) |
85 | touch $@ | 85 | touch $@ |
86 | 86 | ||
87 | $(QTDIR)/stamp-headers-x11 : | 87 | $(QTDIR)/stamp-headers-x11 : |
88 | @-rm -f $(QTDIR)/stamp-headers* | 88 | @-rm -f $(QTDIR)/stamp-headers* |
89 | 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) | 89 | 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 | touch $@ | 90 | touch $@ |
91 | 91 | ||
92 | $(OPIEDIR)/stamp-headers : | 92 | $(OPIEDIR)/stamp-headers : |
93 | @-rm -f $(OPIEDIR)/stamp-headers* | 93 | @-rm -f $(OPIEDIR)/stamp-headers* |
94 | mkdir -p $(TOPDIR)/include/qpe \ | 94 | mkdir -p $(TOPDIR)/include/qpe \ |
95 | $(TOPDIR)/include/qtopia \ | 95 | $(TOPDIR)/include/qtopia \ |
96 | $(TOPDIR)/include/opie \ | 96 | $(TOPDIR)/include/opie \ |
97 | $(TOPDIR)/include/opie2 \ | 97 | $(TOPDIR)/include/opie2 \ |
98 | $(TOPDIR)/include/qtopia/private | 98 | $(TOPDIR)/include/qtopia/private |
99 | ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) | 99 | ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) |
100 | ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) | 100 | ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) |
101 | ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) | 101 | ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) |
102 | # libopie1 | ||
102 | ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) | 103 | ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) |
103 | ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) | 104 | ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) |
104 | ( cd include/opie && ln -sf ../../libopie/big-screen/*.h .; ) | 105 | ( cd include/opie && ln -sf ../../libopie/big-screen/*.h .; ) |
106 | # libopie2 | ||
105 | ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; ) | 107 | ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; ) |
108 | ( cd include/opie2 && ln -sf ../../libopie2/opiecore/device/*.h .; ) | ||
106 | ( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; ) | 109 | ( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; ) |
107 | ( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; ) | 110 | ( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; ) |
108 | ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; ) | 111 | ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; ) |
109 | ( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; ) | 112 | ( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; ) |
110 | ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; ) | 113 | ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; ) |
111 | ( cd include/opie && ln -sf ../../libqtaux/pim/*.h .; ) | 114 | ( cd include/opie2 && ln -sf ../../libopie2/opieui/fileselector/*.h .; ) |
115 | ( cd include/opie2 && ln -sf ../../libopie2/opieui/big-screen/*.h .; ) | ||
116 | ( cd include/opie2 && ln -sf ../../libqtaux/*.h .; ) | ||
117 | # all | ||
112 | ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ | 118 | ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ |
113 | ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) | 119 | ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) |
114 | ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h | 120 | ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h |
115 | touch $@ | 121 | touch $@ |
116 | 122 | ||
117 | $(OPIEDIR)/stamp-headers-x11 : | 123 | $(OPIEDIR)/stamp-headers-x11 : |
118 | @-rm -f $(OPIEDIR)/stamp-headers* | 124 | @-rm -f $(OPIEDIR)/stamp-headers* |
119 | mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ | 125 | mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ |
120 | $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private | 126 | $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private |
121 | ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) | 127 | ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) |
122 | ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) | 128 | ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) |
123 | ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) | 129 | ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) |
124 | ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) | 130 | ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) |
125 | ( cd include/opie && ln -sf ../../libsql/*.h .; ) | 131 | ( cd include/opie && ln -sf ../../libsql/*.h .; ) |
126 | ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) | 132 | ( cd include/opie && ln -sf ../../libopie/pim/*.h .; ) |
127 | ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ | 133 | ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ |
128 | ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) | 134 | ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) |
129 | ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h | 135 | ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h |
130 | ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; ) | 136 | ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; ) |
131 | touch $@ | 137 | touch $@ |
132 | 138 | ||
133 | $(TOPDIR)/library/custom.h : $(TOPDIR)/.config | 139 | $(TOPDIR)/library/custom.h : $(TOPDIR)/.config |
134 | @-rm -f $@ | 140 | @-rm -f $@ |
135 | @$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\ | 141 | @$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\ |
136 | ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@) | 142 | ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@) |
137 | @touch $@ | 143 | @touch $@ |
138 | 144 | ||
139 | $(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: | 145 | $(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: |
140 | @$(call descend,$(shell dirname $@),$(shell basename $@)) | 146 | @$(call descend,$(shell dirname $@),$(shell basename $@)) |
141 | 147 | ||
142 | menuconfig: $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf ./config.in | 148 | menuconfig: $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf ./config.in |
143 | $(TOPDIR)/scripts/kconfig/mconf ./config.in | 149 | $(TOPDIR)/scripts/kconfig/mconf ./config.in |
144 | @touch ./.config.stamp | 150 | @touch ./.config.stamp |