Mercurial > mxe-octave

comparison src/qt.mk @ 3216:11f8ec654cd4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Avoid copying or linking files that are the same when doing native build Prefer $(INSTALL) over $(LN_SF).
author John W. Eaton <jwe@octave.org>
date Wed, 07 Aug 2013 00:41:50 -0400
parents fae248a5b181
children 8ede5874e2f1
comparison
equal deleted inserted replaced
3215:03873a95c76a 3216:11f8ec654cd4
169 -e 's,\(Libs:.* -l\).*[\\/]\([A-Za-z0-9]*\),\1\2,g' \ 169 -e 's,\(Libs:.* -l\).*[\\/]\([A-Za-z0-9]*\),\1\2,g' \
170 '{}' ';' ; \ 170 '{}' ';' ; \
171 cp -f '$(1)/lib/pkgconfig/'*.pc '$(HOST_LIBDIR)/pkgconfig/'; \ 171 cp -f '$(1)/lib/pkgconfig/'*.pc '$(HOST_LIBDIR)/pkgconfig/'; \
172 fi 172 fi
173 173
174 # using if-function, this allows to keep the code structure untouched, 174 if [ $(MXE_SYSTEM) != msvc ]; then \
175 # including the comments, however one must make sure there is no comma 175 if [ $(MXE_NATIVE_BUILD) = no ]; then \
176 $(if $(filter-out msvc,$(MXE_SYSTEM)), 176 $(INSTALL) -m755 '$($(PKG)_PREFIX)/bin/moc' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)moc'; \
177 $(LN_SF) '$($(PKG)_PREFIX)/bin/moc' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)moc' 177 $(INSTALL) -m755 '$($(PKG)_PREFIX)/bin/rcc' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)rcc'; \
178 $(LN_SF) '$($(PKG)_PREFIX)/bin/rcc' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)rcc' 178 $(INSTALL) -m755 '$($(PKG)_PREFIX)/bin/uic' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)uic'; \
179 $(LN_SF) '$($(PKG)_PREFIX)/bin/uic' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)uic' 179 $(INSTALL) -m755 '$($(PKG)_PREFIX)/bin/qmake' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)qmake'; \
180 $(LN_SF) '$($(PKG)_PREFIX)/bin/qmake' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)qmake' 180 fi
181 181
182 # cd '$(1)/tools/assistant' && '$(1)/bin/qmake' assistant.pro 182 # lrelease (from linguist) needed by octave for GUI build
183 # $(MAKE) -C '$(1)/tools/assistant' -j '$(JOBS)' install 183 $(MAKE) -C '$(1)/tools/linguist/lrelease' -j '$(JOBS)' install
184 184 if [ $(MXE_NATIVE_BUILD) = no ]; then \
185 # cd '$(1)/tools/designer' && '$(1)/bin/qmake' designer.pro 185 $(INSTALL) -m755 '$($(PKG)_PREFIX)/bin/lrelease' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)lrelease'); \
186 # $(MAKE) -C '$(1)/tools/designer' -j '$(JOBS)' install 186 fi
187 187 fi
188 # # at least some of the qdbus tools are useful on target
189 # cd '$(1)/tools/qdbus' && '$(1)/bin/qmake' qdbus.pro
190 # $(MAKE) -C '$(1)/tools/qdbus' -j '$(JOBS)' install
191
192 # lrelease (from linguist) needed by octave for GUI build
193 $(MAKE) -C '$(1)/tools/linguist/lrelease' -j '$(JOBS)' install
194 $(LN_SF) '$($(PKG)_PREFIX)/bin/lrelease' '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)lrelease'
195
196 # mkdir '$(1)/test-qt'
197 # cd '$(1)/test-qt' && '$(MXE_QMAKE)' '$(PWD)/$(2).pro'
198 # $(MAKE) -C '$(1)/test-qt' -j '$(JOBS)'
199 # $(INSTALL) -m755 '$(1)/test-qt/release/test-qt.exe' '$(HOST_BINDIR)')
200 endef 188 endef