[Kst] extragear/graphics/kst

[George Staikos]

SVN commit 508886 by staikos:

move d2asc up


 M  +3 -14     kst/Makefile.am  
 D             kst/d2asc.cpp  
 M  +2 -2      src/Makefile.am  
 A             src/d2asc/Makefile.am  
 A             src/d2asc/d2asc.cpp   kst/d2asc.cpp#508883


--- trunk/extragear/graphics/kst/kst/Makefile.am #508885:508886
@@ -6,25 +6,14 @@
 
 SUBDIRS=. extensions pics
 
-bin_PROGRAMS = kst d2asc
+bin_PROGRAMS = kst
 
 lib_LTLIBRARIES = libkstwidgets.la libkstapp.la
 
 kde_widget_LTLIBRARIES = kstwidgets.la
 
-noinst_LTLIBRARIES = libkstplot.la 
-
-d2asc_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
-d2asc_LDADD = ../src/libkstmath/libkstmath.la
-d2asc_SOURCES = d2asc.cpp
-
-
-libkstplot_la_SOURCES = \
-	kstbackbuffer.cpp
-
-libkstplot_la_LDFLAGS = -no-undefined $(all_libraries)
-
 libkstwidgets_la_SOURCES = \
+	kstbackbuffer.cpp \
 	comboboxselection.ui \
 	comboboxselection_i.cpp \
 	stringeditor.ui \
@@ -164,7 +153,7 @@
 	kst.cpp
 
 
-libkstapp_la_LIBADD = $(LIB_KDEPRINT) libkstplot.la libkstwidgets.la $(LIB_KMDI)
+libkstapp_la_LIBADD = $(LIB_KDEPRINT) libkstwidgets.la $(LIB_KMDI)
 libkstapp_la_LDFLAGS = -version-info @KST_LIBKST_VERSION@ $(all_libraries) -no-undefined
 
 kst_SOURCES = main.cpp
--- trunk/extragear/graphics/kst/src/Makefile.am #508885:508886
@@ -1,6 +1,6 @@
 if include_libkstkmdi
 KMDI_SUBDIR=libkstkmdi
 endif
-SUBDIRS = extdate $(KMDI_SUBDIR) libkst libkstmath datasources plugins
-# widgets libkstapp plugins kst d2asc extensions
+SUBDIRS = extdate $(KMDI_SUBDIR) libkst libkstmath datasources d2asc plugins
+# widgets libkstapp kst extensions