[Kst] extragear/graphics/kst/kst

[George Staikos]

SVN commit 502185 by staikos:

this should do it.  it now links without undefined symbols


 M  +5 -11     Makefile.am  


--- trunk/extragear/graphics/kst/kst/Makefile.am #502184:502185
@@ -15,7 +15,7 @@
 
 bin_PROGRAMS = kst d2asc
 
-lib_LTLIBRARIES = libkst.la libkstmath.la libkstwidgets.la libkstguiapp.la libkstapp.la
+lib_LTLIBRARIES = libkst.la libkstmath.la libkstwidgets.la libkstapp.la
 
 kde_widget_LTLIBRARIES = kstwidgets.la
 
@@ -111,8 +111,8 @@
 libkstwidgets_la_LDFLAGS = -version-info @KST_LIBKST_VERSION@ $(all_libraries) -no-undefined
 libkstwidgets_la_LIBADD = $(LIB_KIO) libkstmath.la
 
-
-libkstguiapp_la_SOURCES = kstdatacollection-gui.cpp \
+libkstapp_la_SOURCES = \
+	kstdatacollection-gui.cpp \
 	dialoglauncher-gui.cpp \
 	labelrenderer.cpp \
 	kstnumbersequence.cpp \
@@ -130,13 +130,7 @@
 	plugindialogwidget.ui \
 	eventmonitorwidget.ui \
 	pluginmanager.ui \
-	curvedialogwidget.ui
-
-libkstguiapp_la_LDFLAGS = -version-info @KST_LIBKST_VERSION@ $(all_libraries)
-#-no-undefined
-libkstguiapp_la_LIBADD = libkstwidgets.la
-
-libkstapp_la_SOURCES = \
+	curvedialogwidget.ui \
 	kstpainter.cpp \
 	kstwaitcondition_unix.cpp \
 	kstiface.skel \
@@ -238,7 +232,7 @@
 
 include_HEADERS = kstdatasource.h kstobject.h kst_export.h kstsharedptr.h rwlock.h kstdateparser.h
 
-libkstapp_la_LIBADD = $(LIB_KDEPRINT) libkstplot.la libkstguiapp.la $(LIB_KMDI)
+libkstapp_la_LIBADD = $(LIB_KDEPRINT) libkstplot.la libkstwidgets.la $(LIB_KMDI)
 libkstapp_la_LDFLAGS = -version-info @KST_LIBKST_VERSION@ $(all_libraries) -no-undefined
 
 kst_SOURCES = main.cpp