From 540989108efaf80c0552d0937d63c3f069e764cb Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 27 Sep 2018 16:04:41 +0900 Subject: [PATCH] qt -> tqt conversion: QTDIR -> TQTDIR QTDOC -> TQTDOC INCDIR_QT -> INCDIR_TQT LIBDIR_QT -> LIBDIR_TQT QT_INC -> TQT_INC QT_LIB -> TQT_LIB Signed-off-by: Michele Calgaro --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index f0cf533..febc100 100644 --- a/Makefile +++ b/Makefile @@ -16,14 +16,14 @@ CFLAGS = -pipe -Wall -W -O2 -g -pipe -m32 -march=i386 -mtune=pentium4 -DTRANS CXXFLAGS = -pipe -Wall -W -O2 -g -pipe -m32 -march=i386 -mtune=pentium4 -DTRANSLATIONS_PATH='"/usr/local/share/kdocker/i18n"' -DICONS_PATH='"/usr/local/share/kdocker/icons"' -DQT_NO_DEBUG -DQT_SHARED -DTQT_THREAD_SUPPORT LEXFLAGS = YACCFLAGS= -d -INCPATH = -I/usr/lib/qt-3.3/mkspecs/default -I. -I. -Isrc -I/usr/X11R6/include/X11 -I/usr/include/X11R6 -I$(QTDIR)/include -Itmp/ +INCPATH = -I/usr/lib/qt-3.3/mkspecs/default -I. -I. -Isrc -I/usr/X11R6/include/X11 -I/usr/include/X11R6 -I$(TQTDIR)/include -Itmp/ LINK = g++ LFLAGS = -LIBS = $(SUBLIBS) -L/usr/X11/lib -L/usr/X11R6/lib -L$(QTDIR)/lib -L/usr/X11R6/lib -lXpm -lXmu -ltqt-mt -lXext -lX11 -lm +LIBS = $(SUBLIBS) -L/usr/X11/lib -L/usr/X11R6/lib -L$(TQTDIR)/lib -L/usr/X11R6/lib -lXpm -lXmu -ltqt-mt -lXext -lX11 -lm AR = ar cqs RANLIB = -MOC = $(QTDIR)/bin/moc -UIC = $(QTDIR)/bin/uic +MOC = $(TQTDIR)/bin/moc +UIC = $(TQTDIR)/bin/uic QMAKE = qmake TAR = tar -cf GZIP = gzip -9f @@ -112,7 +112,7 @@ mocables: $(SRCMOC) uicables: $(UICDECLS) $(UICIMPLS) $(MOC): - ( cd $(QTDIR)/src/moc && $(MAKE) ) + ( cd $(TQTDIR)/src/moc && $(MAKE) ) Makefile: kdocker.pro /usr/lib/qt-3.3/mkspecs/default/qmake.conf /usr/lib/qt-3.3/lib/libtqt-mt.prl $(QMAKE) -o Makefile kdocker.pro