[Kst] extragear/graphics/kst
George Staikos
staikos at kde.org
Mon Feb 13 01:19:11 CET 2006
SVN commit 508895 by staikos:
move the widgets up
M +11 -61 kst/Makefile.am
D kst/comboboxselection.ui
D kst/comboboxselection_i.cpp
D kst/comboboxselection_i.h
D kst/curveappearancewidget.ui
D kst/curveplacementwidget.ui
D kst/datarangewidget.ui
D kst/draggablelistbox.cpp
D kst/draggablelistbox.h
D kst/editmultiplewidget.ui
M +1 -1 kst/extensions/js/Makefile.am
D kst/fftoptionswidget.ui
D kst/kstbackbuffer.cpp
D kst/kstbackbuffer.h
D kst/kstcombobox.cpp
D kst/kstcombobox.h
D kst/kstwidgets.cpp
D kst/matrixselector.ui
D kst/plotlistbox.cpp
D kst/plotlistbox.h
D kst/scalareditor.ui
D kst/scalarselector.ui
D kst/stringeditor.ui
D kst/stringselector.ui
D kst/vectorselector.ui
M +2 -2 src/Makefile.am
A src/widgets/Makefile.am
A src/widgets/comboboxselection.ui kst/comboboxselection.ui#508883
A src/widgets/comboboxselection_i.cpp kst/comboboxselection_i.cpp#508883 [License: GPL (v2+)]
A src/widgets/comboboxselection_i.h kst/comboboxselection_i.h#508883
A src/widgets/curveappearancewidget.ui kst/curveappearancewidget.ui#508883
A src/widgets/curveplacementwidget.ui kst/curveplacementwidget.ui#508883
A src/widgets/datarangewidget.ui kst/datarangewidget.ui#508883
A src/widgets/draggablelistbox.cpp kst/draggablelistbox.cpp#508883
A src/widgets/draggablelistbox.h kst/draggablelistbox.h#508883
A src/widgets/editmultiplewidget.ui kst/editmultiplewidget.ui#508883
A src/widgets/fftoptionswidget.ui kst/fftoptionswidget.ui#508883
A src/widgets/kstbackbuffer.cpp kst/kstbackbuffer.cpp#508883
A src/widgets/kstbackbuffer.h kst/kstbackbuffer.h#508883
A src/widgets/kstcombobox.cpp kst/kstcombobox.cpp#508883
A src/widgets/kstcombobox.h kst/kstcombobox.h#508883
A src/widgets/kstwidgets.cpp kst/kstwidgets.cpp#508883
A src/widgets/matrixselector.ui kst/matrixselector.ui#508883
A src/widgets/plotlistbox.cpp kst/plotlistbox.cpp#508883
A src/widgets/plotlistbox.h kst/plotlistbox.h#508883
A src/widgets/scalareditor.ui kst/scalareditor.ui#508883
A src/widgets/scalarselector.ui kst/scalarselector.ui#508883
A src/widgets/stringeditor.ui kst/stringeditor.ui#508883
A src/widgets/stringselector.ui kst/stringselector.ui#508883
A src/widgets/vectorselector.ui kst/vectorselector.ui#508883
--- trunk/extragear/graphics/kst/kst/Makefile.am #508894:508895
@@ -5,32 +5,8 @@
bin_PROGRAMS = kst
-lib_LTLIBRARIES = libkstwidgets.la libkstapp.la
+lib_LTLIBRARIES = libkstapp.la
-kde_widget_LTLIBRARIES = kstwidgets.la
-
-libkstwidgets_la_SOURCES = \
- kstbackbuffer.cpp \
- comboboxselection.ui \
- comboboxselection_i.cpp \
- stringeditor.ui \
- scalareditor.ui \
- scalarselector.ui \
- matrixselector.ui \
- vectorselector.ui \
- stringselector.ui \
- editmultiplewidget.ui \
- curveplacementwidget.ui \
- curveappearancewidget.ui \
- fftoptionswidget.ui \
- draggablelistbox.cpp \
- plotlistbox.cpp \
- kstcombobox.cpp \
- datarangewidget.ui
-
-libkstwidgets_la_LDFLAGS = -version-info @KST_LIBKST_VERSION@ $(all_libraries) -no-undefined
-libkstwidgets_la_LIBADD = $(LIB_KIO) ../src/libkstmath/libkstmath.la
-
libkstapp_la_SOURCES = \
kstdatacollection-gui.cpp \
dialoglauncher-gui.cpp \
@@ -150,17 +126,13 @@
kst.cpp
-libkstapp_la_LIBADD = $(LIB_KDEPRINT) libkstwidgets.la $(LIB_KMDI)
+libkstapp_la_LIBADD = $(LIB_KDEPRINT) ../src/widgets/libkstwidgets.la $(LIB_KMDI)
libkstapp_la_LDFLAGS = -version-info @KST_LIBKST_VERSION@ $(all_libraries) -no-undefined
kst_SOURCES = main.cpp
kst_LDADD = libkstapp.la
kst_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
-kstwidgets_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries)
-kstwidgets_la_LIBADD = libkstapp.la
-kstwidgets_la_SOURCES = kstwidgets.cpp
-
KDE_ICON = kst
services_DATA = kstplugin.desktop kstdatasourceplugin.desktop kstfilter.desktop kstextension.desktop
@@ -173,7 +145,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$(top_srcdir)/kst/src/libkstmath -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)/kst/src/widgets -I../src/widgets -I$(top_srcdir) $(all_includes)
rcdir = $(kde_datadir)/kst
rc_DATA = kstui.rc
@@ -184,48 +156,26 @@
$(XGETTEXT) $$LIST -o $(podir)/kst.pot; \
fi
-changenptsdialog.lo: datarangewidget.h
-csddialogwidget.lo: fftoptionswidget.h vectorselector.h curveplacementwidget.h
-curveappearancewidget.lo: curveappearancewidget.ui.h curveappearancewidget.ui
-curvedialogwidget.lo: vectorselector.h curveappearancewidget.h curveplacementwidget.h
-curveplacementwidget.lo: curveplacementwidget.ui.h curveplacementwidget.ui
-datawizard.lo: datawizard.ui.h datawizard.ui vectorselector.h fftoptionswidget.h datarangewidget.h
+datawizard.lo: datawizard.ui.h datawizard.ui
debugdialog.lo: debugdialog.ui.h debugdialog.ui
-editmultiplewidget.lo: editmultiplewidget.ui.h editmultiplewidget.ui
editviewobjectdialog.lo: editviewobjectdialog.ui
-eqdialogwidget.lo: curveplacementwidget.h curveappearancewidget.h vectorselector.h scalarselector.h comboboxselection.h
-eventmonitorwidget.lo: scalarselector.h comboboxselection.h vectorselector.h
-fftoptionswidget.lo: fftoptionswidget.ui.h fftoptionswidget.ui
-histogramdialogwidget.lo: vectorselector.h curveappearancewidget.h curveplacementwidget.h
-imagedialogwidget.lo: matrixselector.h curveplacementwidget.h
kst.lo: curvedifferentiate.h
kst2dplot.lo: plugindialogwidget.h matrixdialogwidget.h vectordialogwidget.h
kstcsddialog_i.lo: csddialogwidget.h
-kstdatadialog.lo: editmultiplewidget.h kstdatadialog.ui.h kstdatadialog.ui
+kstdatadialog.lo: kstdatadialog.ui.h kstdatadialog.ui
kstdatamanager_i.lo: curvedialogwidget.h histogramdialogwidget.h imagedialogwidget.h
-ksteqdialog_i.lo: comboboxselection.h eqdialogwidget.h
-ksteventmonitor_i.lo: comboboxselection.h eventmonitorwidget.h
-kstfilterdialog_i.lo: comboboxselection.h plugindialogwidget.h
-kstfitdialog_i.lo: comboboxselection.h plugindialogwidget.h
-kstplotdialog_i.lo: comboboxselection.h
-kstplugindialog_i.lo: comboboxselection.h pluginmanager.h plugindialogwidget.h
+ksteqdialog_i.lo: eqdialogwidget.h
+ksteventmonitor_i.lo: eventmonitorwidget.h
+kstfilterdialog_i.lo: plugindialogwidget.h
+kstfitdialog_i.lo: plugindialogwidget.h
+kstplugindialog_i.lo: pluginmanager.h plugindialogwidget.h
kstpsddialog_i.lo: psddialogwidget.h
kstsettingsdlg.lo: kstsettingsdlg.ui.h kstsettingsdlg.ui
kstviewbox.lo: editviewobjectdialog.h
kstviewlegend.lo: editviewobjectdialog.h
-kstwidgets.lo: comboboxselection.h curveappearancewidget.h curveplacementwidget.h datarangewidget.h editmultiplewidget.h fftoptionswidget.h matrixselector.h scalarselector.h stringselector.h vectorselector.h
-matrixselector.lo: matrixselector.ui.h matrixselector.ui
-plugindialogwidget.lo: curveappearancewidget.h
+matrixselector.lo: matrixselector.ui.h
pluginmanager.lo: pluginmanager.ui.h pluginmanager.ui
-psddialogwidget.lo: fftoptionswidget.h curveappearancewidget.h vectorselector.h curveplacementwidget.h
-scalarselector.lo: comboboxselection.h scalareditor.h scalarselector.ui.h scalarselector.ui
-stringselector.lo: stringeditor.h stringselector.ui.h stringselector.ui
-vectordialogwidget.lo: datarangewidget.h
vectorsavedialog.lo: vectorsavedialog.ui.h vectorsavedialog.ui
-vectorselector.lo: vectorselector.ui.h vectorselector.ui
-viewlegendwidget.lo: plotlistbox.h
-viewmatricesdialog.lo: matrixselector.h
-viewvectorsdialog.lo: vectorselector.h
METASOURCES=AUTO
--- trunk/extragear/graphics/kst/kst/extensions/js/Makefile.am #508894:508895
@@ -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/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)
+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)/kst/src/widgets -I$(top_srcdir) $(KMDI_INCLUDES) $(KJSEINCLUDES) $(all_includes)
kde_module_LTLIBRARIES=kstextension_js.la
if include_kstcmd
--- trunk/extragear/graphics/kst/src/Makefile.am #508894:508895
@@ -1,6 +1,6 @@
if include_libkstkmdi
KMDI_SUBDIR=libkstkmdi
endif
-SUBDIRS = extdate $(KMDI_SUBDIR) libkst libkstmath datasources d2asc plugins
-# widgets libkstapp kst extensions
+SUBDIRS = extdate $(KMDI_SUBDIR) libkst libkstmath datasources widgets d2asc plugins
+# libkstapp kst extensions
More information about the Kst
mailing list