From 323e9a7472a110b4befba7320540263147505bae Mon Sep 17 00:00:00 2001 From: zecke Date: Thu, 15 Jul 2004 17:36:57 +0000 Subject: Manually updatet to qmake1.06a which includes support for precompiled headers. Opies 'PRO' keyword was already reintroduced --- (limited to 'qmake/Makefile') diff --git a/qmake/Makefile b/qmake/Makefile index 01bb1a1..5a72210 100644 --- a/qmake/Makefile +++ b/qmake/Makefile @@ -1,29 +1,47 @@ QMAKESPECSDIR=$(OPIEDIR)/mkspecs -######################################################################## -## This file was autogenerated by configure, all changes will be lost ## -######################################################################## CC = gcc CXX = g++ #qmake code -OBJS=project.o main.o makefile.o unixmake2.o unixmake.o borland_bmake.o \ - mingw_make.o msvc_nmake.o msvc_dsp.o msvc_vcproj.o option.o winmakefile.o \ - projectgenerator.o metrowerks_xml.o pbuilder_pbx.o msvc_objectmodel.o +OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o msvc_nmake.o \ + borland_bmake.o mingw_make.o msvc_dsp.o msvc_vcproj.o option.o \ + winmakefile.o projectgenerator.o metrowerks_xml.o pbuilder_pbx.o \ + msvc_objectmodel.o meta.o qtmd5.o #qt code QOBJS=qstring.o qtextstream.o qiodevice.o qglobal.o qgdict.o qcstring.o \ qdatastream.o qgarray.o qbuffer.o qglist.o qptrcollection.o qfile.o \ qfile_unix.o qregexp.o qgvector.o qgcache.o qbitarray.o qdir.o quuid.o \ qfileinfo_unix.o qdir_unix.o qfileinfo.o qdatetime.o qstringlist.o qmap.o \ - qconfig.o - -CFLAGS= \ + qconfig.o qunicodetables.o qsettings.o qlocale.o + +#all sources, used for the depend target +DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp qtmd5.cpp generators/makefile.cpp generators/unix/unixmake2.cpp \ + generators/unix/unixmake.cpp generators/win32/msvc_nmake.cpp generators/win32/borland_bmake.cpp \ + generators/win32/winmakefile.cpp generators/projectgenerator.cpp generators/mac/metrowerks_xml.cpp \ + generators/mac/pbuilder_pbx.cpp generators/win32/msvc_objectmodel.cpp \ + $(OPIEDIR)/qmake/tools/qstring.cpp $(OPIEDIR)/qmake/tools/qtextstream.cpp \ + $(OPIEDIR)/qmake/tools/qiodevice.cpp $(OPIEDIR)/qmake/tools/qglobal.cpp \ + $(OPIEDIR)/qmake/tools/qgdict.cpp $(OPIEDIR)/qmake/tools/qcstring.cpp \ + $(OPIEDIR)/qmake/tools/qdatastream.cpp $(OPIEDIR)/qmake/src/tools/qgarray.cpp \ + $(OPIEDIR)/qmake/tools/qbuffer.cpp $(OPIEDIR)/qmake/tools/qglist.cpp \ + $(OPIEDIR)/qmake/tools/qptrcollection.cpp $(OPIEDIR)/qmake/tools/qfile.cpp \ + $(OPIEDIR)/qmake/tools/qfile_unix.cpp $(OPIEDIR)/qmake/tools/qregexp.cpp \ + $(OPIEDIR)/qmake/tools/qgvector.cpp $(OPIEDIR)/qmake/tools/qgcache.cpp \ + $(OPIEDIR)/qmake/tools/qbitarray.cpp $(OPIEDIR)/qmake/tools/qdir.cpp \ + $(OPIEDIR)/qmake/tools/quuid.cpp $(OPIEDIR)/qmake/tools/qfileinfo_unix.cpp \ + $(OPIEDIR)/qmake/tools/qdir_unix.cpp $(OPIEDIR)/qmake/tools/qfileinfo.cpp \ + $(OPIEDIR)/qmake/tools/qdatetime.cpp $(OPIEDIR)/qmake/tools/qstringlist.cpp \ + $(OPIEDIR)/qmake/tools/qmap.cpp $(OPIEDIR)/qmake/tools/qconfig.cpp \ + $(OPIEDIR)/qmake/tools/qsettings.cpp $(OPIEDIR)/qmake/tools/qurl.cpp \ + $(OPIEDIR)/qmake/tools/qsettings_mac.cpp $(OPIEDIR)/qmake/tools/qlocale.cpp + +CXXFLAGS= \ -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \ - -I$(OPIEDIR)/qmake/include -I$(OPIEDIR)/qmake/include/qmake -I$(QMAKESPECSDIR)/default \ - -I$(OPIEDIR)/qmake/include/private \ - -DQT_NO_TEXTCODEC -DQT_LITE_COMPONENT -DQT_NO_STL -DQT_NO_COMPRESS -CXXFLAGS= $(CFLAGS) + -I$(OPIEDIR)/qmake/include/qmake -I$(OPIEDIR)/qmake/include -I$(OPIEDIR)/qmake/include/private \ + -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_STL \ + -DQT_NO_COMPRESS -I$(QMAKESPECSDIR)/default -DHAVE_QCONFIG_CPP LFLAGS= qmake: $(OBJS) $(QOBJS) @@ -43,6 +61,7 @@ clean:: distclean:: clean rm -rf qmake .deps + # don't use optimization for these qtextstream.o: $(OPIEDIR)/qmake/tools/qtextstream.cpp $(CXX) -c -o $@ $(CXXFLAGS) $(OPIEDIR)/qmake/tools/qtextstream.cpp @@ -59,12 +78,27 @@ qgdict.o: $(OPIEDIR)/qmake/tools/qgdict.cpp qcstring.o: $(OPIEDIR)/qmake/tools/qcstring.cpp $(CXX) -c -o $@ $(CXXFLAGS) $(OPIEDIR)/qmake/tools/qcstring.cpp +qsettings.o: $(OPIEDIR)/qmake/tools/qsettings.cpp + $(CXX) -c -o $@ $(CXXFLAGS) $(OPIEDIR)/qmake/tools/qsettings.cpp + +qsettings_mac.o: $(OPIEDIR)/qmake/tools/qsettings_mac.cpp + $(CXX) -c -o $@ $(CXXFLAGS) $(OPIEDIR)/qmake/tools/qsettings_mac.cpp + +qurl.o: $(OPIEDIR)/qmake/kernel/qurl.cpp + $(CXX) -c -o $@ $(CXXFLAGS) $(OPIEDIR)/qmake/kernel/qurl.cpp + qstring.o: $(OPIEDIR)/qmake/tools/qstring.cpp $(CXX) -c -o $@ $(CXXFLAGS) $(OPIEDIR)/qmake/tools/qstring.cpp +qlocale.o: $(OPIEDIR)/qmake/tools/qlocale.cpp + $(CXX) -c -o $@ $(CXXFLAGS) $(OPIEDIR)/qmake/tools/qlocale.cpp + qdatastream.o: $(OPIEDIR)/qmake/tools/qdatastream.cpp $(CXX) -c -o $@ $(CXXFLAGS) $(OPIEDIR)/qmake/tools/qdatastream.cpp +qunicodetables.o: $(OPIEDIR)/qmake/tools/qunicodetables.cpp + $(CXX) -c -o $@ $(CXXFLAGS) $(OPIEDIR)/qmake/tools/qunicodetables.cpp + qgarray.o: $(OPIEDIR)/qmake/tools/qgarray.cpp $(CXX) -c -o $@ $(CXXFLAGS) $(OPIEDIR)/qmake/tools/qgarray.cpp @@ -128,12 +162,21 @@ winmakefile.o: generators/win32/winmakefile.cpp project.o: project.cpp project.h option.h $(CXX) -c -o $@ $(CXXFLAGS) project.cpp +property.o: property.cpp project.h option.h + $(CXX) -c -o $@ $(CXXFLAGS) property.cpp + +meta.o: meta.cpp project.h option.h + $(CXX) -c -o $@ $(CXXFLAGS) meta.cpp + main.o: main.cpp project.h $(CXX) -c -o $@ $(CXXFLAGS) main.cpp option.o: option.cpp option.h $(CXX) -c -o $@ $(CXXFLAGS) option.cpp +qtmd5.o: qtmd5.cpp + $(CXX) -c -o $@ $(CXXFLAGS) qtmd5.cpp + makefile.o: generators/makefile.cpp $(CXX) -c -o $@ $(CXXFLAGS) generators/makefile.cpp @@ -171,8 +214,7 @@ projectgenerator.o: generators/projectgenerator.cpp $(CXX) -c -o $@ $(CXXFLAGS) generators/projectgenerator.cpp #default rules -.c.o: - $(CC) -c -o $@ $(CFLAGS) $< - .cpp.o: $(CXX) -c -o $@ $(CXXFLAGS) $< + +# DO NOT DELETE THIS LINE -- make depend depends on it -- cgit v0.9.0.2