summaryrefslogtreecommitdiff
authorkergoth <kergoth>2003-01-16 23:38:48 (UTC)
committer kergoth <kergoth>2003-01-16 23:38:48 (UTC)
commitb78b1ee522773a00cefb5b96b7d1262416f18aa6 (patch) (side-by-side diff)
treebc0a8ecb29326d2312ff03755dd74f07b84d32fc
parent0ec2acb93d322caefff68191678141d72f8d6da7 (diff)
downloadopie-b78b1ee522773a00cefb5b96b7d1262416f18aa6.zip
opie-b78b1ee522773a00cefb5b96b7d1262416f18aa6.tar.gz
opie-b78b1ee522773a00cefb5b96b7d1262416f18aa6.tar.bz2
Yank an unnecessary include spotted by Max
Diffstat (more/less context) (show 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
@@ -1,49 +1,49 @@
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 \
msvc_nmake.o msvc_dsp.o msvc_vcproj.o option.o winmakefile.o \
projectgenerator.o metrowerks_xml.o pbuilder_pbx.o msvc_objectmodel.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 \
qfileinfo_unix.o qdir_unix.o qfileinfo.o qdatetime.o qstringlist.o qmap.o \
qconfig.o
CFLAGS= \
-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 -I$(QMAKESPECSDIR)/qws/linux-x86-g++
+ -DQT_NO_TEXTCODEC -DQT_LITE_COMPONENT -DQT_NO_STL -DQT_NO_COMPRESS
CXXFLAGS= $(CFLAGS)
LFLAGS=
qmake: $(OBJS) $(QOBJS)
$(CXX) -o $@ $(OBJS) $(QOBJS) $(LFLAGS)
$(if $(OPIEDIR),rm -f $(OPIEDIR)/bin/$@)
$(if $(OPIEDIR),ln -s ../qmake/$@ $(OPIEDIR)/bin/$@)
install: qmake
[ -d $(INSTALL_ROOT)$(QTDIR)/bin ] || mkdir -p $(INSTALL_ROOT)$(QTDIR)/bin
-cp -f $(QTDIR)/bin/qmake $(INSTALL_ROOT)$(QTDIR)/bin
[ -d $(INSTALL_ROOT)$(QTDIR) ] || mkdir -p $(INSTALL_ROOT)$(QTDIR)
-cp -r -f $(QMAKESPECSDIR) $(INSTALL_ROOT)$(QTDIR)
clean::
rm -f $(OBJS) $(QOBJS)
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