diff options
| author | Darrell Anderson <[email protected]> | 2012-06-19 19:15:41 -0500 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2012-06-19 19:15:41 -0500 |
| commit | e07167f4f6448ad4f5565609e5cd56a918d256f8 (patch) | |
| tree | 2b727f0d725e575301e7562fa165e6b9573f4a63 /qmake/Makefile.unix | |
| parent | d1096751ddb25cdef23919c17389fc268c31edaf (diff) | |
| parent | 1ecf57d6cfc4c0f3703eef6c90df9c3914baec6a (diff) | |
| download | tqt3-e07167f4f6448ad4f5565609e5cd56a918d256f8.tar.gz tqt3-e07167f4f6448ad4f5565609e5cd56a918d256f8.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'qmake/Makefile.unix')
| -rw-r--r-- | qmake/Makefile.unix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index f73370f92..32029e44e 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -1,4 +1,4 @@ -#qmake code +#tqmake code OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o msvc_nmake.o \ borland_bmake.o mingw_make.o msvc_dsp.o msvc_vcproj.o option.o \ winmakefile.o projectgenerator.o metrowerks_xml.o pbuilder_pbx.o \ @@ -39,14 +39,14 @@ CXXFLAGS= @QMAKE_CXXFLAGS@ \ -DQT_NO_COMPRESS -I@QMAKESPEC@ -DHAVE_QCONFIG_CPP LFLAGS=@QMAKE_LFLAGS@ -qmake: $(OBJS) $(QOBJS) +tqmake: $(OBJS) $(QOBJS) $(CXX) -o $@ $(OBJS) $(QOBJS) $(LFLAGS) rm -f @BUILD_PATH@/bin/$@ ln -s ../qmake/$@ @BUILD_PATH@/bin/$@ -install: qmake +install: tqmake [ -d @QT_INSTALL_BINS@ ] || mkdir -p @QT_INSTALL_BINS@ - -cp -f @BUILD_PATH@/bin/qmake @QT_INSTALL_BINS@ + -cp -f @BUILD_PATH@/bin/tqmake @QT_INSTALL_BINS@ [ -d @QT_INSTALL_DATA@ ] || mkdir -p @QT_INSTALL_DATA@ -cp -R -f @SOURCE_PATH@/mkspecs @QT_INSTALL_DATA@ -ln -s -f @QMAKESPEC@ @QT_INSTALL_DATA@/mkspecs/default @@ -55,7 +55,7 @@ clean:: rm -f $(OBJS) $(QOBJS) distclean:: clean - rm -rf qmake .deps + rm -rf tqmake .deps depend: makedepend $(CXXFLAGS) -D__MAKEDEPEND__ $(DEPEND_SRC) |