Drop automake build support.

Add basic cmake build instructions.
Delete LEEME, LIESMICH and LISEZMOI files.
Delete empty file NEWS.
Rework of the FAQ, INSTALL and README files.
Add detection for the lm-sensors and math libc libraries.
Move the ksensors.desktop file into XDG_APPS_INSTALL_DIR directory,
see TDE/tde#26 and bug 2408.
Add French description and comments in the ksensors.desktop file.
Some cosmetics here and there.

Signed-off-by: gregory guy <[email protected]>

5 files changed, 9 insertions, 145 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 32ff0f4..f841d12 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,9 +1,13 @@
+add_subdirectory( pics   )
+add_subdirectory( sounds )
+
 include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
+  ${SENSORS_INCLUDE_DIRS}
 )
 
 link_directories(
@@ -32,8 +36,8 @@ tde_add_executable( ${PROJECT_NAME} AUTOMOC
   LINK
      tdeui-shared
      tdecore-shared
-     sensors
-     m
+     ${SENSORS_LIBRARIES}
+     ${MATH_LIBC}
      
   DESTINATION ${BIN_INSTALL_DIR}
 )
@@ -53,11 +57,5 @@ install(
 
 install(
     FILES ${PROJECT_NAME}.desktop
-    DESTINATION ${APPS_INSTALL_DIR}/System
+    DESTINATION ${XDG_APPS_INSTALL_DIR}
 )
-
-
-##### other directories
-
-add_subdirectory( pics )
-add_subdirectory( sounds )
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index a9d924b..0000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,61 +0,0 @@
-# set the include path for X, qt and TDE
-INCLUDES = $(all_includes)
-
-# these are the headers for your project
-noinst_HEADERS = ksensors.h aboutcfgdesign.h \
-	cpupanel.h cputimepanel.h generalcfgdesign.h generalcfg.h \
-	hdsensorslist.h i8ksensorslist.h infopanels.h ksensorscfg.h \
-	ksensors.h ksensorssplash.h lmsensordockpanel.h lmsensor.h \
-	lmsensorpanel.h lmsensorsalarms.h lmsensorscfgdesign.h \
-	lmsensorscfg.h lmsensorschip.h lmsensorsdock.h lmsensors.h \
-	lmsensorswidget.h palettecfgdesign.h palettecfg.h panel.h \
-	panelsgroup.h processexec.h procinfo.h qbarmeter.h \
-	qdialarc.h qlcddraw.h qlcdstring.h rampanel.h sensor.h \
-	sensorslist.h systemcfgdesign.h systemcfg.h uptimepanel.h
-
-# let automoc handle all of the meta source files (moc)
-METASOURCES = AUTO
-
-messages: rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/ksensors.pot
-
-
-#########################################################################
-# APPLICATION SECTION
-#########################################################################
-# this is the program that gets installed.  it's name is used for all
-# of the other Makefile.am variables
-bin_PROGRAMS = ksensors
-
-# the application source, library search path, and link libraries
-ksensors_SOURCES = main.cpp ksensors.cpp aboutcfgdesign.ui \
-		   cpupanel.cpp cputimepanel.cpp generalcfg.cpp \
-		   generalcfgdesign.ui hdsensorslist.cpp i8ksensorslist.cpp \
-		   infopanels.cpp ksensorscfg.cpp \
-		   ksensorssplash.cpp lmsensor.cpp lmsensordockpanel.cpp \
-		   lmsensorpanel.cpp lmsensorsalarms.cpp lmsensorscfg.cpp \
-		   lmsensorscfgdesign.ui lmsensorschip.cpp lmsensors.cpp \
-		   lmsensorsdock.cpp lmsensorswidget.cpp palettecfg.cpp \
-		   palettecfgdesign.ui panel.cpp panelsgroup.cpp \
-		   processexec.cpp procinfo.cpp qbarmeter.cpp \
-		   qdialarc.cpp qlcdraw.cpp qlcdstring.cpp \
-		   rampanel.cpp sensor.cpp sensorslist.cpp \
-		   systemcfg.cpp systemcfgdesign.ui uptimepanel.cpp
-
-ksensors_LDFLAGS = $(TDE_RPATH) $(all_libraries)
-ksensors_LDADD = $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT) -lsensors -lm
-
-# this is where the desktop file will go
-shelldesktopdir   = $(kde_appsdir)/System
-shelldesktop_DATA = ksensors.desktop
-
-# and for autostart
-autostartdir = $(prefix)/share/autostart
-autostart_DATA = ksensors.desktop
-
-# this is where the shell's XML-GUI resource file goes
-shellrcdir   = $(kde_datadir)/ksensors
-shellrc_DATA = ksensorsui.rc
-
-SUBDIRS = pics sounds
-
diff --git a/src/ksensors.desktop b/src/ksensors.desktop
index b67f102..ed505ef 100644
--- a/src/ksensors.desktop
+++ b/src/ksensors.desktop
@@ -7,9 +7,11 @@ Type=Application
 
 Comment=Monitoring of temperatures, voltages and fan speeds
 Comment[de]=Überwachung von Temperaturen, Spannungen und Lüfterdrehzahlen
+Comment[fr]=Surveillance de la temperature, du voltage et de la vitesse des ventilateurs
 
 GenericName=Lm-Sensors Frontend
 GenericName[de]=Grafische Oberfläche für LM-Sensors
+GenericName[fr]=Interface graphique pour lm-sensors
 
 X-DocPath=ksensors/index.html
 X-TDE-autostart-after=panel
diff --git a/src/pics/Makefile.am b/src/pics/Makefile.am
deleted file mode 100644
index 05e08ba..0000000
--- a/src/pics/Makefile.am
+++ /dev/null
@@ -1,62 +0,0 @@
-####### tdevelop will overwrite this part!!! (begin)##########
-
-INCLUDES = $(all_includes)
-
-EXTRA_DIST = thermometer.png thermometer18x18.png motherboard.png ksensorssplash.png ksensorsdocked.png ksensorsbackground.png harddisk.png earth.png cooler.png cooler18x18.png computers.png battery.png battery18x18.png lo32-app-ksensors.png lo16-app-ksensors.png hi32-app-ksensors.png hi16-app-ksensors.png 
-
-install-data-local:
-	$(mkinstalldirs) $(kde_datadir)/ksensors/pics/
-	$(INSTALL_DATA) $(srcdir)/thermometer.png $(kde_datadir)/ksensors/pics/thermometer.png
-	$(mkinstalldirs) $(kde_datadir)/ksensors/pics/
-	$(INSTALL_DATA) $(srcdir)/thermometer18x18.png $(kde_datadir)/ksensors/pics/thermometer18x18.png
-	$(mkinstalldirs) $(kde_datadir)/ksensors/pics/
-	$(INSTALL_DATA) $(srcdir)/motherboard.png $(kde_datadir)/ksensors/pics/motherboard.png
-	$(mkinstalldirs) $(kde_datadir)/ksensors/pics/
-	$(INSTALL_DATA) $(srcdir)/ksensorssplash.png $(kde_datadir)/ksensors/pics/ksensorssplash.png
-	$(mkinstalldirs) $(kde_datadir)/ksensors/pics/
-	$(INSTALL_DATA) $(srcdir)/ksensorsdocked.png $(kde_datadir)/ksensors/pics/ksensorsdocked.png
-	$(mkinstalldirs) $(kde_datadir)/ksensors/pics/
-	$(INSTALL_DATA) $(srcdir)/ksensorsbackground.png $(kde_datadir)/ksensors/pics/ksensorsbackground.png
-	$(mkinstalldirs) $(kde_datadir)/ksensors/pics/
-	$(INSTALL_DATA) $(srcdir)/harddisk.png $(kde_datadir)/ksensors/pics/harddisk.png
-	$(mkinstalldirs) $(kde_datadir)/ksensors/pics/
-	$(INSTALL_DATA) $(srcdir)/earth.png $(kde_datadir)/ksensors/pics/earth.png
-	$(mkinstalldirs) $(kde_datadir)/ksensors/pics/
-	$(INSTALL_DATA) $(srcdir)/cooler.png $(kde_datadir)/ksensors/pics/cooler.png
-	$(mkinstalldirs) $(kde_datadir)/ksensors/pics/
-	$(INSTALL_DATA) $(srcdir)/cooler18x18.png $(kde_datadir)/ksensors/pics/cooler18x18.png
-	$(mkinstalldirs) $(kde_datadir)/ksensors/pics/
-	$(INSTALL_DATA) $(srcdir)/computers.png $(kde_datadir)/ksensors/pics/computers.png
-	$(mkinstalldirs) $(kde_datadir)/ksensors/pics/
-	$(INSTALL_DATA) $(srcdir)/battery.png $(kde_datadir)/ksensors/pics/battery.png
-	$(mkinstalldirs) $(kde_datadir)/ksensors/pics/
-	$(INSTALL_DATA) $(srcdir)/battery18x18.png $(kde_datadir)/ksensors/pics/battery18x18.png
-	$(mkinstalldirs) $(kde_icondir)/locolor/32x32/apps/
-	$(INSTALL_DATA) $(srcdir)/lo32-app-ksensors.png $(kde_icondir)/locolor/32x32/apps/ksensors.png
-	$(mkinstalldirs) $(kde_icondir)/locolor/16x16/apps/
-	$(INSTALL_DATA) $(srcdir)/lo16-app-ksensors.png $(kde_icondir)/locolor/16x16/apps/ksensors.png
-	$(mkinstalldirs) $(kde_icondir)/hicolor/32x32/apps/
-	$(INSTALL_DATA) $(srcdir)/hi32-app-ksensors.png $(kde_icondir)/hicolor/32x32/apps/ksensors.png
-	$(mkinstalldirs) $(kde_icondir)/hicolor/16x16/apps/
-	$(INSTALL_DATA) $(srcdir)/hi16-app-ksensors.png $(kde_icondir)/hicolor/16x16/apps/ksensors.png
-
-uninstall-local:
-	-rm -f $(kde_datadir)/ksensors/pics/thermometer.png
-	-rm -f $(kde_datadir)/ksensors/pics/thermometer18x18.png
-	-rm -f $(kde_datadir)/ksensors/pics/motherboard.png
-	-rm -f $(kde_datadir)/ksensors/pics/ksensorssplash.png
-	-rm -f $(kde_datadir)/ksensors/pics/ksensorsdocked.png
-	-rm -f $(kde_datadir)/ksensors/pics/ksensorsbackground.png
-	-rm -f $(kde_datadir)/ksensors/pics/harddisk.png
-	-rm -f $(kde_datadir)/ksensors/pics/earth.png
-	-rm -f $(kde_datadir)/ksensors/pics/cooler.png
-	-rm -f $(kde_datadir)/ksensors/pics/cooler18x18.png
-	-rm -f $(kde_datadir)/ksensors/pics/computers.png
-	-rm -f $(kde_datadir)/ksensors/pics/battery.png
-	-rm -f $(kde_datadir)/ksensors/pics/battery18x18.png
-	-rm -f $(kde_icondir)/locolor/32x32/apps/ksensors.png
-	-rm -f $(kde_icondir)/locolor/16x16/apps/ksensors.png
-	-rm -f $(kde_icondir)/hicolor/32x32/apps/ksensors.png
-	-rm -f $(kde_icondir)/hicolor/16x16/apps/ksensors.png
-
-####### tdevelop will overwrite this part!!! (end)############
diff --git a/src/sounds/Makefile.am b/src/sounds/Makefile.am
deleted file mode 100644
index ca61292..0000000
--- a/src/sounds/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-####### tdevelop will overwrite this part!!! (begin)##########
-
-INCLUDES = $(all_includes)
-
-EXTRA_DIST = ksensors_alert.wav
-
-install-data-local:
-	$(mkinstalldirs) $(kde_sounddir)
-	$(INSTALL_DATA) $(srcdir)/ksensors_alert.wav $(kde_sounddir)/ksensors_alert.wav
-uninstall-local:
-	rm -f $(kde_sounddir)/ksensors_alert.wav
-
-####### tdevelop will overwrite this part!!! (end)############