diff -r 9771028de303 -r 9db3eaa21237 Makefile --- a/Makefile Mon Jan 31 09:47:43 2005 +0000 +++ b/Makefile Tue Feb 08 14:07:19 2005 +0000 @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: vym -# Generated by qmake (1.07a) (Qt 3.3.1) on: Mon Jan 31 00:05:28 2005 +# Generated by qmake (1.07a) (Qt 3.3.1) on: Mon Feb 7 11:52:57 2005 # Project: vym.pro # Template: app # Command: $(QMAKE) -o Makefile vym.pro @@ -12,14 +12,14 @@ CXX = g++ LEX = flex YACC = yacc -CFLAGS = -pipe -O2 -march=i586 -mcpu=i686 -fmessage-length=0 -Wall -fPIC -Wall -W -O2 -march=i586 -mcpu=i686 -fmessage-length=0 -Wall -fPIC -DQT_NO_DEBUG -DQT_SHARED -DQT_TABLET_SUPPORT -DQT_THREAD_SUPPORT -CXXFLAGS = -pipe -O2 -march=i586 -mcpu=i686 -fmessage-length=0 -Wall -fPIC -Wall -W -O2 -march=i586 -mcpu=i686 -fmessage-length=0 -Wall -fPIC -DQT_NO_DEBUG -DQT_SHARED -DQT_TABLET_SUPPORT -DQT_THREAD_SUPPORT +CFLAGS = -pipe -O2 -fmessage-length=0 -Wall -fPIC -Wall -W -O2 -fmessage-length=0 -Wall -fPIC -DQT_NO_DEBUG -DQT_SHARED -DQT_TABLET_SUPPORT -DQT_THREAD_SUPPORT +CXXFLAGS = -pipe -O2 -fmessage-length=0 -Wall -fPIC -Wall -W -O2 -fmessage-length=0 -Wall -fPIC -DQT_NO_DEBUG -DQT_SHARED -DQT_TABLET_SUPPORT -DQT_THREAD_SUPPORT LEXFLAGS = YACCFLAGS= -d INCPATH = -I/usr/lib/qt3/mkspecs/linux-g++ -I. -I/usr/include -I$(QTDIR)/include LINK = g++ LFLAGS = -LIBS = $(SUBLIBS) -L/usr/lib/ -L$(QTDIR)/lib/ -L/usr/X11R6/lib/ -lqt-mt -lXext -lX11 -lm +LIBS = $(SUBLIBS) -L/usr/lib64/ -L$(QTDIR)/lib64/ -L/usr/X11R6/lib64/ -lqt-mt -lXext -lX11 -lm AR = ar cqs RANLIB = MOC = $(QTDIR)/bin/moc @@ -199,7 +199,7 @@ $(MOC): ( cd $(QTDIR)/src/moc && $(MAKE) ) -Makefile: vym.pro /usr/lib/qt3/mkspecs/linux-g++/qmake.conf /usr/lib/qt3/lib/libqt-mt.prl +Makefile: vym.pro /usr/lib/qt3/mkspecs/linux-g++/qmake.conf /usr/lib/qt3/lib64/libqt-mt.prl $(QMAKE) -o Makefile vym.pro qmake: @$(QMAKE) -o Makefile vym.pro @@ -684,9 +684,10 @@ moc_texteditor.o: moc_texteditor.cpp texteditor.h -moc_exporthtmldialog.o: moc_exporthtmldialog.cpp exporthtmldialog.h +moc_exporthtmldialog.o: moc_exporthtmldialog.cpp exporthtmldialog.h showtextdialog.h -moc_exportxhtmldialog.o: moc_exportxhtmldialog.cpp exportxhtmldialog.h +moc_exportxhtmldialog.o: moc_exportxhtmldialog.cpp exportxhtmldialog.h process.h \ + showtextdialog.h moc_showtextdialog.o: moc_showtextdialog.cpp showtextdialog.h