Changeset 561 for trunk/qmake/Makefile.unix
- Timestamp:
- Feb 11, 2010, 11:19:06 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
-
. (modified) (1 prop)
-
qmake/Makefile.unix (modified) (8 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk
-
Property svn:mergeinfo
set to (toggle deleted branches)
/branches/vendor/nokia/qt/4.6.1 merged eligible /branches/vendor/nokia/qt/current merged eligible /branches/vendor/trolltech/qt/current 3-149
-
Property svn:mergeinfo
set to (toggle deleted branches)
-
trunk/qmake/Makefile.unix
r51 r561 10 10 mingw_make.o option.o winmakefile.o projectgenerator.o \ 11 11 meta.o makefiledeps.o metamakefile.o xmloutput.o pbuilder_pbx.o \ 12 borland_bmake.o msvc_dsp.o msvc_vcproj.o msvc_nmake.o msvc_objectmodel.o gnumake.o 12 borland_bmake.o msvc_dsp.o msvc_vcproj.o msvc_nmake.o msvc_objectmodel.o \ 13 symmake.o initprojectdeploy_symbian.o symmake_abld.o symmake_sbsv2.o \ 14 gnumake.o 13 15 14 16 #qt code 15 QOBJS=q string.o qtextstream.o qiodevice.o qmalloc.o qglobal.o \16 qbytearray.o qbytearraymatcher.o qdatastream.o qbuffer.o qlist data.o qfile.o \17 QOBJS=qtextcodec.o qutfcodec.o qstring.o qtextstream.o qiodevice.o qmalloc.o qglobal.o \ 18 qbytearray.o qbytearraymatcher.o qdatastream.o qbuffer.o qlist.o qfile.o \ 17 19 qfsfileengine_unix.o qfsfileengine_iterator_unix.o qfsfileengine.o \ 18 20 qfsfileengine_iterator.o qregexp.o qvector.o qbitarray.o qdir.o qdiriterator.o quuid.o qhash.o \ 19 21 qfileinfo.o qdatetime.o qstringlist.o qabstractfileengine.o qtemporaryfile.o \ 20 22 qmap.o qmetatype.o qsettings.o qlibraryinfo.o qvariant.o qvsnprintf.o \ 21 qlocale.o qlinkedlist.o qurl.o qnumeric.o qcryptographichash.o \ 22 qscriptasm.o qscriptast.o qscriptastvisitor.o \ 23 qscriptcompiler.o qscriptecmaarray.o qscriptecmaboolean.o \ 24 qscriptecmacore.o qscriptecmadate.o qscriptecmafunction.o \ 25 qscriptecmaglobal.o qscriptecmamath.o qscriptecmanumber.o \ 26 qscriptecmaobject.o qscriptecmaregexp.o qscriptecmastring.o \ 27 qscriptecmaerror.o qscriptcontext_p.o qscriptengine.o \ 28 qscriptengine_p.o qscriptextenumeration.o qscriptextvariant.o \ 29 qscriptcontext.o qscriptfunction.o \ 30 qscriptgrammar.o qscriptlexer.o qscriptclassdata.o \ 31 qscriptparser.o qscriptprettypretty.o qscriptsyntaxchecker.o \ 32 qscriptvalue.o qscriptvalueimpl.o qscriptvalueiterator.o \ 33 qscriptvalueiteratorimpl.o \ 34 qscriptclass.o qscriptclasspropertyiterator.o \ 35 qscriptengineagent.o qscriptcontextinfo.o qscriptstring.o \ 23 qlocale.o qlinkedlist.o qurl.o qnumeric.o qcryptographichash.o qxmlstream.o qxmlutils.o \ 36 24 $(QTOBJS) 37 25 … … 45 33 generators/makefiledeps.cpp option.cpp generators/win32/mingw_make.cpp generators/makefile.cpp \ 46 34 generators/win32/msvc_objectmodel.cpp generators/win32/msvc_nmake.cpp generators/win32/borland_bmake.cpp \ 35 generators/symbian/symmake.cpp generators/symbian/initprojectdeploy_symbian.cpp \ 36 generators/symbian/symmake_abld.cpp generators/symbian/symmake_sbsv2.cpp \ 47 37 generators/os2/gnumake.cpp \ 38 $(SOURCE_PATH)/src/corelib/codecs/qtextcodec.cpp $(SOURCE_PATH)/src/corelib/codecs/qutfcodec.cpp \ 48 39 $(SOURCE_PATH)/src/corelib/tools/qstring.cpp $(SOURCE_PATH)/src/corelib/io/qfile.cpp \ 49 40 $(SOURCE_PATH)/src/corelib/io/qtextstream.cpp $(SOURCE_PATH)/src/corelib/io/qiodevice.cpp \ … … 54 45 $(SOURCE_PATH)/src/corelib/io/qfsfileengine_unix.cpp $(SOURCE_PATH)/src/corelib/io/qabstractfileengine.cpp \ 55 46 $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator_unix.cpp $(SOURCE_PATH)/src/corelib/io/qfsfileengine_iterator.cpp \ 56 $(SOURCE_PATH)/src/corelib/io/qfsfileengine.cpp $(SOURCE_PATH)/src/corelib/tools/qlist data.cpp \47 $(SOURCE_PATH)/src/corelib/io/qfsfileengine.cpp $(SOURCE_PATH)/src/corelib/tools/qlist.cpp \ 57 48 $(SOURCE_PATH)/src/corelib/tools/qvector.cpp $(SOURCE_PATH)/src/corelib/tools/qbitarray.cpp \ 58 49 $(SOURCE_PATH)/src/corelib/io/qdiriterator.cpp \ … … 67 58 $(SOURCE_PATH)/src/corelib/global/qlibraryinfo.cpp $(SOURCE_PATH)/src/corelib/tools/qcryptographichash.cpp \ 68 59 $(SOURCE_PATH)/src/corelib/tools/qvsnprintf.cpp $(SOURCE_PATH)/src/corelib/global/qnumeric.cpp \ 69 $(SOURCE_PATH)/src/script/qscriptasm.cpp \ 70 $(SOURCE_PATH)/src/script/qscriptast.cpp $(SOURCE_PATH)/src/script/qscriptastvisitor.cpp \ 71 $(SOURCE_PATH)/src/script/qscriptcompiler.cpp $(SOURCE_PATH)/src/script/qscriptecmaarray.cpp \ 72 $(SOURCE_PATH)/src/script/qscriptecmaboolean.cpp $(SOURCE_PATH)/src/script/qscriptecmacore.cpp \ 73 $(SOURCE_PATH)/src/script/qscriptecmadate.cpp $(SOURCE_PATH)/src/script/qscriptecmafunction.cpp \ 74 $(SOURCE_PATH)/src/script/qscriptecmaglobal.cpp $(SOURCE_PATH)/src/script/qscriptecmamath.cpp \ 75 $(SOURCE_PATH)/src/script/qscriptecmanumber.cpp $(SOURCE_PATH)/src/script/qscriptecmaobject.cpp \ 76 $(SOURCE_PATH)/src/script/qscriptecmaregexp.cpp $(SOURCE_PATH)/src/script/qscriptecmastring.cpp \ 77 $(SOURCE_PATH)/src/script/qscriptecmaerror.cpp $(SOURCE_PATH)/src/script/qscriptcontext_p.cpp \ 78 $(SOURCE_PATH)/src/script/qscriptengine.cpp $(SOURCE_PATH)/src/script/qscriptengine_p.cpp \ 79 $(SOURCE_PATH)/src/script/qscriptextenumeration.cpp $(SOURCE_PATH)/src/script/qscriptextvariant.cpp \ 80 $(SOURCE_PATH)/src/script/qscriptcontext.cpp $(SOURCE_PATH)/src/script/qscriptfunction.cpp \ 81 $(SOURCE_PATH)/src/script/qscriptgrammar.cpp \ 82 $(SOURCE_PATH)/src/script/qscriptlexer.cpp $(SOURCE_PATH)/src/script/qscriptclassdata.cpp \ 83 $(SOURCE_PATH)/src/script/qscriptparser.cpp $(SOURCE_PATH)/src/script/qscriptprettypretty.cpp \ 84 $(SOURCE_PATH)/src/script/qscriptsyntaxchecker.cpp $(SOURCE_PATH)/src/script/qscriptvalueimpl.cpp \ 85 $(SOURCE_PATH)/src/script/qscriptvalue.cpp $(SOURCE_PATH)/src/script/qscriptvalueiterator.cpp \ 86 $(SOURCE_PATH)/src/script/qscriptvalueiteratorimpl.cpp \ 87 $(SOURCE_PATH)/src/script/qscriptclass.cpp $(SOURCE_PATH)/src/script/qscriptclasspropertyiterator.cpp \ 88 $(SOURCE_PATH)/src/script/qscriptengineagent.cpp $(SOURCE_PATH)/src/script/qscriptcontextinfo.cpp \ 89 $(SOURCE_PATH)/src/script/qscriptstring.cpp \ 60 $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp \ 61 $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp \ 90 62 $(QTSRCS) 91 63 92 CPPFLAGS = -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/ os2 -Igenerators/mac\64 CPPFLAGS = -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac -Igenerators/symbian -Igenerators/os2 \ 93 65 -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \ 94 -I$(BUILD_PATH)/src/corelib/global \95 - I$(SOURCE_PATH)/src/script -DQT_NO_PCRE \66 -I$(BUILD_PATH)/src/corelib/global -I$(BUILD_PATH)/src/corelib/xml \ 67 -DQT_NO_PCRE \ 96 68 -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED \ 97 69 -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_STL \ … … 162 134 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qurl.cpp 163 135 136 qutfcodec.o: $(SOURCE_PATH)/src/corelib/codecs/qutfcodec.cpp 137 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/codecs/qutfcodec.cpp 138 139 qtextcodec.o: $(SOURCE_PATH)/src/corelib/codecs/qtextcodec.cpp 140 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/codecs/qtextcodec.cpp 141 164 142 qstring.o: $(SOURCE_PATH)/src/corelib/tools/qstring.cpp 165 143 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qstring.cpp … … 174 152 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/io/qbuffer.cpp 175 153 176 qlist data.o: $(SOURCE_PATH)/src/corelib/tools/qlistdata.cpp177 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qlist data.cpp154 qlist.o: $(SOURCE_PATH)/src/corelib/tools/qlist.cpp 155 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qlist.cpp 178 156 179 157 qfile.o: $(SOURCE_PATH)/src/corelib/io/qfile.cpp … … 294 272 $(CXX) -c -o $@ $(CXXFLAGS) generators/win32/msvc_dsp.cpp 295 273 274 symmake.o: generators/symbian/symmake.cpp 275 $(CXX) -c -o $@ $(CXXFLAGS) generators/symbian/symmake.cpp 276 277 symmake_abld.o: generators/symbian/symmake_abld.cpp 278 $(CXX) -c -o $@ $(CXXFLAGS) generators/symbian/symmake_abld.cpp 279 280 symmake_sbsv2.o: generators/symbian/symmake_sbsv2.cpp 281 $(CXX) -c -o $@ $(CXXFLAGS) generators/symbian/symmake_sbsv2.cpp 282 283 initprojectdeploy_symbian.o: generators/symbian/initprojectdeploy_symbian.cpp 284 $(CXX) -c -o $@ $(CXXFLAGS) generators/symbian/initprojectdeploy_symbian.cpp 285 296 286 gnumake.o: generators/os2/gnumake.cpp 297 287 $(CXX) -c -o $@ $(CXXFLAGS) generators/os2/gnumake.cpp … … 300 290 $(CXX) -c -o $@ $(CXXFLAGS) generators/projectgenerator.cpp 301 291 302 qscriptasm.o: $(SOURCE_PATH)/src/script/qscriptasm.cpp 303 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptasm.cpp 304 305 qscriptast.o: $(SOURCE_PATH)/src/script/qscriptast.cpp 306 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptast.cpp 307 308 qscriptastvisitor.o: $(SOURCE_PATH)/src/script/qscriptastvisitor.cpp 309 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptastvisitor.cpp 310 311 qscriptcompiler.o: $(SOURCE_PATH)/src/script/qscriptcompiler.cpp 312 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptcompiler.cpp 313 314 qscriptecmaarray.o: $(SOURCE_PATH)/src/script/qscriptecmaarray.cpp 315 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaarray.cpp 316 317 qscriptecmaboolean.o: $(SOURCE_PATH)/src/script/qscriptecmaboolean.cpp 318 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaboolean.cpp 319 320 qscriptecmacore.o: $(SOURCE_PATH)/src/script/qscriptecmacore.cpp 321 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmacore.cpp 322 323 qscriptecmadate.o: $(SOURCE_PATH)/src/script/qscriptecmadate.cpp 324 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmadate.cpp 325 326 qscriptecmafunction.o: $(SOURCE_PATH)/src/script/qscriptecmafunction.cpp 327 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmafunction.cpp 328 329 qscriptecmaglobal.o: $(SOURCE_PATH)/src/script/qscriptecmaglobal.cpp 330 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaglobal.cpp 331 332 qscriptecmamath.o: $(SOURCE_PATH)/src/script/qscriptecmamath.cpp 333 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmamath.cpp 334 335 qscriptecmanumber.o: $(SOURCE_PATH)/src/script/qscriptecmanumber.cpp 336 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmanumber.cpp 337 338 qscriptecmaobject.o: $(SOURCE_PATH)/src/script/qscriptecmaobject.cpp 339 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaobject.cpp 340 341 qscriptecmaregexp.o: $(SOURCE_PATH)/src/script/qscriptecmaregexp.cpp 342 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaregexp.cpp 343 344 qscriptecmastring.o: $(SOURCE_PATH)/src/script/qscriptecmastring.cpp 345 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmastring.cpp 346 347 qscriptecmaerror.o: $(SOURCE_PATH)/src/script/qscriptecmaerror.cpp 348 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptecmaerror.cpp 349 350 qscriptcontext_p.o: $(SOURCE_PATH)/src/script/qscriptcontext_p.cpp 351 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptcontext_p.cpp 352 353 qscriptengine.o: $(SOURCE_PATH)/src/script/qscriptengine.cpp 354 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptengine.cpp 355 356 qscriptengine_p.o: $(SOURCE_PATH)/src/script/qscriptengine_p.cpp 357 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptengine_p.cpp 358 359 qscriptextenumeration.o: $(SOURCE_PATH)/src/script/qscriptextenumeration.cpp 360 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptextenumeration.cpp 361 362 qscriptextvariant.o: $(SOURCE_PATH)/src/script/qscriptextvariant.cpp 363 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptextvariant.cpp 364 365 qscriptcontext.o: $(SOURCE_PATH)/src/script/qscriptcontext.cpp 366 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptcontext.cpp 367 368 qscriptfunction.o: $(SOURCE_PATH)/src/script/qscriptfunction.cpp 369 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptfunction.cpp 370 371 qscriptgrammar.o: $(SOURCE_PATH)/src/script/qscriptgrammar.cpp 372 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptgrammar.cpp 373 374 qscriptlexer.o: $(SOURCE_PATH)/src/script/qscriptlexer.cpp 375 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptlexer.cpp 376 377 qscriptclassdata.o: $(SOURCE_PATH)/src/script/qscriptclassdata.cpp 378 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptclassdata.cpp 379 380 qscriptparser.o: $(SOURCE_PATH)/src/script/qscriptparser.cpp 381 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptparser.cpp 382 383 qscriptprettypretty.o: $(SOURCE_PATH)/src/script/qscriptprettypretty.cpp 384 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptprettypretty.cpp 385 386 qscriptsyntaxchecker.o: $(SOURCE_PATH)/src/script/qscriptsyntaxchecker.cpp 387 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptsyntaxchecker.cpp 388 389 qscriptvalue.o: $(SOURCE_PATH)/src/script/qscriptvalue.cpp 390 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptvalue.cpp 391 392 qscriptvalueimpl.o: $(SOURCE_PATH)/src/script/qscriptvalueimpl.cpp 393 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptvalueimpl.cpp 394 395 qscriptvalueiterator.o: $(SOURCE_PATH)/src/script/qscriptvalueiterator.cpp 396 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptvalueiterator.cpp 397 398 qscriptvalueiteratorimpl.o: $(SOURCE_PATH)/src/script/qscriptvalueiteratorimpl.cpp 399 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptvalueiteratorimpl.cpp 400 401 qscriptclass.o: $(SOURCE_PATH)/src/script/qscriptclass.cpp 402 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptclass.cpp 403 404 qscriptclasspropertyiterator.o: $(SOURCE_PATH)/src/script/qscriptclasspropertyiterator.cpp 405 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptclasspropertyiterator.cpp 406 407 qscriptengineagent.o: $(SOURCE_PATH)/src/script/qscriptengineagent.cpp 408 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptengineagent.cpp 409 410 qscriptcontextinfo.o: $(SOURCE_PATH)/src/script/qscriptcontextinfo.cpp 411 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptcontextinfo.cpp 412 413 qscriptstring.o: $(SOURCE_PATH)/src/script/qscriptstring.cpp 414 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/script/qscriptstring.cpp 415 292 qxmlstream.o: $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp 293 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/xml/qxmlstream.cpp 294 295 qxmlutils.o: $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp 296 $(CXX) -c -o $@ $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp 416 297 #default rules 417 298 .cpp.o:
Note:
See TracChangeset
for help on using the changeset viewer.
