1.1 --- a/Makefile Tue Feb 08 14:07:19 2005 +0000
1.2 +++ b/Makefile Sat Feb 19 17:14:33 2005 +0000
1.3 @@ -1,6 +1,6 @@
1.4 #############################################################################
1.5 # Makefile for building: vym
1.6 -# Generated by qmake (1.07a) (Qt 3.3.1) on: Mon Feb 7 11:52:57 2005
1.7 +# Generated by qmake (1.07a) (Qt 3.3.1) on: Sat Feb 19 15:28:50 2005
1.8 # Project: vym.pro
1.9 # Template: app
1.10 # Command: $(QMAKE) -o Makefile vym.pro
1.11 @@ -12,14 +12,14 @@
1.12 CXX = g++
1.13 LEX = flex
1.14 YACC = yacc
1.15 -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
1.16 -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
1.17 +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
1.18 +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
1.19 LEXFLAGS =
1.20 YACCFLAGS= -d
1.21 INCPATH = -I/usr/lib/qt3/mkspecs/linux-g++ -I. -I/usr/include -I$(QTDIR)/include
1.22 LINK = g++
1.23 LFLAGS =
1.24 -LIBS = $(SUBLIBS) -L/usr/lib64/ -L$(QTDIR)/lib64/ -L/usr/X11R6/lib64/ -lqt-mt -lXext -lX11 -lm
1.25 +LIBS = $(SUBLIBS) -L/usr/lib/ -L$(QTDIR)/lib/ -L/usr/X11R6/lib/ -lqt-mt -lXext -lX11 -lm
1.26 AR = ar cqs
1.27 RANLIB =
1.28 MOC = $(QTDIR)/bin/moc
1.29 @@ -199,13 +199,13 @@
1.30 $(MOC):
1.31 ( cd $(QTDIR)/src/moc && $(MAKE) )
1.32
1.33 -Makefile: vym.pro /usr/lib/qt3/mkspecs/linux-g++/qmake.conf /usr/lib/qt3/lib64/libqt-mt.prl
1.34 +Makefile: vym.pro /usr/lib/qt3/mkspecs/linux-g++/qmake.conf /usr/lib/qt3/lib/libqt-mt.prl
1.35 $(QMAKE) -o Makefile vym.pro
1.36 qmake:
1.37 @$(QMAKE) -o Makefile vym.pro
1.38
1.39 dist:
1.40 - @mkdir -p .tmp/vym && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) .tmp/vym/ && $(COPY_FILE) --parents vym_de.ts .tmp/vym/ && $(COPY_FILE) --parents exporthtmldialog.ui.h exportxhtmldialog.ui.h showtextdialog.ui.h extrainfodialog.ui.h .tmp/vym/ && ( cd `dirname .tmp/vym` && $(TAR) vym.tar vym && $(GZIP) vym.tar ) && $(MOVE) `dirname .tmp/vym`/vym.tar.gz . && $(DEL_FILE) -r .tmp/vym
1.41 + @mkdir -p .tmp/vym && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) .tmp/vym/ && $(COPY_FILE) --parents lang/vym_de.ts .tmp/vym/ && $(COPY_FILE) --parents exporthtmldialog.ui.h exportxhtmldialog.ui.h showtextdialog.ui.h extrainfodialog.ui.h .tmp/vym/ && ( cd `dirname .tmp/vym` && $(TAR) vym.tar vym && $(GZIP) vym.tar ) && $(MOVE) `dirname .tmp/vym`/vym.tar.gz . && $(DEL_FILE) -r .tmp/vym
1.42
1.43 mocclean:
1.44 -$(DEL_FILE) $(OBJMOC)
1.45 @@ -399,6 +399,8 @@
1.46 icons/viewzoomreset.xpm \
1.47 icons/viewzoomin.xpm \
1.48 icons/viewzoomout.xpm \
1.49 + icons/modecolor.xpm \
1.50 + icons/modelink.xpm \
1.51 icons/vym-48x48.xpm \
1.52 icons/flag-note.xpm \
1.53 icons/flag-url.xpm \