1.1 --- a/Makefile Sun Jan 30 12:58:47 2005 +0000
1.2 +++ b/Makefile Mon Jan 31 09:47:43 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: Tue Jan 4 10:40:21 2005
1.7 +# Generated by qmake (1.07a) (Qt 3.3.1) on: Mon Jan 31 00:05:28 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 @@ -56,6 +56,7 @@
1.30 headingobj.h \
1.31 imageobj.h \
1.32 linkablemapobj.h \
1.33 + linkobj.h \
1.34 mainwindow.h \
1.35 mapcenterobj.h \
1.36 mapeditor.h \
1.37 @@ -81,6 +82,7 @@
1.38 headingobj.cpp \
1.39 imageobj.cpp \
1.40 linkablemapobj.cpp \
1.41 + linkobj.cpp \
1.42 main.cpp \
1.43 mainwindow.cpp \
1.44 mapcenterobj.cpp \
1.45 @@ -106,6 +108,7 @@
1.46 headingobj.o \
1.47 imageobj.o \
1.48 linkablemapobj.o \
1.49 + linkobj.o \
1.50 main.o \
1.51 mainwindow.o \
1.52 mapcenterobj.o \
1.53 @@ -196,7 +199,7 @@
1.54 $(MOC):
1.55 ( cd $(QTDIR)/src/moc && $(MAKE) )
1.56
1.57 -Makefile: vym.pro /usr/lib/qt3/mkspecs/linux-g++/qmake.conf /usr/lib/qt3/lib64/libqt-mt.prl
1.58 +Makefile: vym.pro /usr/lib/qt3/mkspecs/linux-g++/qmake.conf /usr/lib/qt3/lib/libqt-mt.prl
1.59 $(QMAKE) -o Makefile vym.pro
1.60 qmake:
1.61 @$(QMAKE) -o Makefile vym.pro
1.62 @@ -235,6 +238,7 @@
1.63 floatimageobj.h \
1.64 linkablemapobj.h \
1.65 ornamentedobj.h \
1.66 + linkobj.h \
1.67 floatobj.h \
1.68 frameobj.h \
1.69 noteobj.h \
1.70 @@ -253,6 +257,7 @@
1.71 linkablemapobj.h \
1.72 mapcenterobj.h \
1.73 branchobj.h \
1.74 + linkobj.h \
1.75 version.h \
1.76 floatimageobj.h \
1.77 ornamentedobj.h \
1.78 @@ -291,7 +296,8 @@
1.79 misc.h \
1.80 flagobj.h \
1.81 imageobj.h \
1.82 - ornamentedobj.h
1.83 + ornamentedobj.h \
1.84 + linkobj.h
1.85
1.86 floatobj.o: floatobj.cpp floatobj.h \
1.87 linkablemapobj.h \
1.88 @@ -330,9 +336,25 @@
1.89 imageobj.h \
1.90 floatimageobj.h \
1.91 ornamentedobj.h \
1.92 + linkobj.h \
1.93 floatobj.h \
1.94 mapcenterobj.h
1.95
1.96 +linkobj.o: linkobj.cpp linkobj.h \
1.97 + branchobj.h \
1.98 + linkablemapobj.h \
1.99 + frameobj.h \
1.100 + noteobj.h \
1.101 + headingobj.h \
1.102 + flagrowobj.h \
1.103 + mapobj.h \
1.104 + misc.h \
1.105 + flagobj.h \
1.106 + imageobj.h \
1.107 + floatimageobj.h \
1.108 + ornamentedobj.h \
1.109 + floatobj.h
1.110 +
1.111 main.o: main.cpp settings.h \
1.112 options.h \
1.113 mainwindow.h \
1.114 @@ -346,6 +368,7 @@
1.115 findwindow.h \
1.116 mapcenterobj.h \
1.117 branchobj.h \
1.118 + linkobj.h \
1.119 version.h \
1.120 floatimageobj.h \
1.121 linkablemapobj.h \
1.122 @@ -394,6 +417,7 @@
1.123 findwindow.h \
1.124 mapcenterobj.h \
1.125 branchobj.h \
1.126 + linkobj.h \
1.127 floatimageobj.h \
1.128 linkablemapobj.h \
1.129 ornamentedobj.h \
1.130 @@ -410,6 +434,7 @@
1.131 floatimageobj.h \
1.132 mapeditor.h \
1.133 branchobj.h \
1.134 + linkobj.h \
1.135 version.h \
1.136 linkablemapobj.h \
1.137 ornamentedobj.h \
1.138 @@ -456,6 +481,7 @@
1.139 icons/flag-lifebelt.xpm \
1.140 mapcenterobj.h \
1.141 branchobj.h \
1.142 + linkobj.h \
1.143 floatimageobj.h \
1.144 ornamentedobj.h \
1.145 floatobj.h \
1.146 @@ -490,6 +516,7 @@
1.147 imageobj.h \
1.148 mapcenterobj.h \
1.149 branchobj.h \
1.150 + linkobj.h \
1.151 version.h \
1.152 floatimageobj.h \
1.153 floatobj.h
1.154 @@ -533,6 +560,7 @@
1.155 mapcenterobj.h \
1.156 mapeditor.h \
1.157 branchobj.h \
1.158 + linkobj.h \
1.159 floatimageobj.h \
1.160 linkablemapobj.h \
1.161 ornamentedobj.h \
1.162 @@ -610,6 +638,7 @@
1.163 findwindow.h \
1.164 mapcenterobj.h \
1.165 branchobj.h \
1.166 + linkobj.h \
1.167 version.h \
1.168 floatimageobj.h \
1.169 linkablemapobj.h \
1.170 @@ -627,6 +656,7 @@
1.171 moc_mapeditor.o: moc_mapeditor.cpp mapeditor.h mapcenterobj.h \
1.172 misc.h \
1.173 branchobj.h \
1.174 + linkobj.h \
1.175 version.h \
1.176 floatimageobj.h \
1.177 linkablemapobj.h \
1.178 @@ -654,10 +684,9 @@
1.179
1.180 moc_texteditor.o: moc_texteditor.cpp texteditor.h
1.181
1.182 -moc_exporthtmldialog.o: moc_exporthtmldialog.cpp exporthtmldialog.h showtextdialog.h
1.183 +moc_exporthtmldialog.o: moc_exporthtmldialog.cpp exporthtmldialog.h
1.184
1.185 -moc_exportxhtmldialog.o: moc_exportxhtmldialog.cpp exportxhtmldialog.h process.h \
1.186 - showtextdialog.h
1.187 +moc_exportxhtmldialog.o: moc_exportxhtmldialog.cpp exportxhtmldialog.h
1.188
1.189 moc_showtextdialog.o: moc_showtextdialog.cpp showtextdialog.h
1.190
1.191 @@ -721,6 +750,18 @@
1.192 -$(DEL_DIR) "$(INSTALL_ROOT)/usr/share/vym/"
1.193
1.194
1.195 +install_doc: all
1.196 + @$(CHK_DIR_EXISTS) "$(INSTALL_ROOT)/usr/share/doc/packages/vym/" || $(MKDIR) "$(INSTALL_ROOT)/usr/share/doc/packages/vym/"
1.197 + -$(INSTALL_DIR) "doc/CVS" "$(INSTALL_ROOT)/usr/share/doc/packages/vym"
1.198 + -$(INSTALL_FILE) "doc/vym.pdf" "$(INSTALL_ROOT)/usr/share/doc/packages/vym"
1.199 +
1.200 +
1.201 +uninstall_doc:
1.202 + -$(DEL_FILE) -r "$(INSTALL_ROOT)/usr/share/doc/packages/vym/CVS"
1.203 + -$(DEL_FILE) -r "$(INSTALL_ROOT)/usr/share/doc/packages/vym/vym.pdf"
1.204 + -$(DEL_DIR) "$(INSTALL_ROOT)/usr/share/doc/packages/vym/"
1.205 +
1.206 +
1.207 install_demo: all
1.208 @$(CHK_DIR_EXISTS) "$(INSTALL_ROOT)/usr/share/vym/" || $(MKDIR) "$(INSTALL_ROOT)/usr/share/vym/"
1.209 -$(INSTALL_DIR) "demos" "$(INSTALL_ROOT)/usr/share/vym/"
1.210 @@ -731,7 +772,7 @@
1.211 -$(DEL_DIR) "$(INSTALL_ROOT)/usr/share/vym/"
1.212
1.213
1.214 -install: install_target install_support install_demo
1.215 +install: install_target install_support install_doc install_demo
1.216
1.217 -uninstall: uninstall_target uninstall_support uninstall_demo
1.218 +uninstall: uninstall_target uninstall_support uninstall_doc uninstall_demo
1.219