[Kst] extragear/graphics/kst

[George Staikos]

SVN commit 508172 by staikos:

move libkstkmdi and extdate into src/


 M  +1 -1      Makefile.am  
 M  +3 -6      kst/Makefile.am  
 D             kst/extdate (directory)  
 D             kst/libkstkmdi (directory)  
 M  +5 -1      src/Makefile.am  
 A             src/extdate (directory)   kst/extdate#506667
 A             src/libkstkmdi (directory)   kst/libkstkmdi#506667


--- trunk/extragear/graphics/kst/Makefile.am #508171:508172
@@ -1,4 +1,4 @@
-SUBDIRS = kst src misc tests
+SUBDIRS = src kst misc tests
 
 EXTRA_DIST = AUTHORS COPYING COPYING.LGPL ChangeLog INSTALL README TODO RELEASE.NOTES kst.lsm 
 
--- trunk/extragear/graphics/kst/kst/Makefile.am #508171:508172
@@ -4,14 +4,11 @@
 
 #AM_CXXFLAGS = -Wold-style-cast -Wredundant-decls -Wunused-macros -Wfloat-equal -Wno-multichar
 
-if include_libkstkmdi
-KMDI_SUBDIR=libkstkmdi
-endif
 if include_linux
 PROCPS_COPY=sysinfo.c psversion.c
 endif
 
-SUBDIRS=extdate $(KMDI_SUBDIR) . datasources extensions pics
+SUBDIRS=. datasources extensions pics
 
 bin_PROGRAMS = kst d2asc
 
@@ -36,7 +33,7 @@
 	kststring.cpp
 
 libkst_la_LDFLAGS = -version-info @KST_LIBKST_VERSION@ -no-undefined $(all_libraries)
-libkst_la_LIBADD = $(LIB_QT) $(LIB_KIO) $(LIB_KDECORE) extdate/libkstextdate.la
+libkst_la_LIBADD = $(LIB_QT) $(LIB_KIO) $(LIB_KDECORE) ../src/extdate/libkstextdate.la
 
 noinst_LTLIBRARIES = libkstplot.la 
 libkstmath_la_SOURCES = \
@@ -256,7 +253,7 @@
 mime_DATA = x-kst.desktop
 
 # set the include path for X, qt and KDE
-INCLUDES= $(KMDI_INCLUDES) -I$(srcdir)/extdate -I$(top_srcdir) $(all_includes)
+INCLUDES= $(KMDI_INCLUDES) -I$(top_srcdir)/src/extdate -I$(top_srcdir) $(all_includes)
 
 rcdir = $(kde_datadir)/kst
 rc_DATA = kstui.rc
--- trunk/extragear/graphics/kst/src/Makefile.am #508171:508172
@@ -1,2 +1,6 @@
-SUBDIRS = plugins
+if include_libkstkmdi
+KMDI_SUBDIR=libkstkmdi
+endif
+SUBDIRS = extdate $(KMDI_SUBDIR) plugins
+# libkst libkstmath widgets libkstapp plugins kst datasources d2asc extensions