diff -r 920e6ed5889b -r e90f5bef70c8 Makefile
--- a/Makefile	Sun Jan 30 12:59:10 2005 +0000
+++ b/Makefile	Sun Jan 30 23:25:47 2005 +0000
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: vym
-# Generated by qmake (1.07a) (Qt 3.3.1) on: Tue Jan  4 10:40:21 2005
+# Generated by qmake (1.07a) (Qt 3.3.1) on: Mon Jan 31 00:05:28 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 -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
+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
 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/lib64/ -L$(QTDIR)/lib64/ -L/usr/X11R6/lib64/ -lqt-mt -lXext -lX11 -lm
+LIBS     = $(SUBLIBS) -L/usr/lib/ -L$(QTDIR)/lib/ -L/usr/X11R6/lib/ -lqt-mt -lXext -lX11 -lm
 AR       = ar cqs
 RANLIB   = 
 MOC      = $(QTDIR)/bin/moc
@@ -56,6 +56,7 @@
 		headingobj.h \
 		imageobj.h \
 		linkablemapobj.h \
+		linkobj.h \
 		mainwindow.h \
 		mapcenterobj.h \
 		mapeditor.h \
@@ -81,6 +82,7 @@
 		headingobj.cpp \
 		imageobj.cpp \
 		linkablemapobj.cpp \
+		linkobj.cpp \
 		main.cpp \
 		mainwindow.cpp \
 		mapcenterobj.cpp \
@@ -106,6 +108,7 @@
 		headingobj.o \
 		imageobj.o \
 		linkablemapobj.o \
+		linkobj.o \
 		main.o \
 		mainwindow.o \
 		mapcenterobj.o \
@@ -196,7 +199,7 @@
 $(MOC): 
 	( cd $(QTDIR)/src/moc && $(MAKE) )
 
-Makefile: vym.pro  /usr/lib/qt3/mkspecs/linux-g++/qmake.conf /usr/lib/qt3/lib64/libqt-mt.prl
+Makefile: vym.pro  /usr/lib/qt3/mkspecs/linux-g++/qmake.conf /usr/lib/qt3/lib/libqt-mt.prl
 	$(QMAKE) -o Makefile vym.pro
 qmake: 
 	@$(QMAKE) -o Makefile vym.pro
@@ -235,6 +238,7 @@
 		floatimageobj.h \
 		linkablemapobj.h \
 		ornamentedobj.h \
+		linkobj.h \
 		floatobj.h \
 		frameobj.h \
 		noteobj.h \
@@ -253,6 +257,7 @@
 		linkablemapobj.h \
 		mapcenterobj.h \
 		branchobj.h \
+		linkobj.h \
 		version.h \
 		floatimageobj.h \
 		ornamentedobj.h \
@@ -291,7 +296,8 @@
 		misc.h \
 		flagobj.h \
 		imageobj.h \
-		ornamentedobj.h
+		ornamentedobj.h \
+		linkobj.h
 
 floatobj.o: floatobj.cpp floatobj.h \
 		linkablemapobj.h \
@@ -330,9 +336,25 @@
 		imageobj.h \
 		floatimageobj.h \
 		ornamentedobj.h \
+		linkobj.h \
 		floatobj.h \
 		mapcenterobj.h
 
+linkobj.o: linkobj.cpp linkobj.h \
+		branchobj.h \
+		linkablemapobj.h \
+		frameobj.h \
+		noteobj.h \
+		headingobj.h \
+		flagrowobj.h \
+		mapobj.h \
+		misc.h \
+		flagobj.h \
+		imageobj.h \
+		floatimageobj.h \
+		ornamentedobj.h \
+		floatobj.h
+
 main.o: main.cpp settings.h \
 		options.h \
 		mainwindow.h \
@@ -346,6 +368,7 @@
 		findwindow.h \
 		mapcenterobj.h \
 		branchobj.h \
+		linkobj.h \
 		version.h \
 		floatimageobj.h \
 		linkablemapobj.h \
@@ -394,6 +417,7 @@
 		findwindow.h \
 		mapcenterobj.h \
 		branchobj.h \
+		linkobj.h \
 		floatimageobj.h \
 		linkablemapobj.h \
 		ornamentedobj.h \
@@ -410,6 +434,7 @@
 		floatimageobj.h \
 		mapeditor.h \
 		branchobj.h \
+		linkobj.h \
 		version.h \
 		linkablemapobj.h \
 		ornamentedobj.h \
@@ -456,6 +481,7 @@
 		icons/flag-lifebelt.xpm \
 		mapcenterobj.h \
 		branchobj.h \
+		linkobj.h \
 		floatimageobj.h \
 		ornamentedobj.h \
 		floatobj.h \
@@ -490,6 +516,7 @@
 		imageobj.h \
 		mapcenterobj.h \
 		branchobj.h \
+		linkobj.h \
 		version.h \
 		floatimageobj.h \
 		floatobj.h
@@ -533,6 +560,7 @@
 		mapcenterobj.h \
 		mapeditor.h \
 		branchobj.h \
+		linkobj.h \
 		floatimageobj.h \
 		linkablemapobj.h \
 		ornamentedobj.h \
@@ -610,6 +638,7 @@
 		findwindow.h \
 		mapcenterobj.h \
 		branchobj.h \
+		linkobj.h \
 		version.h \
 		floatimageobj.h \
 		linkablemapobj.h \
@@ -627,6 +656,7 @@
 moc_mapeditor.o: moc_mapeditor.cpp  mapeditor.h mapcenterobj.h \
 		misc.h \
 		branchobj.h \
+		linkobj.h \
 		version.h \
 		floatimageobj.h \
 		linkablemapobj.h \
@@ -654,10 +684,9 @@
 
 moc_texteditor.o: moc_texteditor.cpp  texteditor.h 
 
-moc_exporthtmldialog.o: moc_exporthtmldialog.cpp  exporthtmldialog.h showtextdialog.h
+moc_exporthtmldialog.o: moc_exporthtmldialog.cpp  exporthtmldialog.h 
 
-moc_exportxhtmldialog.o: moc_exportxhtmldialog.cpp  exportxhtmldialog.h process.h \
-		showtextdialog.h
+moc_exportxhtmldialog.o: moc_exportxhtmldialog.cpp  exportxhtmldialog.h 
 
 moc_showtextdialog.o: moc_showtextdialog.cpp  showtextdialog.h 
 
@@ -721,6 +750,18 @@
 	-$(DEL_DIR) "$(INSTALL_ROOT)/usr/share/vym/"
 
 
+install_doc: all 
+	@$(CHK_DIR_EXISTS) "$(INSTALL_ROOT)/usr/share/doc/packages/vym/" || $(MKDIR) "$(INSTALL_ROOT)/usr/share/doc/packages/vym/"
+	-$(INSTALL_DIR) "doc/CVS" "$(INSTALL_ROOT)/usr/share/doc/packages/vym"
+	-$(INSTALL_FILE) "doc/vym.pdf" "$(INSTALL_ROOT)/usr/share/doc/packages/vym"
+
+
+uninstall_doc: 
+	-$(DEL_FILE) -r "$(INSTALL_ROOT)/usr/share/doc/packages/vym/CVS"
+	-$(DEL_FILE) -r "$(INSTALL_ROOT)/usr/share/doc/packages/vym/vym.pdf"
+	-$(DEL_DIR) "$(INSTALL_ROOT)/usr/share/doc/packages/vym/"
+
+
 install_demo: all 
 	@$(CHK_DIR_EXISTS) "$(INSTALL_ROOT)/usr/share/vym/" || $(MKDIR) "$(INSTALL_ROOT)/usr/share/vym/"
 	-$(INSTALL_DIR) "demos" "$(INSTALL_ROOT)/usr/share/vym/"
@@ -731,7 +772,7 @@
 	-$(DEL_DIR) "$(INSTALL_ROOT)/usr/share/vym/"
 
 
-install: install_target install_support install_demo  
+install: install_target install_support install_doc install_demo  
 
-uninstall: uninstall_target uninstall_support uninstall_demo  
+uninstall: uninstall_target uninstall_support uninstall_doc uninstall_demo