[Kst] extragear/graphics/kst
George Staikos
staikos at kde.org
Sun Feb 12 23:37:29 CET 2006
SVN commit 508874 by staikos:
Welcome self-contained libkstmath
Also fix some errors in the previous commits
M +4 -39 kst/Makefile.am
M +1 -1 kst/datasources/cdf/Makefile.am
M +1 -1 kst/datasources/dirfile/Makefile.am
M +1 -1 kst/datasources/frame/Makefile.am
M +1 -1 kst/datasources/indirect/Makefile.am
M +1 -1 kst/datasources/netcdf/Makefile.am
M +1 -1 kst/datasources/planck/Makefile.am
M +1 -1 kst/datasources/qimagesource/Makefile.am
D kst/dialoglauncher.cpp
D kst/dialoglauncher.h
D kst/enodefactory.cpp
D kst/enodefactory.h
D kst/enodes.cpp
D kst/enodes.h
D kst/eparse-eh.cpp
D kst/eparse-eh.h
D kst/eparse.c
D kst/eparse.h
D kst/eparse.y
D kst/escan.c
D kst/escan.l
M +1 -1 kst/extensions/elog/Makefile.am
M +1 -1 kst/extensions/js/Makefile.am
M +1 -1 kst/extensions/pulse/Makefile.am
D kst/fftsg_h.c
D kst/kstbasecurve.cpp
D kst/kstbasecurve.h
D kst/kstcolorsequence.cpp
D kst/kstcolorsequence.h
D kst/kstcsd.cpp
D kst/kstcsd.h
D kst/kstcurvehint.cpp
D kst/kstcurvehint.h
D kst/kstdataobject.cpp
D kst/kstdataobject.h
D kst/kstdataobjectcollection.cpp
D kst/kstdataobjectcollection.h
D kst/kstdefaultnames.cpp
D kst/kstdefaultnames.h
D kst/kstequation.cpp
D kst/kstequation.h
D kst/ksthistogram.cpp
D kst/ksthistogram.h
D kst/kstimage.cpp
D kst/kstimage.h
D kst/kstlinestyle.cpp
D kst/kstlinestyle.h
D kst/kstobjectdefaults.cpp
D kst/kstobjectdefaults.h
D kst/kstpainter.cpp
D kst/kstpainter.h
D kst/kstplotdefines.h
D kst/kstplugin.cpp
D kst/kstplugin.h
D kst/kstpoint.cpp
D kst/kstpoint.h
D kst/kstpsd.cpp
D kst/kstpsd.h
D kst/kstpsdgenerator.cpp
D kst/kstpsdgenerator.h
D kst/kstsettings.cpp
D kst/kstsettings.h
D kst/kstvcurve.cpp
D kst/kstvcurve.h
D kst/labelparser.cpp
D kst/labelparser.h
D kst/plugin.cpp
D kst/plugin.h
D kst/plugincollection.cpp
D kst/plugincollection.h
D kst/pluginloader.cpp
D kst/pluginloader.h
D kst/pluginxmlparser.cpp
D kst/pluginxmlparser.h
M +2 -2 src/Makefile.am
A src/libkstmath/Makefile.am kst/Makefile.am#508845
A src/libkstmath/dialoglauncher.cpp kst/dialoglauncher.cpp#506667
A src/libkstmath/dialoglauncher.h kst/dialoglauncher.h#506667
A src/libkstmath/enodefactory.cpp kst/enodefactory.cpp#506667
A src/libkstmath/enodefactory.h kst/enodefactory.h#506667
A src/libkstmath/enodes.cpp kst/enodes.cpp#506667
A src/libkstmath/enodes.h kst/enodes.h#506667
A src/libkstmath/eparse-eh.cpp kst/eparse-eh.cpp#506667
A src/libkstmath/eparse-eh.h kst/eparse-eh.h#506667
A src/libkstmath/eparse.c kst/eparse.c#506667
A src/libkstmath/eparse.h kst/eparse.h#506667
A src/libkstmath/eparse.y kst/eparse.y#506667
A src/libkstmath/escan.c kst/escan.c#506667
A src/libkstmath/escan.l kst/escan.l#506667
A src/libkstmath/fftsg_h.c kst/fftsg_h.c#506667
A src/libkstmath/kstbasecurve.cpp kst/kstbasecurve.cpp#506667
A src/libkstmath/kstbasecurve.h kst/kstbasecurve.h#506667
A src/libkstmath/kstcolorsequence.cpp kst/kstcolorsequence.cpp#506667
A src/libkstmath/kstcolorsequence.h kst/kstcolorsequence.h#506667
A src/libkstmath/kstcsd.cpp kst/kstcsd.cpp#508845
A src/libkstmath/kstcsd.h kst/kstcsd.h#506667
A src/libkstmath/kstcurvehint.cpp kst/kstcurvehint.cpp#506667
A src/libkstmath/kstcurvehint.h kst/kstcurvehint.h#506667
A src/libkstmath/kstdataobject.cpp kst/kstdataobject.cpp#508845
A src/libkstmath/kstdataobject.h kst/kstdataobject.h#506667
A src/libkstmath/kstdataobjectcollection.cpp kst/kstdataobjectcollection.cpp#508845
A src/libkstmath/kstdataobjectcollection.h kst/kstdataobjectcollection.h#508845
A src/libkstmath/kstdefaultnames.cpp kst/kstdefaultnames.cpp#508845
A src/libkstmath/kstdefaultnames.h kst/kstdefaultnames.h#508845
A src/libkstmath/kstequation.cpp kst/kstequation.cpp#508845
A src/libkstmath/kstequation.h kst/kstequation.h#506667
A src/libkstmath/ksthistogram.cpp kst/ksthistogram.cpp#506667
A src/libkstmath/ksthistogram.h kst/ksthistogram.h#506667
A src/libkstmath/kstimage.cpp kst/kstimage.cpp#506667
A src/libkstmath/kstimage.h kst/kstimage.h#506667
A src/libkstmath/kstlinestyle.cpp kst/kstlinestyle.cpp#506667
A src/libkstmath/kstlinestyle.h kst/kstlinestyle.h#506667
A src/libkstmath/kstobjectdefaults.cpp kst/kstobjectdefaults.cpp#508857
A src/libkstmath/kstobjectdefaults.h kst/kstobjectdefaults.h#508857
A src/libkstmath/kstpainter.cpp kst/kstpainter.cpp#506667
A src/libkstmath/kstpainter.h kst/kstpainter.h#506667
A src/libkstmath/kstplotdefines.h kst/kstplotdefines.h#506667
A src/libkstmath/kstplugin.cpp kst/kstplugin.cpp#506667
A src/libkstmath/kstplugin.h kst/kstplugin.h#506667
A src/libkstmath/kstpoint.cpp kst/kstpoint.cpp#506667
A src/libkstmath/kstpoint.h kst/kstpoint.h#506667
A src/libkstmath/kstpsd.cpp kst/kstpsd.cpp#508845
A src/libkstmath/kstpsd.h kst/kstpsd.h#506667
A src/libkstmath/kstpsdgenerator.cpp kst/kstpsdgenerator.cpp#506667
A src/libkstmath/kstpsdgenerator.h kst/kstpsdgenerator.h#506667
A src/libkstmath/kstsettings.cpp kst/kstsettings.cpp#508845
A src/libkstmath/kstsettings.h kst/kstsettings.h#506667
A src/libkstmath/kstvcurve.cpp kst/kstvcurve.cpp#506667
A src/libkstmath/kstvcurve.h kst/kstvcurve.h#506667
A src/libkstmath/labelparser.cpp kst/labelparser.cpp#506667
A src/libkstmath/labelparser.h kst/labelparser.h#506667
A src/libkstmath/plugin.cpp kst/plugin.cpp#506667
A src/libkstmath/plugin.h kst/plugin.h#506667
A src/libkstmath/plugincollection.cpp kst/plugincollection.cpp#506667
A src/libkstmath/plugincollection.h kst/plugincollection.h#506667
A src/libkstmath/pluginloader.cpp kst/pluginloader.cpp#506667
A src/libkstmath/pluginloader.h kst/pluginloader.h#506667
A src/libkstmath/pluginxmlparser.cpp kst/pluginxmlparser.cpp#506667
A src/libkstmath/pluginxmlparser.h kst/pluginxmlparser.h#506667
--- trunk/extragear/graphics/kst/kst/Makefile.am #508873:508874
@@ -8,47 +8,14 @@
bin_PROGRAMS = kst d2asc
-lib_LTLIBRARIES = libkstmath.la libkstwidgets.la libkstapp.la
+lib_LTLIBRARIES = libkstwidgets.la libkstapp.la
kde_widget_LTLIBRARIES = kstwidgets.la
noinst_LTLIBRARIES = libkstplot.la
-libkstmath_la_SOURCES = \
- kstsettings.cpp \
- kstobjectdefaults.cpp \
- labelparser.cpp \
- kstdataobject.cpp \
- kstdataobjectcollection.cpp \
- kstcsd.cpp \
- kstpsd.cpp \
- kstbasecurve.cpp \
- kstpoint.cpp \
- kstlinestyle.cpp \
- kstvcurve.cpp \
- kstimage.cpp \
- kstdefaultnames.cpp \
- ksthistogram.cpp \
- kstequation.cpp \
- kstcurvehint.cpp \
- kstplugin.cpp \
- kstpsdgenerator.cpp \
- fftsg_h.c \
- enodes.cpp \
- enodefactory.cpp \
- plugincollection.cpp \
- plugin.cpp \
- pluginxmlparser.cpp \
- pluginloader.cpp \
- dialoglauncher.cpp \
- eparse-eh.cpp \
- eparse.c \
- escan.c
-libkstmath_la_LDFLAGS = -version-info @KST_LIBKST_VERSION@ $(all_libraries) -no-undefined
-libkstmath_la_LIBADD = $(LIB_KDECORE) ../src/libkst/libkst.la
-
d2asc_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
-d2asc_LDADD = libkstmath.la ../src/libkst/libkst.la
+d2asc_LDADD = ../src/libkstmath/libkstmath.la
d2asc_SOURCES = d2asc.cpp
@@ -62,7 +29,6 @@
comboboxselection_i.cpp \
stringeditor.ui \
scalareditor.ui \
- kstcolorsequence.cpp \
scalarselector.ui \
matrixselector.ui \
vectorselector.ui \
@@ -77,7 +43,7 @@
datarangewidget.ui
libkstwidgets_la_LDFLAGS = -version-info @KST_LIBKST_VERSION@ $(all_libraries) -no-undefined
-libkstwidgets_la_LIBADD = $(LIB_KIO) libkstmath.la
+libkstwidgets_la_LIBADD = $(LIB_KIO) ../src/libkstmath/libkstmath.la
libkstapp_la_SOURCES = \
kstdatacollection-gui.cpp \
@@ -99,7 +65,6 @@
eventmonitorwidget.ui \
pluginmanager.ui \
curvedialogwidget.ui \
- kstpainter.cpp \
kstwaitcondition_unix.cpp \
kstiface.skel \
kstiface_impl.cpp \
@@ -222,7 +187,7 @@
mime_DATA = x-kst.desktop
# set the include path for X, qt and KDE
-INCLUDES= $(KMDI_INCLUDES) -I$(top_srcdir)/kst/src/extdate -I$(top_srcdir)/kst/src/libkst -I../src/libkst -I$(top_srcdir) $(all_includes)
+INCLUDES= $(KMDI_INCLUDES) -I$(top_srcdir)/kst/src/extdate -I$(top_srcdir)/kst/src/libkst -I$(top_srcdir)/kst/src/libkstmath -I../src/libkst -I$(top_srcdir) $(all_includes)
rcdir = $(kde_datadir)/kst
rc_DATA = kstui.rc
--- trunk/extragear/graphics/kst/kst/datasources/cdf/Makefile.am #508873:508874
@@ -1,4 +1,4 @@
-INCLUDES=-I$(top_srcdir)/kst/src/libkst $(CDFINCLUDES) $(all_includes)
+INCLUDES=-I$(top_srcdir)/kst/src/libkst -I$(top_srcdir)/kst/src/extdate $(CDFINCLUDES) $(all_includes)
kde_module_LTLIBRARIES=kstdata_cdf.la
--- trunk/extragear/graphics/kst/kst/datasources/dirfile/Makefile.am #508873:508874
@@ -1,4 +1,4 @@
-INCLUDES=-I$(srcdir)/../.. -I$(srcdir)/../../extdate $(all_includes)
+INCLUDES=-I$(top_srcdir)/kst/src/libkst $(all_includes)
kde_module_LTLIBRARIES=kstdata_dirfile.la
--- trunk/extragear/graphics/kst/kst/datasources/frame/Makefile.am #508873:508874
@@ -1,4 +1,4 @@
-INCLUDES=-I$(srcdir)/../.. -I$(srcdir)/../../extdate $(all_includes)
+INCLUDES=-I$(top_srcdir)/kst/src/libkst $(all_includes)
kde_module_LTLIBRARIES=kstdata_frame.la
--- trunk/extragear/graphics/kst/kst/datasources/indirect/Makefile.am #508873:508874
@@ -1,4 +1,4 @@
-INCLUDES=-I$(srcdir)/../.. -I$(srcdir)/../../extdate $(all_includes)
+INCLUDES=-I$(top_srcdir)/kst/src/libkst -I$(srcdir)/../../extdate $(all_includes)
kde_module_LTLIBRARIES=kstdata_indirect.la
--- trunk/extragear/graphics/kst/kst/datasources/netcdf/Makefile.am #508873:508874
@@ -1,4 +1,4 @@
-INCLUDES=-I$(srcdir)/../.. -I$(srcdir)/../../extdate $(NETCDFINCLUDES) $(all_includes)
+INCLUDES=-I$(top_srcdir)/kst/src/libkst -I$(top_srcdir)/kst/src/extdate $(NETCDFINCLUDES) $(all_includes)
kde_module_LTLIBRARIES=kstdata_netcdf.la
--- trunk/extragear/graphics/kst/kst/datasources/planck/Makefile.am #508873:508874
@@ -1,4 +1,4 @@
-INCLUDES=-I$(srcdir)/../.. -I$(srcdir)/../../extdate $(PIOINCLUDES) $(TFINCLUDES) $(all_includes)
+INCLUDES=-I$(top_srcdir)/kst/src/libkst -I$(srcdir)/../../extdate $(PIOINCLUDES) $(TFINCLUDES) $(all_includes)
kde_module_LTLIBRARIES=kstdata_planck.la
--- trunk/extragear/graphics/kst/kst/datasources/qimagesource/Makefile.am #508873:508874
@@ -1,4 +1,4 @@
-INCLUDES=-I$(srcdir)/../.. -I$(srcdir)/../../extdate $(all_includes)
+INCLUDES=-I$(top_srcdir)/kst/src/libkst $(all_includes)
kde_module_LTLIBRARIES=kstdata_qimagesource.la
--- trunk/extragear/graphics/kst/kst/extensions/elog/Makefile.am #508873:508874
@@ -1,4 +1,4 @@
-INCLUDES=-I$(top_srcdir)/kst/src/libkst -I../../../src/libkst -I$(srcdir)/../.. -I$(top_srcdir) $(KMDI_INCLUDES) $(all_includes)
+INCLUDES=-I$(top_srcdir)/kst/src/libkst -I$(top_srcdir)/kst/src/libkstmath -I../../../src/libkst -I$(srcdir)/../.. -I$(top_srcdir) $(KMDI_INCLUDES) $(all_includes)
kde_module_LTLIBRARIES=kstextension_elog.la
--- trunk/extragear/graphics/kst/kst/extensions/js/Makefile.am #508873:508874
@@ -9,7 +9,7 @@
else
JSEXTERN=js_extern.cpp
endif
-INCLUDES=-I$(top_srcdir)/kst/kst -I$(top_srcdir)/kst/src/libkst -I$(top_srcdir)/kst/src/extdate -I$(top_builddir)/kst/src/libkst -I$(top_builddir)/kst/kst -I$(top_srcdir) $(KMDI_INCLUDES) $(KJSEINCLUDES) $(all_includes)
+INCLUDES=-I$(top_srcdir)/kst/kst -I$(top_srcdir)/kst/src/libkst -I$(top_srcdir)/kst/src/libkstmath -I$(top_srcdir)/kst/src/extdate -I$(top_builddir)/kst/src/libkst -I$(top_builddir)/kst/kst -I$(top_srcdir) $(KMDI_INCLUDES) $(KJSEINCLUDES) $(all_includes)
kde_module_LTLIBRARIES=kstextension_js.la
if include_kstcmd
--- trunk/extragear/graphics/kst/kst/extensions/pulse/Makefile.am #508873:508874
@@ -1,4 +1,4 @@
-INCLUDES=-I$(top_srcdir)/kst/src/libkst -I$(top_srcdir) -I$(top_srcdir)/kst/kst $(KMDI_INCLUDES) $(all_includes)
+INCLUDES=-I$(top_srcdir)/kst/src/libkst -I$(top_srcdir) -I$(top_srcdir)/kst/src/libkstmath -I$(top_srcdir)/kst/kst $(KMDI_INCLUDES) $(all_includes)
kde_module_LTLIBRARIES=kstextension_pulse.la
--- trunk/extragear/graphics/kst/src/Makefile.am #508873:508874
@@ -1,6 +1,6 @@
if include_libkstkmdi
KMDI_SUBDIR=libkstkmdi
endif
-SUBDIRS = extdate $(KMDI_SUBDIR) libkst plugins
-# libkstmath widgets libkstapp plugins kst datasources d2asc extensions
+SUBDIRS = extdate $(KMDI_SUBDIR) libkst libkstmath plugins
+# widgets libkstapp plugins kst datasources d2asc extensions
More information about the Kst
mailing list