author | zecke <zecke> | 2004-07-15 17:36:57 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-07-15 17:36:57 (UTC) |
commit | 323e9a7472a110b4befba7320540263147505bae (patch) (unidiff) | |
tree | 14c810bdb9c0603a30356b17b4bdf9ccb72741c6 /qmake/Makefile | |
parent | aa292b322f1ecb43dd8f4e3cd295855730dd9f59 (diff) | |
download | opie-323e9a7472a110b4befba7320540263147505bae.zip opie-323e9a7472a110b4befba7320540263147505bae.tar.gz opie-323e9a7472a110b4befba7320540263147505bae.tar.bz2 |
Manually updatet to qmake1.06a which includes support for precompiled
headers.
Opies 'PRO' keyword was already reintroduced
-rw-r--r-- | qmake/Makefile | 74 |
1 files changed, 58 insertions, 16 deletions
diff --git a/qmake/Makefile b/qmake/Makefile index 01bb1a1..5a72210 100644 --- a/qmake/Makefile +++ b/qmake/Makefile | |||
@@ -2,5 +2,2 @@ QMAKESPECSDIR=$(OPIEDIR)/mkspecs | |||
2 | 2 | ||
3 | ######################################################################## | ||
4 | ## This file was autogenerated by configure, all changes will be lost ## | ||
5 | ######################################################################## | ||
6 | CC = gcc | 3 | CC = gcc |
@@ -9,5 +6,6 @@ CXX = g++ | |||
9 | #qmake code | 6 | #qmake code |
10 | OBJS=project.o main.o makefile.o unixmake2.o unixmake.o borland_bmake.o \ | 7 | OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o msvc_nmake.o \ |
11 | mingw_make.o msvc_nmake.o msvc_dsp.o msvc_vcproj.o option.o winmakefile.o \ | 8 | borland_bmake.o mingw_make.o msvc_dsp.o msvc_vcproj.o option.o \ |
12 | projectgenerator.o metrowerks_xml.o pbuilder_pbx.o msvc_objectmodel.o | 9 | winmakefile.o projectgenerator.o metrowerks_xml.o pbuilder_pbx.o \ |
10 | msvc_objectmodel.o meta.o qtmd5.o | ||
13 | 11 | ||
@@ -18,10 +16,30 @@ QOBJS=qstring.o qtextstream.o qiodevice.o qglobal.o qgdict.o qcstring.o \ | |||
18 | qfileinfo_unix.o qdir_unix.o qfileinfo.o qdatetime.o qstringlist.o qmap.o \ | 16 | qfileinfo_unix.o qdir_unix.o qfileinfo.o qdatetime.o qstringlist.o qmap.o \ |
19 | qconfig.o | 17 | qconfig.o qunicodetables.o qsettings.o qlocale.o |
20 | 18 | ||
21 | CFLAGS= \ | 19 | #all sources, used for the depend target |
20 | DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp qtmd5.cpp generators/makefile.cpp generators/unix/unixmake2.cpp \ | ||
21 | generators/unix/unixmake.cpp generators/win32/msvc_nmake.cpp generators/win32/borland_bmake.cpp \ | ||
22 | generators/win32/winmakefile.cpp generators/projectgenerator.cpp generators/mac/metrowerks_xml.cpp \ | ||
23 | generators/mac/pbuilder_pbx.cpp generators/win32/msvc_objectmodel.cpp \ | ||
24 | $(OPIEDIR)/qmake/tools/qstring.cpp $(OPIEDIR)/qmake/tools/qtextstream.cpp \ | ||
25 | $(OPIEDIR)/qmake/tools/qiodevice.cpp $(OPIEDIR)/qmake/tools/qglobal.cpp \ | ||
26 | $(OPIEDIR)/qmake/tools/qgdict.cpp $(OPIEDIR)/qmake/tools/qcstring.cpp \ | ||
27 | $(OPIEDIR)/qmake/tools/qdatastream.cpp $(OPIEDIR)/qmake/src/tools/qgarray.cpp \ | ||
28 | $(OPIEDIR)/qmake/tools/qbuffer.cpp $(OPIEDIR)/qmake/tools/qglist.cpp \ | ||
29 | $(OPIEDIR)/qmake/tools/qptrcollection.cpp $(OPIEDIR)/qmake/tools/qfile.cpp \ | ||
30 | $(OPIEDIR)/qmake/tools/qfile_unix.cpp $(OPIEDIR)/qmake/tools/qregexp.cpp \ | ||
31 | $(OPIEDIR)/qmake/tools/qgvector.cpp $(OPIEDIR)/qmake/tools/qgcache.cpp \ | ||
32 | $(OPIEDIR)/qmake/tools/qbitarray.cpp $(OPIEDIR)/qmake/tools/qdir.cpp \ | ||
33 | $(OPIEDIR)/qmake/tools/quuid.cpp $(OPIEDIR)/qmake/tools/qfileinfo_unix.cpp \ | ||
34 | $(OPIEDIR)/qmake/tools/qdir_unix.cpp $(OPIEDIR)/qmake/tools/qfileinfo.cpp \ | ||
35 | $(OPIEDIR)/qmake/tools/qdatetime.cpp $(OPIEDIR)/qmake/tools/qstringlist.cpp \ | ||
36 | $(OPIEDIR)/qmake/tools/qmap.cpp $(OPIEDIR)/qmake/tools/qconfig.cpp \ | ||
37 | $(OPIEDIR)/qmake/tools/qsettings.cpp $(OPIEDIR)/qmake/tools/qurl.cpp \ | ||
38 | $(OPIEDIR)/qmake/tools/qsettings_mac.cpp $(OPIEDIR)/qmake/tools/qlocale.cpp | ||
39 | |||
40 | CXXFLAGS= \ | ||
22 | -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \ | 41 | -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \ |
23 | -I$(OPIEDIR)/qmake/include -I$(OPIEDIR)/qmake/include/qmake -I$(QMAKESPECSDIR)/default \ | 42 | -I$(OPIEDIR)/qmake/include/qmake -I$(OPIEDIR)/qmake/include -I$(OPIEDIR)/qmake/include/private \ |
24 | -I$(OPIEDIR)/qmake/include/private \ | 43 | -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_STL \ |
25 | -DQT_NO_TEXTCODEC -DQT_LITE_COMPONENT -DQT_NO_STL -DQT_NO_COMPRESS | 44 | -DQT_NO_COMPRESS -I$(QMAKESPECSDIR)/default -DHAVE_QCONFIG_CPP |
26 | CXXFLAGS= $(CFLAGS) | ||
27 | LFLAGS= | 45 | LFLAGS= |
@@ -45,2 +63,3 @@ distclean:: clean | |||
45 | 63 | ||
64 | |||
46 | # don't use optimization for these | 65 | # don't use optimization for these |
@@ -61,2 +80,11 @@ qcstring.o: $(OPIEDIR)/qmake/tools/qcstring.cpp | |||
61 | 80 | ||
81 | qsettings.o: $(OPIEDIR)/qmake/tools/qsettings.cpp | ||
82 | $(CXX) -c -o $@ $(CXXFLAGS) $(OPIEDIR)/qmake/tools/qsettings.cpp | ||
83 | |||
84 | qsettings_mac.o: $(OPIEDIR)/qmake/tools/qsettings_mac.cpp | ||
85 | $(CXX) -c -o $@ $(CXXFLAGS) $(OPIEDIR)/qmake/tools/qsettings_mac.cpp | ||
86 | |||
87 | qurl.o: $(OPIEDIR)/qmake/kernel/qurl.cpp | ||
88 | $(CXX) -c -o $@ $(CXXFLAGS) $(OPIEDIR)/qmake/kernel/qurl.cpp | ||
89 | |||
62 | qstring.o: $(OPIEDIR)/qmake/tools/qstring.cpp | 90 | qstring.o: $(OPIEDIR)/qmake/tools/qstring.cpp |
@@ -64,2 +92,5 @@ qstring.o: $(OPIEDIR)/qmake/tools/qstring.cpp | |||
64 | 92 | ||
93 | qlocale.o: $(OPIEDIR)/qmake/tools/qlocale.cpp | ||
94 | $(CXX) -c -o $@ $(CXXFLAGS) $(OPIEDIR)/qmake/tools/qlocale.cpp | ||
95 | |||
65 | qdatastream.o: $(OPIEDIR)/qmake/tools/qdatastream.cpp | 96 | qdatastream.o: $(OPIEDIR)/qmake/tools/qdatastream.cpp |
@@ -67,2 +98,5 @@ qdatastream.o: $(OPIEDIR)/qmake/tools/qdatastream.cpp | |||
67 | 98 | ||
99 | qunicodetables.o: $(OPIEDIR)/qmake/tools/qunicodetables.cpp | ||
100 | $(CXX) -c -o $@ $(CXXFLAGS) $(OPIEDIR)/qmake/tools/qunicodetables.cpp | ||
101 | |||
68 | qgarray.o: $(OPIEDIR)/qmake/tools/qgarray.cpp | 102 | qgarray.o: $(OPIEDIR)/qmake/tools/qgarray.cpp |
@@ -130,2 +164,8 @@ project.o: project.cpp project.h option.h | |||
130 | 164 | ||
165 | property.o: property.cpp project.h option.h | ||
166 | $(CXX) -c -o $@ $(CXXFLAGS) property.cpp | ||
167 | |||
168 | meta.o: meta.cpp project.h option.h | ||
169 | $(CXX) -c -o $@ $(CXXFLAGS) meta.cpp | ||
170 | |||
131 | main.o: main.cpp project.h | 171 | main.o: main.cpp project.h |
@@ -136,2 +176,5 @@ option.o: option.cpp option.h | |||
136 | 176 | ||
177 | qtmd5.o: qtmd5.cpp | ||
178 | $(CXX) -c -o $@ $(CXXFLAGS) qtmd5.cpp | ||
179 | |||
137 | makefile.o: generators/makefile.cpp | 180 | makefile.o: generators/makefile.cpp |
@@ -173,6 +216,5 @@ projectgenerator.o: generators/projectgenerator.cpp | |||
173 | #default rules | 216 | #default rules |
174 | .c.o: | ||
175 | $(CC) -c -o $@ $(CFLAGS) $< | ||
176 | |||
177 | .cpp.o: | 217 | .cpp.o: |
178 | $(CXX) -c -o $@ $(CXXFLAGS) $< | 218 | $(CXX) -c -o $@ $(CXXFLAGS) $< |
219 | |||
220 | # DO NOT DELETE THIS LINE -- make depend depends on it | ||