summaryrefslogtreecommitdiff
path: root/qmake
authorkergoth <kergoth>2003-01-16 23:38:48 (UTC)
committer kergoth <kergoth>2003-01-16 23:38:48 (UTC)
commitb78b1ee522773a00cefb5b96b7d1262416f18aa6 (patch) (unidiff)
treebc0a8ecb29326d2312ff03755dd74f07b84d32fc /qmake
parent0ec2acb93d322caefff68191678141d72f8d6da7 (diff)
downloadopie-b78b1ee522773a00cefb5b96b7d1262416f18aa6.zip
opie-b78b1ee522773a00cefb5b96b7d1262416f18aa6.tar.gz
opie-b78b1ee522773a00cefb5b96b7d1262416f18aa6.tar.bz2
Yank an unnecessary include spotted by Max
Diffstat (limited to 'qmake') (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 86dd77d..90b0f07 100644
--- a/qmake/Makefile
+++ b/qmake/Makefile
@@ -13,25 +13,25 @@ OBJS=project.o main.o makefile.o unixmake2.o unixmake.o borland_bmake.o \
13 13
14#qt code 14#qt code
15QOBJS=qstring.o qtextstream.o qiodevice.o qglobal.o qgdict.o qcstring.o \ 15QOBJS=qstring.o qtextstream.o qiodevice.o qglobal.o qgdict.o qcstring.o \
16 qdatastream.o qgarray.o qbuffer.o qglist.o qptrcollection.o qfile.o \ 16 qdatastream.o qgarray.o qbuffer.o qglist.o qptrcollection.o qfile.o \
17 qfile_unix.o qregexp.o qgvector.o qgcache.o qbitarray.o qdir.o \ 17 qfile_unix.o qregexp.o qgvector.o qgcache.o qbitarray.o qdir.o \
18 qfileinfo_unix.o qdir_unix.o qfileinfo.o qdatetime.o qstringlist.o qmap.o \ 18 qfileinfo_unix.o qdir_unix.o qfileinfo.o qdatetime.o qstringlist.o qmap.o \
19 qconfig.o 19 qconfig.o
20 20
21CFLAGS= \ 21CFLAGS= \
22 -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \ 22 -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
23 -I$(OPIEDIR)/qmake/include -I$(OPIEDIR)/qmake/include/qmake -I$(QMAKESPECSDIR)/default \ 23 -I$(OPIEDIR)/qmake/include -I$(OPIEDIR)/qmake/include/qmake -I$(QMAKESPECSDIR)/default \
24 -I$(OPIEDIR)/qmake/include/private \ 24 -I$(OPIEDIR)/qmake/include/private \
25 -DQT_NO_TEXTCODEC -DQT_LITE_COMPONENT -DQT_NO_STL -DQT_NO_COMPRESS -I$(QMAKESPECSDIR)/qws/linux-x86-g++ 25 -DQT_NO_TEXTCODEC -DQT_LITE_COMPONENT -DQT_NO_STL -DQT_NO_COMPRESS
26CXXFLAGS= $(CFLAGS) 26CXXFLAGS= $(CFLAGS)
27LFLAGS= 27LFLAGS=
28 28
29qmake: $(OBJS) $(QOBJS) 29qmake: $(OBJS) $(QOBJS)
30 $(CXX) -o $@ $(OBJS) $(QOBJS) $(LFLAGS) 30 $(CXX) -o $@ $(OBJS) $(QOBJS) $(LFLAGS)
31 $(if $(OPIEDIR),rm -f $(OPIEDIR)/bin/$@) 31 $(if $(OPIEDIR),rm -f $(OPIEDIR)/bin/$@)
32 $(if $(OPIEDIR),ln -s ../qmake/$@ $(OPIEDIR)/bin/$@) 32 $(if $(OPIEDIR),ln -s ../qmake/$@ $(OPIEDIR)/bin/$@)
33 33
34install: qmake 34install: qmake
35 [ -d $(INSTALL_ROOT)$(QTDIR)/bin ] || mkdir -p $(INSTALL_ROOT)$(QTDIR)/bin 35 [ -d $(INSTALL_ROOT)$(QTDIR)/bin ] || mkdir -p $(INSTALL_ROOT)$(QTDIR)/bin
36 -cp -f $(QTDIR)/bin/qmake $(INSTALL_ROOT)$(QTDIR)/bin 36 -cp -f $(QTDIR)/bin/qmake $(INSTALL_ROOT)$(QTDIR)/bin
37 [ -d $(INSTALL_ROOT)$(QTDIR) ] || mkdir -p $(INSTALL_ROOT)$(QTDIR) 37 [ -d $(INSTALL_ROOT)$(QTDIR) ] || mkdir -p $(INSTALL_ROOT)$(QTDIR)