3 files changed, 20 insertions, 23 deletions
diff --git a/tdeioslave/media/mediamanager/CMakeLists.txt b/tdeioslave/media/mediamanager/CMakeLists.txt
index 5a73f3708..21faaeaf7 100644
--- a/tdeioslave/media/mediamanager/CMakeLists.txt
+++ b/tdeioslave/media/mediamanager/CMakeLists.txt
@@ -36,30 +36,21 @@ install( FILES mediamanager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
 set( target kded_mediamanager )
 
 if( WITH_HAL )
-  set( ${target}_SRCS
-    mediamanager.cpp mediamanager.skel medialist.cpp
-    backendbase.cpp fstabbackend.cpp removablebackend.cpp
-    mediadirnotify.cpp mediadirnotify.skel
-    decryptdialog.ui dialog.cpp
-    halbackend.cpp linuxcdpolling.cpp tdehardwarebackend.cpp
-  )
+  set( HAL_MEDIA_BACKEND halbackend.cpp linuxcdpolling.cpp )
+  set( HAL_MEDIA_LIBRARIES ${HAL_LIBRARIES} -lhal-storage ${DBUS_TQT_LIBRARIES} )
+endif( )
 
-  tde_add_kpart( ${target} AUTOMOC
-    SOURCES ${${target}_SRCS}
-    LINK mediacommon-static tdeinit_kded-shared ${HAL_LIBRARIES} -lhal-storage ${DBUS_TQT_LIBRARIES}
-    DESTINATION ${PLUGIN_INSTALL_DIR}
-  )
-else( )
-  set( ${target}_SRCS
+if( WITH_TDEHWLIB )
+  set( TDEHWBACKEND tdehardwarebackend.cpp )
+endif( WITH_TDEHWLIB )
+
+tde_add_kpart( ${target} AUTOMOC
+  SOURCES
     mediamanager.cpp mediamanager.skel medialist.cpp
     backendbase.cpp fstabbackend.cpp removablebackend.cpp
     decryptdialog.ui dialog.cpp
-    mediadirnotify.cpp mediadirnotify.skel tdehardwarebackend.cpp
-  )
-
-  tde_add_kpart( ${target} AUTOMOC
-    SOURCES ${${target}_SRCS}
-    LINK mediacommon-static tdeinit_kded-shared
-    DESTINATION ${PLUGIN_INSTALL_DIR}
-  )
-endif( )
+    mediadirnotify.cpp mediadirnotify.skel
+    ${HAL_MEDIA_BACKEND} ${TDEHWBACKEND}
+  LINK mediacommon-static tdeinit_kded-shared ${HAL_MEDIA_LIBRARIES}
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
diff --git a/tdeioslave/media/medianotifier/notificationdialog.cpp b/tdeioslave/media/medianotifier/notificationdialog.cpp
index c9a920f99..7e4004e8c 100644
--- a/tdeioslave/media/medianotifier/notificationdialog.cpp
+++ b/tdeioslave/media/medianotifier/notificationdialog.cpp
@@ -28,7 +28,9 @@
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqpushbutton.h>
+#ifdef __TDE_HAVE_TDEHWLIB
 #include <tdehardwaredevices.h>
+#endif
 
 #include "actionlistboxitem.h"
 #include "notificationdialogview.h"
diff --git a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
index 5357bc68d..3f0319f9f 100644
--- a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
+++ b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
@@ -33,7 +33,9 @@
 #include <kprocess.h>
 #include <tdestartupinfo.h>
 #include <kmimetype.h>
+#ifdef __TDE_HAVE_TDEHWLIB
 #include <tdehardwaredevices.h>
+#endif
 
 #include "dialog.h"
 #include "tdeio_media_mounthelper.h"
@@ -187,6 +189,7 @@ MountHelper::MountHelper() : TDEApplication()
 
 void MountHelper::invokeEject(const TQString &device, bool quiet)
 {
+#ifdef __TDE_HAVE_TDEHWLIB
 	// Try TDE HW library eject first...
 	TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();
 	TDEGenericDevice *hwdevice = hwdevices->findByDeviceNode(device);
@@ -197,6 +200,7 @@ void MountHelper::invokeEject(const TQString &device, bool quiet)
 			::exit(0);
 		}
 	}
+#endif
 
 	// Then fall back to tdeeject if needed
 	TDEProcess *proc = new TDEProcess(TQT_TQOBJECT(this));