[Kst] kdeextragear-2/kst/kst [POSSIBLY UNSAFE]

[Barth Netterfield]

CVS commit by netterfield: 

Removed readdata subdir, readdata test programs, writedata, libRD;
Moved useful readdata files to source directory.


  A            CalSpecs   1.1
  A            FileFormats   1.1
  A            creaddata.c   1.1 [POSSIBLY UNSAFE: scanf,printf]
  A            creaddata.h   1.1
  A            creaddata_cpp.h   1.1
  A            readdata.c   1.1 [POSSIBLY UNSAFE: scanf,printf]
  A            readdata.h   1.1
  A            readdata_cpp.h   1.1
  M +8 -6      Makefile.am   1.7
  M +3 -3      kstfile.cpp   1.4
  R            readdata/.cvsignore   1.2
  R            readdata/CalSpecs   1.1.1.1
  R            readdata/FileFormats   1.1.1.1
  R            readdata/Makefile.am   1.2
  R            readdata/creaddata.c   1.2
  R            readdata/creaddata.h   1.2
  R            readdata/creaddata.hold.c   1.1.1.1
  R            readdata/creaddata_cpp.h   1.2
  R            readdata/readdata.c   1.2
  R            readdata/readdata.h   1.2
  R            readdata/readdata_cpp.h   1.1.1.1
  R            readdata/test_crd.c   1.1.1.1
  R            readdata/test_rd.c   1.1.1.1
  R            readdata/test_wd.c   1.1.1.1
  R            readdata/writedata.c   1.2
  R            readdata/writedata.h   1.2


--- kdeextragear-2/kst/kst/Makefile.am  #1.6:1.7
@@ -1,8 +1,8 @@
-SUBDIRS = readdata
+
 
 bin_PROGRAMS = kst d2asc
 
 d2asc_LDFLAGS   =  $(all_libraries)
-d2asc_LDADD = ./readdata/libRD.la $(LIB_QT) $(LIB_KDECORE)
+d2asc_LDADD = $(LIB_QT) $(LIB_KDECORE)
 
 d2asc_SOURCES = \
@@ -10,4 +10,6 @@
         kstfile.cpp \
         getdata.c \
+        readdata.c\
+        creaddata.c\
         kstvector.cpp \
         kstrvector.cpp \
@@ -60,4 +62,6 @@
         ksthistogramlist.cpp \
         getdata.c \
+        readdata.c\
+        creaddata.c\
         fftsg_h.c \
         changefiledialog.ui \
@@ -78,5 +82,5 @@
         main.cpp
 
-kst_LDADD = ./readdata/libRD.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE)  $(LIB_KDEPRINT) $(LIBSOCKET)
+kst_LDADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE)  $(LIB_KDEPRINT) $(LIBSOCKET)
 kst_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 
@@ -137,7 +141,5 @@
 
 # set the include path for X, qt and KDE
-INCLUDES= -I$(srcdir)/readdata $(all_includes)
-
-CPPFLAGS= -Wall
+INCLUDES= $(all_includes)
 
 METASOURCES = AUTO

--- kdeextragear-2/kst/kst/kstfile.cpp  #1.3:1.4
@@ -29,5 +29,5 @@
 #include <qfile.h>
 
-#include "readdata/creaddata_cpp.h"
+#include "creaddata_cpp.h"
 #include "getdata_cpp.h"