[Kst] extragear/graphics/kst/kst

[George Staikos]

SVN commit 475962 by staikos:

fix build


 M  +4 -7      Makefile.am  
 M  +6 -7      eqdialogwidget.ui  


--- trunk/extragear/graphics/kst/kst/Makefile.am #475961:475962
@@ -2,9 +2,6 @@
 AM_YFLAGS = -d
 AM_LFLAGS = 
 
-#AM_CFLAGS=-fprofile-arcs -ftest-coverage -O0 -fno-inline
-#AM_CXXFLAGS=-fprofile-arcs -ftest-coverage -O0 -fno-inline
-
 if include_libkstkmdi
 KMDI_SUBDIR=libkstkmdi
 endif
@@ -18,7 +15,7 @@
 
 lib_LTLIBRARIES = libkst.la libkstmath.la libkstwidgets.la libkstguiapp.la libkstapp.la
 
-kde_widget_LTLIBRARIES = kstwidgets.la
+#kde_widget_LTLIBRARIES = kstwidgets.la
 
 libkst_la_SOURCES = \
 	kdebugdcopiface.cpp \
@@ -91,6 +88,8 @@
 libkstplot_la_LDFLAGS = -no-undefined $(all_libraries)
 
 libkstwidgets_la_SOURCES = \
+	comboboxselection.ui \
+	comboboxselection_i.cpp \
 	stringeditor.ui \
 	scalareditor.ui \
 	kstcolorsequence.cpp \
@@ -126,9 +125,7 @@
 	matrixdialog.ui \
 	plugindialog.ui \
 	pluginmanager.ui \
-	curvedialog.ui \
-	comboboxselection.ui \
-	comboboxselection_i.cpp
+	curvedialog.ui
 
 libkstguiapp_la_LDFLAGS = -version-info @KST_LIBKST_VERSION@ $(all_libraries)
 libkstguiapp_la_LIBADD = libkstwidgets.la
--- trunk/extragear/graphics/kst/kst/eqdialogwidget.ui #475961:475962
@@ -193,11 +193,10 @@
     </grid>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>curveplacementwidget.h</includehint>
-    <includehint>curveappearancewidget.h</includehint>
-    <includehint>vectorselector.h</includehint>
-    <includehint>scalarselector.h</includehint>
-    <includehint>vectorselector.h</includehint>
-</includehints>
+<includes>
+    <include location="local" impldecl="in implementation">curveplacementwidget.h</include>
+    <include location="local" impldecl="in implementation">curveappearancewidget.h</include>
+    <include location="local" impldecl="in implementation">vectorselector.h</include>
+    <include location="local" impldecl="in implementation">scalarselector.h</include>
+</includes>
 </UI>