author | kergoth <kergoth> | 2002-11-01 05:26:47 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-11-01 05:26:47 (UTC) |
commit | c1bebfec181211aacbe9e9b85bcccfe4aef98a67 (patch) (unidiff) | |
tree | 98b1302174fb6294bf83298c4cc37341646194bf | |
parent | 8f506dbc2b70df5ea0dd6c61014d20b433b1372f (diff) | |
download | opie-c1bebfec181211aacbe9e9b85bcccfe4aef98a67.zip opie-c1bebfec181211aacbe9e9b85bcccfe4aef98a67.tar.gz opie-c1bebfec181211aacbe9e9b85bcccfe4aef98a67.tar.bz2 |
typo
-rw-r--r-- | qmake/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/Makefile b/qmake/Makefile index 104cc44..7ad05d9 100644 --- a/qmake/Makefile +++ b/qmake/Makefile | |||
@@ -10,33 +10,33 @@ CXX = g++ | |||
10 | #qmake code | 10 | #qmake code |
11 | OBJS=project.o main.o makefile.o unixmake2.o unixmake.o borland_bmake.o \ | 11 | OBJS=project.o main.o makefile.o unixmake2.o unixmake.o borland_bmake.o \ |
12 | msvc_nmake.o msvc_dsp.o msvc_vcproj.o option.o winmakefile.o \ | 12 | msvc_nmake.o msvc_dsp.o msvc_vcproj.o option.o winmakefile.o \ |
13 | projectgenerator.o metrowerks_xml.o pbuilder_pbx.o msvc_objectmodel.o | 13 | projectgenerator.o metrowerks_xml.o pbuilder_pbx.o msvc_objectmodel.o |
14 | 14 | ||
15 | #qt code | 15 | #qt code |
16 | QOBJS=qstring.o qtextstream.o qiodevice.o qglobal.o qgdict.o qcstring.o \ | 16 | QOBJS=qstring.o qtextstream.o qiodevice.o qglobal.o qgdict.o qcstring.o \ |
17 | qdatastream.o qgarray.o qbuffer.o qglist.o qptrcollection.o qfile.o \ | 17 | qdatastream.o qgarray.o qbuffer.o qglist.o qptrcollection.o qfile.o \ |
18 | qfile_unix.o qregexp.o qgvector.o qgcache.o qbitarray.o qdir.o \ | 18 | qfile_unix.o qregexp.o qgvector.o qgcache.o qbitarray.o qdir.o \ |
19 | qfileinfo_unix.o qdir_unix.o qfileinfo.o qdatetime.o qstringlist.o qmap.o \ | 19 | qfileinfo_unix.o qdir_unix.o qfileinfo.o qdatetime.o qstringlist.o qmap.o \ |
20 | qconfig.o | 20 | qconfig.o |
21 | 21 | ||
22 | CFLAGS= \ | 22 | CFLAGS= \ |
23 | -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \ | 23 | -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \ |
24 | -I$(TOPDIR)/include -I$(TOPDIR)/include/qmake -I$(QMAKESPECSDIR)/default \ | 24 | -I$(TOPDIR)/include -I$(TOPDIR)/include/qmake -I$(QMAKESPECSDIR)/default \ |
25 | -I$(TOPDIR)/include/private \ | 25 | -I$(TOPDIR)/include/private \ |
26 | -DQT_NO_TEXTCODEC -DQT_LITE_COMPONENT -DQT_NO_STL -DQT_NO_COMPRESS -I$(QMAKESPECDIR)/qws/linux-x86-g++ | 26 | -DQT_NO_TEXTCODEC -DQT_LITE_COMPONENT -DQT_NO_STL -DQT_NO_COMPRESS -I$(QMAKESPECSDIR)/qws/linux-x86-g++ |
27 | CXXFLAGS= $(CFLAGS) | 27 | CXXFLAGS= $(CFLAGS) |
28 | LFLAGS= | 28 | LFLAGS= |
29 | 29 | ||
30 | qmake: $(OBJS) $(QOBJS) | 30 | qmake: $(OBJS) $(QOBJS) |
31 | $(CXX) -o $@ $(OBJS) $(QOBJS) $(LFLAGS) | 31 | $(CXX) -o $@ $(OBJS) $(QOBJS) $(LFLAGS) |
32 | $(if $(OPIEDIR),rm -f $(OPIEDIR)/bin/$@) | 32 | $(if $(OPIEDIR),rm -f $(OPIEDIR)/bin/$@) |
33 | $(if $(OPIEDIR),ln -s ../qmake/$@ $(OPIEDIR)/bin/$@) | 33 | $(if $(OPIEDIR),ln -s ../qmake/$@ $(OPIEDIR)/bin/$@) |
34 | 34 | ||
35 | install: qmake | 35 | install: qmake |
36 | [ -d $(INSTALL_ROOT)$(QTDIR)/bin ] || mkdir -p $(INSTALL_ROOT)$(QTDIR)/bin | 36 | [ -d $(INSTALL_ROOT)$(QTDIR)/bin ] || mkdir -p $(INSTALL_ROOT)$(QTDIR)/bin |
37 | -cp -f $(QTDIR)/bin/qmake $(INSTALL_ROOT)$(QTDIR)/bin | 37 | -cp -f $(QTDIR)/bin/qmake $(INSTALL_ROOT)$(QTDIR)/bin |
38 | [ -d $(INSTALL_ROOT)$(QTDIR) ] || mkdir -p $(INSTALL_ROOT)$(QTDIR) | 38 | [ -d $(INSTALL_ROOT)$(QTDIR) ] || mkdir -p $(INSTALL_ROOT)$(QTDIR) |
39 | -cp -r -f $(QMAKESPECDIR) $(INSTALL_ROOT)$(QTDIR) | 39 | -cp -r -f $(QMAKESPECDIR) $(INSTALL_ROOT)$(QTDIR) |
40 | 40 | ||
41 | clean:: | 41 | clean:: |
42 | rm -f $(OBJS) $(QOBJS) | 42 | rm -f $(OBJS) $(QOBJS) |