moved monitor out of icecream

svn path=/trunk/playground/devtools/icemon-kde3/; revision=548828
llunak · Jun 6, 2006 · e402f7b · e402f7b
1 parent 6e22852
commit e402f7b
Show file tree

Hide file tree

Showing 40 changed files with 26 additions and 16 deletions.
diff --git a/configure.in.bot b/configure.in.bot
@@ -0,0 +1,4 @@
+
+if test -z "$ICECREAM_LDADD"; then
+  pkg-config --print-errors --exists icecream
+fi
diff --git a/configure.in.in b/configure.in.in
@@ -1,3 +1,13 @@
-KDE_SET_PREFIX
-AC_PATH_KDE
 
+pkg-config --silence-errors --exists icecream
+if test "$?" = 0; then
+  ICECREAM_LDADD=`pkg-config --libs-only-l icecream`
+  ICECREAM_LDFLAGS=`pkg-config --libs-only-L icecream`
+  ICECREAM_CFLAGS=`pkg-config --cflags icecream`
+else
+  DO_NOT_COMPILE="$DO_NOT_COMPILE icemon-kde3"
+fi
+
+AC_SUBST(ICECREAM_LDADD)
+AC_SUBST(ICECREAM_LDFLAGS)
+AC_SUBST(ICECREAM_CFLAGS)
diff --git a/IDEAS.poolview → src/IDEAS.poolview b/IDEAS.poolview → src/IDEAS.poolview
diff --git a/Makefile.am → src/Makefile.am b/Makefile.am → src/Makefile.am
@@ -1,12 +1,12 @@
 SUBDIRS = doc
 
-INCLUDES = -I$(srcdir)/.. $(all_includes)
+INCLUDES = $(ICECREAM_CFLAGS) $(all_includes)
 
 bin_PROGRAMS = icemon
 icemon_SOURCES = mon-kde.cc listview.cc ganttstatusview.cc \
                  summaryview.cc starview.cc
-icemon_LDADD = libicemon_common.la ../services/libicecream.la $(LIB_KDEUI)
-icemon_LDFLAGS = $(all_libraries)
+icemon_LDADD = libicemon_common.la -licecream $(LIB_KDEUI)
+icemon_LDFLAGS = $(all_libraries) $(ICECREAM_LDFLAGS)
 
 noinst_LTLIBRARIES = libicemon_common.la
 libicemon_common_la_SOURCES = job.cc monitor.cc hostinfo.cc statusview.cc \
@@ -23,8 +23,8 @@ pics_DATA = icemonnode.png
 
 kde_module_LTLIBRARIES = icemon_panelapplet.la
 
-icemon_panelapplet_la_LDFLAGS = -avoid-version -module $(all_libraries)
-icemon_panelapplet_la_LIBADD = libicemon_common.la ../services/libicecream.la $(LIB_KDEUI)
+icemon_panelapplet_la_LDFLAGS = -avoid-version -module $(all_libraries) $(ICECREAM_LDFLAGS)
+icemon_panelapplet_la_LIBADD = libicemon_common.la $(ICECREAM_LDADD) $(LIB_KDEUI)
 icemon_panelapplet_la_SOURCES = icemonapplet.cpp  
 
 lnkdir = $(kde_datadir)/kicker/applets

diff --git a/src/configure.in.in b/src/configure.in.in
@@ -0,0 +1,3 @@
+KDE_SET_PREFIX
+AC_PATH_KDE
+
diff --git a/detailedhostview.cc → src/detailedhostview.cc b/detailedhostview.cc → src/detailedhostview.cc
diff --git a/detailedhostview.h → src/detailedhostview.h b/detailedhostview.h → src/detailedhostview.h
diff --git a/doc/Makefile.am → src/doc/Makefile.am b/doc/Makefile.am → src/doc/Makefile.am
diff --git a/doc/icemon/Makefile.am → src/doc/icemon/Makefile.am b/doc/icemon/Makefile.am → src/doc/icemon/Makefile.am
diff --git a/doc/icemon/index.docbook → src/doc/icemon/index.docbook b/doc/icemon/index.docbook → src/doc/icemon/index.docbook
diff --git a/ganttstatusview.cc → src/ganttstatusview.cc b/ganttstatusview.cc → src/ganttstatusview.cc
diff --git a/ganttstatusview.h → src/ganttstatusview.h b/ganttstatusview.h → src/ganttstatusview.h
diff --git a/hostinfo.cc → src/hostinfo.cc b/hostinfo.cc → src/hostinfo.cc
diff --git a/hostinfo.h → src/hostinfo.h b/hostinfo.h → src/hostinfo.h
diff --git a/hostlistview.cc → src/hostlistview.cc b/hostlistview.cc → src/hostlistview.cc
diff --git a/hostlistview.h → src/hostlistview.h b/hostlistview.h → src/hostlistview.h
diff --git a/hostview.cc → src/hostview.cc b/hostview.cc → src/hostview.cc
diff --git a/hostview.h → src/hostview.h b/hostview.h → src/hostview.h
diff --git a/icemon.desktop → src/icemon.desktop b/icemon.desktop → src/icemon.desktop
diff --git a/icemonapplet.cpp → src/icemonapplet.cpp b/icemonapplet.cpp → src/icemonapplet.cpp
@@ -22,8 +22,6 @@
 #include "monitor.h"
 #include "hostview.h"
 
-#include <services/logging.h>
-
 #include <qlabel.h>
 #include <qfont.h>
 #include <qstringlist.h>
@@ -56,8 +54,6 @@ IcemonApplet::IcemonApplet( const QString &configFile, Type type, int actions,
                             QWidget *parent, const char *name )
   : KPanelApplet( configFile, type, actions, parent, name )
 {
-  setup_debug(Debug|Info|Warning|Error,"");
-
   setBackgroundOrigin( AncestorOrigin );
 
   mHostInfoManager = new HostInfoManager;

diff --git a/icemonapplet.desktop → src/icemonapplet.desktop b/icemonapplet.desktop → src/icemonapplet.desktop
diff --git a/icemonapplet.h → src/icemonapplet.h b/icemonapplet.h → src/icemonapplet.h
diff --git a/icemonnode.png → src/icemonnode.png b/icemonnode.png → src/icemonnode.png
diff --git a/icemonui.rc → src/icemonui.rc b/icemonui.rc → src/icemonui.rc
diff --git a/job.cc → src/job.cc b/job.cc → src/job.cc
diff --git a/job.h → src/job.h b/job.h → src/job.h
diff --git a/joblistview.cc → src/joblistview.cc b/joblistview.cc → src/joblistview.cc
diff --git a/joblistview.h → src/joblistview.h b/joblistview.h → src/joblistview.h
diff --git a/listview.cc → src/listview.cc b/listview.cc → src/listview.cc
diff --git a/listview.h → src/listview.h b/listview.h → src/listview.h
diff --git a/mon-kde.cc → src/mon-kde.cc b/mon-kde.cc → src/mon-kde.cc
@@ -31,8 +31,6 @@
 #include "starview.h"
 #include "summaryview.h"
 
-#include <services/logging.h>
-
 #include <kaboutdata.h>
 #include <kaction.h>
 #include <kapplication.h>
@@ -222,7 +220,6 @@ static const KCmdLineOptions options[] =
 
 int main( int argc, char **argv )
 {
-  setup_debug(Debug|Info|Warning|Error,"");
   KAboutData aboutData( rs_program_name, appName, version, description,
 	                KAboutData::License_BSD, copyright );
   aboutData.addAuthor( "Frerich Raabe", 0, "[email protected]" );

diff --git a/mon-kde.h → src/mon-kde.h b/mon-kde.h → src/mon-kde.h
diff --git a/monitor.cc → src/monitor.cc b/monitor.cc → src/monitor.cc
@@ -25,11 +25,11 @@
 #include "hostinfo.h"
 #include "statusview.h"
 
-#include <services/logging.h>
-#include <services/comm.h>
+#include <icecream/comm.h>
 
 #include <klocale.h>
 #include <kdebug.h>
+#include <iostream>
 
 #include <qsocketnotifier.h>
 #include <qtimer.h>

diff --git a/monitor.h → src/monitor.h b/monitor.h → src/monitor.h
diff --git a/starview.cc → src/starview.cc b/starview.cc → src/starview.cc
diff --git a/starview.h → src/starview.h b/starview.h → src/starview.h
diff --git a/statusview.cc → src/statusview.cc b/statusview.cc → src/statusview.cc
diff --git a/statusview.h → src/statusview.h b/statusview.h → src/statusview.h
diff --git a/summaryview.cc → src/summaryview.cc b/summaryview.cc → src/summaryview.cc
diff --git a/summaryview.h → src/summaryview.h b/summaryview.h → src/summaryview.h