Clean up

svn path=/trunk/KDE/kdeedu/libkdeedu/; revision=573283

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f34ccca4059d44cccbad1f131de6fbf60d4084ca..ac12253a5784ece8c8e0c15b1ec2af1b8afeb4ea 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,13 +6,3 @@ add_subdirectory(kdeeduplot)
 add_subdirectory(extdate)
 add_subdirectory(libscience)
 add_subdirectory(widgets)
-
-
-#original Makefile.am contents follow:
-
-#SUBDIRS = kdeeducore kdeeduui kdeeduplot extdate libscience widgets
-#
-#messages:
-#      $(XGETTEXT) `find . -name \*.h -o -name \*.cpp -o -name \*.cc` -o $(podir)/libkdeedu.pot 
-#
-#include ../admin/Doxyfile.am

diff --git a/extdate/CMakeLists.txt b/extdate/CMakeLists.txt
index 423c7069279b7b87362c5dba6887b006e99bb4a6..17fcc03e93db9b9d57acce8da3520ac73b5cd569 100644 (file)
--- a/extdate/CMakeLists.txt
+++ b/extdate/CMakeLists.txt
@@ -25,23 +25,3 @@ set_target_properties(extdate PROPERTIES VERSION 1.2.0 SOVERSION 1 )
 install(TARGETS extdate  DESTINATION ${LIB_INSTALL_DIR} )
 
 
-########### install files ###############
-
-
-
-
-
-#original Makefile.am contents follow:
-
-#SUBDIRS = . tests
-#
-#INCLUDES= $(all_includes)
-#
-#lib_LTLIBRARIES = libextdate.la
-#
-#libextdate_la_SOURCES = extdatetime.cpp extcalendarsystem.cpp extcalendarsystemgregorian.cpp extdatetbl.cpp extdatepicker.cpp extdatetimeedit.cpp extdatewidget.cpp
-#
-#libextdate_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
-#libextdate_la_LIBADD = $(LIB_KDEUI) -lkde3support
-#
-#METASOURCES = AUTO

diff --git a/extdate/tests/CMakeLists.txt b/extdate/tests/CMakeLists.txt
index aefaa44e8a280826c04172f5a84350c161a9604d..1aba207d7ec9364b596d02776948b2bbdcc94f3c 100644 (file)
--- a/extdate/tests/CMakeLists.txt
+++ b/extdate/tests/CMakeLists.txt
@@ -1,4 +1,4 @@
-
+if(KDE4_BUILD_TESTS)
 include_directories( ${CMAKE_SOURCE_DIR}/libkdeedu/extdate  )
 
 
@@ -8,66 +8,29 @@ set(test_extdate_SRCS test_extdate.cc )
 
 kde4_automoc(${test_extdate_SRCS})
 
-if(KDE4_BUILD_TESTS)
-
 kde4_add_executable(test_extdate ${test_extdate_SRCS})
 
 target_link_libraries(test_extdate  ${KDE4_KDECORE_LIBS} extdate )
 
-endif(KDE4_BUILD_TESTS)
-
 ########### next target ###############
 
 set(test_extdatepicker_SRCS edpicker_widget.cpp edpicker_main.cpp )
 
 kde4_automoc(${test_extdatepicker_SRCS})
 
-if(KDE4_BUILD_TESTS)
-
 kde4_add_executable(test_extdatepicker ${test_extdatepicker_SRCS})
 
 target_link_libraries(test_extdatepicker  ${KDE4_KDECORE_LIBS} extdate )
 
-endif(KDE4_BUILD_TESTS)
-
 ########### next target ###############
 
 set(test_extdatetimeedit_SRCS edtedit_widget.cpp edtedit_main.cpp )
 
 kde4_automoc(${test_extdatetimeedit_SRCS})
 
-if(KDE4_BUILD_TESTS)
-
 kde4_add_executable(test_extdatetimeedit ${test_extdatetimeedit_SRCS})
 
 target_link_libraries(test_extdatetimeedit  ${KDE4_KDECORE_LIBS} extdate )
 
 endif(KDE4_BUILD_TESTS)
 
-########### install files ###############
-
-
-
-
-
-#original Makefile.am contents follow:
-
-#INCLUDES = -I$(top_srcdir)/libkdeedu/extdate $(all_includes)
-#
-#AM_LDFLAGS = $(QT_LDFLAGS) $(X_LDFLAGS) $(KDE_RPATH)
-#
-#check_PROGRAMS = test_extdate test_extdatepicker test_extdatetimeedit
-#
-#test_extdate_SOURCES = test_extdate.cc
-#test_extdate_LDFLAGS = $(all_libraries)
-#test_extdate_LDADD = ../libextdate.la
-#
-#test_extdatepicker_SOURCES = edpicker_widget.cpp edpicker_main.cpp
-#test_extdatepicker_LDFLAGS = $(all_libraries)
-#test_extdatepicker_LDADD = ../libextdate.la
-#
-#test_extdatetimeedit_SOURCES = edtedit_widget.cpp edtedit_main.cpp
-#test_extdatetimeedit_LDFLAGS = $(all_libraries)
-#test_extdatetimeedit_LDADD = ../libextdate.la
-#
-#METASOURCES = AUTO

diff --git a/kdeeducore/CMakeLists.txt b/kdeeducore/CMakeLists.txt
index 8805f8a18737cb82ab29ab86b8b0b84df3d6af76..cb535b6e58fd4158054736c51be6f9f4113c3c95 100644 (file)
--- a/kdeeducore/CMakeLists.txt
+++ b/kdeeducore/CMakeLists.txt
@@ -48,29 +48,3 @@ install(FILES
    prefleitner.h DESTINATION ${INCLUDE_INSTALL_DIR}/libkdeedu
 )
 
-
-#original Makefile.am contents follow:
-
-#INCLUDES = $(all_includes)
-## there's nothing in tests for the moment, so I'm removing it from the compilation
-##SUBDIRS = . tests
-#SUBDIRS = .
-#
-#lib_LTLIBRARIES = libkdeeducore.la
-#
-#libkdeeducore_la_SOURCES = keduvocdocument.cpp keduvocexpression.cpp \
-#      keduvocgrammar.cpp keduvockvtmlreader.cpp keduvockvtmlwriter.cpp keduvocmultiplechoice.cpp \
-#      keduvowqlreader.cpp keduvowqlwriter.cpp leitnerbox.cpp leitnersystem.cpp \
-#      leitnersystemview.cpp prefleitner.cpp prefleitnerbase.ui
-#libkdeeducore_la_LDFLAGS = -no-undefined $(all_libraries) -version-info 3:0:2
-#
-#libkdeeducore_includedir = $(includedir)/libkdeedu
-#libkdeeducore_include_HEADERS = keduvocdocument.h keduvocexpression.h \
-#      keduvocgrammar.h keduvockvtmlreader.h keduvockvtmlwriter.h keduvocmultiplechoice.h \
-#      keduvowqlreader.h keduvowqlwriter.h leitnerbox.h leitnersystem.h leitnersystemview.h \
-#      prefleitner.h
-#
-#libkdeeducore_la_LIBADD = $(LIB_KDECORE) $(LIB_KFILE)
-#
-#METASOURCES = AUTO
-#

diff --git a/kdeeduplot/CMakeLists.txt b/kdeeduplot/CMakeLists.txt
index e4f3a4cdde879132b61515f6946fc1118404953c..77d6ac2a175823f641d22ef4022942bda7d2c91f 100644 (file)
--- a/kdeeduplot/CMakeLists.txt
+++ b/kdeeduplot/CMakeLists.txt
@@ -28,21 +28,3 @@ install(FILES
 )
 
 
-#original Makefile.am contents follow:
-
-#INCLUDES= $(all_includes)
-#SUBDIRS = . 
-#KDE_CXXFLAGS = -UQT3_SUPPORT
-#
-#lib_LTLIBRARIES = libkdeeduplot.la
-#
-#libkdeeduplotincludedir = $(includedir)/libkdeedu
-#libkdeeduplotinclude_HEADERS = kplotobject.h kplotaxis.h kplotwidget.h
-#
-#libkdeeduplot_la_SOURCES = kplotobject.cpp kplotaxis.cpp kplotwidget.cpp
-#
-#libkdeeduplot_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
-#libkdeeduplot_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
-#
-#METASOURCES = AUTO
-#

diff --git a/libscience/CMakeLists.txt b/libscience/CMakeLists.txt
index 27886bb7d5a59fd8ff523070c886e9f8c45f8f1b..90beb9cb94ddbc08bdabdf243fa9a079eb58e359 100644 (file)
--- a/libscience/CMakeLists.txt
+++ b/libscience/CMakeLists.txt
@@ -26,37 +26,3 @@ target_link_libraries(science  ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY} )
 set_target_properties(science PROPERTIES VERSION 4.0.0 SOVERSION 4 )
 install(TARGETS science  DESTINATION ${LIB_INSTALL_DIR} )
 
-
-########### install files ###############
-
-
-
-#original Makefile.am contents follow:
-
-#SUBDIRS = . data tests
-#KDE_CXXFLAGS = -UQT3_SUPPORT
-#
-#INCLUDES= $(all_includes)
-#
-#lib_LTLIBRARIES = libscience.la
-#
-#libscience_la_SOURCES = \
-#      element.cpp \
-#      spectrum.cpp \
-#      isotope.cpp \
-#      spectrumparser.cpp \
-#      elementparser.cpp \
-#      isotopeparser.cpp \
-#      tempunit.cpp \
-#      chemicaldataobject.cpp \
-#      moleculeparser.cpp \
-#      parser.cpp
-#
-#libscience_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 4:0:0
-#libscience_la_LIBADD = $(LIB_KDEUI) 
-#
-#METASOURCES = AUTO
-#
-#DOXYGEN_SET_WARN_IF_UNDOCUMENTED = YES
-#DOXYGEN_SET_INTERNAL_DOCS = YES
-#

diff --git a/libscience/data/CMakeLists.txt b/libscience/data/CMakeLists.txt
index 0deab5be39b0795a53e277fde518c3aae9389b28..1714bd3f1cb50ff4b34340ac35cace6d15fad788 100644 (file)
--- a/libscience/data/CMakeLists.txt
+++ b/libscience/data/CMakeLists.txt
@@ -5,9 +5,3 @@ install(FILES
    spectra.xml DESTINATION ${DATA_INSTALL_DIR}/libkdeedu/data/
 )
 
-
-#original Makefile.am contents follow:
-
-#xml_DATA = elements.xml isotopes.xml
-#
-#xmldir = $(kde_datadir)/libkdeedu/data/

diff --git a/libscience/tests/CMakeLists.txt b/libscience/tests/CMakeLists.txt
index 7e8f484c8e897a37084826996d2f565c9f49699b..bdbd2fbdedf87936427bfa26651bc2bf1a535555 100644 (file)
--- a/libscience/tests/CMakeLists.txt
+++ b/libscience/tests/CMakeLists.txt
@@ -1,9 +1,8 @@
-
+if (KDE4_BUILD_TESTS)
 include_directories( ${CMAKE_SOURCE_DIR}/libkdeedu/libscience  )
 
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
 
-if (KDE4_BUILD_TESTS)
 
 ########### next target ###############
 
@@ -27,28 +26,3 @@ target_link_libraries(xmlreadingtest  ${KDE4_KDECORE_LIBS} science )
 
 endif(KDE4_BUILD_TESTS)
 
-
-
-
-
-
-#original Makefile.am contents follow:
-
-#INCLUDES = -I$(top_srcdir)/libkdeedu/libscience $(all_includes)
-#
-#AM_LDFLAGS = $(QT_LDFLAGS) $(X_LDFLAGS) $(KDE_RPATH)
-#
-#check_PROGRAMS = xmlreadingtest isotopereadingtest #cmlspectest
-#
-#xmlreadingtest_SOURCES = xmlreadingtest.cpp
-#xmlreadingtest_LDFLAGS = $(all_libraries)
-#xmlreadingtest_LDADD = ../libscience.la
-#
-#isotopereadingtest_SOURCES = isotopereadingtest.cpp
-#isotopereadingtest_LDFLAGS = $(all_libraries)
-#isotopereadingtest_LDADD = ../libscience.la
-#
-##cmlspectest_SOURCES = cmlspectest.cpp
-##cmlspectest_LDFLAGS = $(all_libraries)
-##cmlspectest_LDADD = ../libscience.la
-#METASOURCES = AUTO

diff --git a/widgets/CMakeLists.txt b/widgets/CMakeLists.txt
index 51aacbd98437b7c07f2437523f476a2cc17cda74..270f9cb216b2d591bbd1af1e89ab94734b4b7452 100644 (file)
--- a/widgets/CMakeLists.txt
+++ b/widgets/CMakeLists.txt
@@ -21,30 +21,3 @@ target_link_libraries(kdeeduwidgets ${KDE4_KIO_LIBS} kdeeduplot extdate)
 
 install(TARGETS kdeeduwidgets DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
 
-
-########### install files ###############
-
-
-
-#original Makefile.am contents follow:
-
-#INCLUDES = -I$(srcdir)/../kdeeduplot $(all_includes)
-#
-#AM_CXXFLAGS = -DQT_PLUGIN
-##KDE_CXXFLAGS = -UQT3_SUPPORT
-#
-#METASOURCES = AUTO
-#
-#kde_widget_LTLIBRARIES = kdeeduwidgets.la
-#kdeeduwidgets_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries)
-#kdeeduwidgets_la_LIBADD = $(LIB_KIO) ../kdeeduplot/libkdeeduplot.la
-#kdeeduwidgets_la_SOURCES = kdeeduwidgets.cpp
-#
-#kdeeduwidgets.cpp: $(srcdir)/kdeedu.widgets
-#      $(MAKEKDEWIDGETS) -o kdeeduwidgets.cpp $(srcdir)/kdeedu.widgets
-#
-#kdeeduwidgets.lo: kdeeduwidgets.moc
-#kdeeduwidgets.moc: kdeeduwidgets.cpp
-#      $(MOC) -o kdeeduwidgets.moc kdeeduwidgets.cpp
-#
-#CLEANFILES = kdeeduwidgets.cpp kdeeduwidgets.moc