[Kst] branches/work/kst/2.0.0-beta3/kst

[Barth Netterfield]

SVN commit 1030093 by netterfield:

Fix build system to allow simultaneous installation
of kst 1 and kst2.
  -proper use of library versioning
  -rename the kst 2 binary to 'kst2'



 M  +1 -1      datasourceplugin.pri  
 M  +1 -1      run-kst  
 M  +1 -1      src/kst/kst.pro  
 M  +14 -14    src/widgets/widgets.pro  


--- branches/work/kst/2.0.0-beta3/kst/datasourceplugin.pri #1030092:1030093
@@ -13,6 +13,6 @@
 
 INCLUDEPATH += \
     tmp \
-    $$TOPLEVELDIR/src/libkst \
+    $$TOPLEVELDIR/src/libkst 
 
 LIBS += -L$$OUTPUT_DIR/lib -lkst
--- branches/work/kst/2.0.0-beta3/kst/run-kst #1030092:1030093
@@ -5,4 +5,4 @@
 export SCRIPTDIR=$PWD
 export BUILDDIR=$PWD/build
 
-$BUILDDIR/bin/kst "$@"
+$BUILDDIR/bin/kst2 "$@"
--- branches/work/kst/2.0.0-beta3/kst/src/kst/kst.pro #1030092:1030093
@@ -1,7 +1,7 @@
 include($$PWD/../../kst.pri)
 
 TEMPLATE = app
-TARGET = kst
+TARGET = kst2
 DESTDIR = $$OUTPUT_DIR/bin
 
 ! isEmpty(INSTALL_PREFIX) {
--- branches/work/kst/2.0.0-beta3/kst/src/widgets/widgets.pro #1030092:1030093
@@ -3,27 +3,27 @@
 QT += gui
 
 TEMPLATE = lib
-CONFIG += designer plugin
+CONFIG += designer
 TARGET = kstwidgets
+DESTDIR = $$OUTPUT_DIR/lib
 win32:CONFIG += staticlib
-
-! isEmpty(INSTALL_PREFIX) {
-  target.path = $$INSTALL_PREFIX/$$INSTALL_LIBDIR/kst
-  INSTALLS += target
+!isEmpty(INSTALL_PREFIX) {
+    target.path = $$INSTALL_PREFIX/$$INSTALL_LIBDIR
+    INSTALLS += target
 }
-
-
-DESTDIR = $$OUTPUT_DIR/plugin
-
-INCLUDEPATH += \
-    tmp \
+INCLUDEPATH += tmp \
     $$TOPLEVELDIR/src/libkst \
     $$TOPLEVELDIR/src/libkstmath \
     $$OUTPUT_DIR/src/widgets/tmp
+win32:LIBS += -L$$OUTPUT_DIR/lib \
+    -L$$OUTPUT_DIR/plugin \
+    -lkstmath \
+    -lkst
+!win32:LIBS += -L$$OUTPUT_DIR/lib \
+    -L$$OUTPUT_DIR/plugin \
+    -lkst \
+    -lkstmath
 
-win32:LIBS += -L$$OUTPUT_DIR/lib -lkstmath -lkst
-!win32:LIBS += -L$$OUTPUT_DIR/lib -lkst -lkstmath
-
 SOURCES += \
     colorbutton.cpp \
     colorpalette.cpp \