summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--qmake/Makefile2
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
@@ -14,25 +14,25 @@ OBJS=project.o main.o makefile.o unixmake2.o unixmake.o borland_bmake.o \
14 14
15#qt code 15#qt code
16QOBJS=qstring.o qtextstream.o qiodevice.o qglobal.o qgdict.o qcstring.o \ 16QOBJS=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
22CFLAGS= \ 22CFLAGS= \
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++
27CXXFLAGS= $(CFLAGS) 27CXXFLAGS= $(CFLAGS)
28LFLAGS= 28LFLAGS=
29 29
30qmake: $(OBJS) $(QOBJS) 30qmake: $(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
35install: qmake 35install: 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)