[Kst] extragear/graphics/kst

[George Staikos]

SVN commit 508884 by staikos:



Make the build self-contained again, and move datasources/ up


 M  +1 -1      kst/Makefile.am  
 D             kst/datasources (directory)  
 M  +1 -1      kst/extensions/pulse/Makefile.am  
 M  +2 -2      src/Makefile.am  
 A             src/datasources (directory)   kst/datasources#506667
 A             src/datasources/Makefile.am   kst/datasources/Makefile.am#508883
 A             src/datasources/ascii (directory)   kst/datasources/ascii#508883
 A             src/datasources/cdf (directory)   kst/datasources/cdf#508883
 A             src/datasources/dirfile (directory)   kst/datasources/dirfile#508883
 M  +1 -1      src/datasources/dirfile/Makefile.am  
 A             src/datasources/fitsimage (directory)   kst/datasources/fitsimage#508883
 A             src/datasources/frame (directory)   kst/datasources/frame#508883
 M  +1 -1      src/datasources/frame/Makefile.am  
 A             src/datasources/healpix (directory)   kst/datasources/healpix#508883
 A             src/datasources/indirect (directory)   kst/datasources/indirect#508883
 A             src/datasources/lfiio (directory)   kst/datasources/lfiio#508883
 A             src/datasources/netcdf (directory)   kst/datasources/netcdf#508883
 A             src/datasources/planck (directory)   kst/datasources/planck#508883
 A             src/datasources/qimagesource (directory)   kst/datasources/qimagesource#508883
 M  +1 -1      src/datasources/qimagesource/Makefile.am  
 A             src/datasources/template (directory)   kst/datasources/template#508883


--- trunk/extragear/graphics/kst/kst/Makefile.am #508883:508884
@@ -4,7 +4,7 @@
 
 #AM_CXXFLAGS = -Wold-style-cast -Wredundant-decls -Wunused-macros -Wfloat-equal -Wno-multichar
 
-SUBDIRS=. datasources extensions pics
+SUBDIRS=. extensions pics
 
 bin_PROGRAMS = kst d2asc
 
--- trunk/extragear/graphics/kst/kst/extensions/pulse/Makefile.am #508883:508884
@@ -1,4 +1,4 @@
-INCLUDES=-I$(top_srcdir)/kst/src/libkst -I$(top_srcdir) -I$(top_srcdir)/kst/src/libkstmath -I$(top_srcdir)/kst/kst $(KMDI_INCLUDES) $(all_includes)
+INCLUDES=-I$(top_srcdir)/kst/src/libkst -I$(top_srcdir)/kst/src/extdate -I$(top_srcdir) -I$(top_srcdir)/kst/src/libkstmath -I$(top_srcdir)/kst/kst $(KMDI_INCLUDES) $(all_includes)
 
 kde_module_LTLIBRARIES=kstextension_pulse.la
 
--- trunk/extragear/graphics/kst/src/Makefile.am #508883:508884
@@ -1,6 +1,6 @@
 if include_libkstkmdi
 KMDI_SUBDIR=libkstkmdi
 endif
-SUBDIRS = extdate $(KMDI_SUBDIR) libkst libkstmath plugins
-# widgets libkstapp plugins kst datasources d2asc extensions
+SUBDIRS = extdate $(KMDI_SUBDIR) libkst libkstmath datasources plugins
+# widgets libkstapp plugins kst d2asc extensions
 
--- trunk/extragear/graphics/kst/src/datasources/dirfile/Makefile.am #508883:508884
@@ -1,4 +1,4 @@
-INCLUDES=-I$(top_srcdir)/kst/src/libkst $(all_includes)
+INCLUDES=-I$(top_srcdir)/kst/src/libkst -I$(top_srcdir)/kst/src/extdate $(all_includes)
 
 kde_module_LTLIBRARIES=kstdata_dirfile.la
 
--- trunk/extragear/graphics/kst/src/datasources/frame/Makefile.am #508883:508884
@@ -1,4 +1,4 @@
-INCLUDES=-I$(top_srcdir)/kst/src/libkst $(all_includes)
+INCLUDES=-I$(top_srcdir)/kst/src/libkst -I$(top_srcdir)/kst/src/extdate $(all_includes)
 
 kde_module_LTLIBRARIES=kstdata_frame.la
 
--- trunk/extragear/graphics/kst/src/datasources/qimagesource/Makefile.am #508883:508884
@@ -1,4 +1,4 @@
-INCLUDES=-I$(top_srcdir)/kst/src/libkst $(all_includes)
+INCLUDES=-I$(top_srcdir)/kst/src/libkst -I$(top_srcdir)/kst/src/extdate $(all_includes)
 
 kde_module_LTLIBRARIES=kstdata_qimagesource.la