[Kst] kdeextragear-2/kst

[George Staikos]

CVS commit by staikos: 

build libkstmath, start libkstplot, and build the testcase almost independently
now.


  M +18 -23    kst/Makefile.am   1.159
  M +16 -0     tests/Makefile.am   1.2


--- kdeextragear-2/kst/kst/Makefile.am  #1.158:1.159
@@ -31,11 +31,7 @@
 libkst_la_LIBADD = $(LIB_KPARTS) $(LIB_KMDI)
 
-d2asc_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-d2asc_LDADD = libkst.la
-
-d2asc_SOURCES = \
-        d2asc.cpp \
-        kstdataobject.cpp \
-        kstdatacollection-nogui.cpp \
+noinst_LTLIBRARIES = libkstmath.la libkstplot.la
+libkstmath_la_SOURCES = kstdataobject.cpp \
+        fftsg_h.c \
         kstvector.cpp \
         kstrvector.cpp \
@@ -49,4 +45,17 @@
         escan.c
 
+libkstmath_la_LDFLAGS = -version-info 1:1:0 -no-undefined $(all_libraries)
+
+d2asc_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+d2asc_LDADD = libkstmath.la libkst.la
+
+d2asc_SOURCES = \
+        d2asc.cpp \
+        kstdatacollection-nogui.cpp
+
+
+libkstplot_la_SOURCES =
+libkstplot_la_LDFLAGS = -version-info 1:1:0 -no-undefined $(all_libraries)
+
 kst_SOURCES = \
         kstiface.skel \
@@ -86,8 +95,4 @@
         kstfitdialog_i.cpp \
         kstfilterdialog_i.cpp \
-        plugin.cpp \
-        pluginxmlparser.cpp \
-        pluginloader.cpp \
-        plugincollection.cpp \
         extensiondlg.ui \
         extensionmgr.cpp \
@@ -104,6 +109,4 @@
         updatethread.cpp \
         emailthread.cpp \
-        enodes.cpp \
-        enodefactory.cpp \
         kstequation.cpp \
         kstcurvehint.cpp \
@@ -121,10 +124,8 @@
         kstpsd.cpp \
         kstbasecurve.cpp \
-        kstrvector.cpp \
         kstpoint.cpp \
         kstlabel.cpp \
         kstlegend.cpp \
         kstvcurve.cpp \
-        kstvector.cpp \
         kstmatrix.cpp \
         kstimage.cpp \
@@ -135,5 +136,4 @@
         ksthistogram.cpp \
         kstcurvedialog_i.cpp \
-        fftsg_h.c \
         eventmonitor.ui \
         debugdialog.ui \
@@ -173,14 +173,9 @@
         kstviewwindow.cpp \
         kst.cpp \
-        main.cpp \
-        eparse.c \
-        escan.c
-
-#       eparse.y \
-#       escan.l
+        main.cpp
 
 include_HEADERS = kstdatasource.h kstobject.h
 
-kst_LDADD = $(LIB_KDEPRINT) $(LIB_KCALENDARSYSTEM) libkst.la
+kst_LDADD = $(LIB_KDEPRINT) $(LIB_KCALENDARSYSTEM) libkstmath.la libkst.la
 kst_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 

--- kdeextragear-2/kst/tests/Makefile.am  #1.1:1.2
@@ -0,0 +1,16 @@
+
+check_PROGRAMS=testeqparser
+
+METASOURCES=AUTO
+
+#AM_CFLAGS=-fprofile-arcs -ftest-coverage -O0 -fno-inline
+#AM_CXXFLAGS=-fprofile-arcs -ftest-coverage -O0 -fno-inline
+INCLUDES=-I$(top_srcdir)/kst/tests -I$(top_srcdir)/kst/kst $(all_includes)
+
+AM_LDFLAGS = $(QT_LDFLAGS) $(KDE_LDFLAGS) $(X_LDFLAGS) $(KDE_RPATH)
+LDADD = $(LIB_KIO) ../kst/libkstmath.la ../kst/libkst.la
+
+testeqparser_SOURCES=$(top_srcdir)/kst/kst/kstdatacollection-nogui.cpp \
+                        testeqparser.cpp
+
+