trying to be good guys

svn path=/trunk/kdenonbeta/icecream/icecream/mon/; revision=315686

Makefile.am

@@ -1,29 +1,27 @@
 
-INCLUDES = -I$(KDEDIR)/include -I$(QTDIR)/include -I$(srcdir)/..
+INCLUDES = -I$(srcdir)/.. $(all_includes)
 
 bin_PROGRAMS = icemon
 icemon_SOURCES = mon-kde.cc statusview.cc listview.cc ganttstatusview.cc \
                  summaryview.cc starview.cc job.cc hostinfo.cc hostview.cc \
                  monitor.cc
 icemon_LDADD = ../services/libcommon.la -lkdeui
-icemon_LDFLAGS = -L$(KDEDIR)/lib -L$(QTDIR)/lib
+icemon_LDFLAGS = $(all_libraries)
 
 METASOURCES = AUTO
 
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)${KDEDIR}/share/apps/icemon
-	$(mkinstalldirs) $(DESTDIR)${KDEDIR}/share/apps/icemon/pics
-	$(INSTALL_DATA) $(srcdir)/icemonui.rc $(DESTDIR)${KDEDIR}/share/apps/icemon
-	$(INSTALL_DATA) $(srcdir)/icemonnode.png $(DESTDIR)${KDEDIR}/share/apps/icemon/pics
+icedata_DATA = icemonui.rc
+icedatadir = $(kde_appsdir)/icemon
 
-kde_moduledir = $(KDEDIR)/lib/kde3
+picsdir = $(kde_appsdir)/icemon/pics
+pics_DATA = icemonnode.png
 
 kde_module_LTLIBRARIES = icemon_panelapplet.la
 
-icemon_panelapplet_la_LDFLAGS = -module -L$(KDEDIR)/lib -L$(QTDIR)/lib
+icemon_panelapplet_la_LDFLAGS = -module $(all_libraries)
 icemon_panelapplet_la_LIBADD = ../services/libcommon.la -lkdeui
 icemon_panelapplet_la_SOURCES = job.cc icemonapplet.cpp monitor.cc hostinfo.cc \
                                 statusview.cc hostview.cc 
 
-lnkdir = $(KDEDIR)/share/apps/kicker/applets
+lnkdir = $(kde_appsdir)/kicker/applets
 lnk_DATA = icemonapplet.desktop

configure.in.in

@@ -0,0 +1,2 @@
+AC_PATH_KDE
+