[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/kioslave/media
From:       Dirk Mueller <mueller () kde ! org>
Date:       2005-07-23 0:10:23
Message-ID: 1122077423.385252.2916.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 437760 by mueller:

from the less-crap-in-makefiles-dept.


 M  +2 -13     configure.in.in  
 M  +2 -4      kcmodule/Makefile.am  
 M  +2 -0      kcmodule/managermodule.cpp  


--- trunk/KDE/kdebase/kioslave/media/configure.in.in #437759:437760
@@ -2,7 +2,7 @@
 
 AC_CHECK_HEADER(linux/cdrom.h,
 [
-  AC_DEFINE(COMPILE_LINUXCDPOLLING, , [media linux cd polling compilation])
+  AC_DEFINE_UNQUITED([COMPILE_LINUXCDPOLLING], 1, [media linux cd polling compilation])
   LINUXCDPOLLING=yes
   AC_SUBST(LINUXCDPOLLING)
 ])
@@ -140,7 +140,7 @@
 
 HALBACKEND=no
 if [test "x$hal" = "xFOUND"] && [test "x$dbus" = "xFOUND"] && [test "x$dbusqt" = "xFOUND"] ; then
-  AC_DEFINE(COMPILE_HALBACKEND, , [media HAL backend compilation])
+  AC_DEFINE_UNQUOTED([COMPILE_HALBACKEND],1, [media HAL backend compilation])
   HALBACKEND=yes
   AC_SUBST(HALBACKEND)
   AC_MSG_RESULT(yes)
@@ -150,14 +150,3 @@
 
 AM_CONDITIONAL(include_media_linuxcdpolling, test "$LINUXCDPOLLING" = "yes")
 AM_CONDITIONAL(include_media_halbackend, test "$HALBACKEND" = yes)
-
-MEDIA_CPPFLAGS=
-if test "$LINUXCDPOLLING" = "yes"; then
-MEDIA_CPPFLAGS="$MEDIA_CPPFLAGS -DCOMPILE_LINUXCDPOLLING"
-fi
-if test "$HALBACKEND" = yes; then
-MEDIA_CPPFLAGS="$MEDIA_CPPFLAGS -DCOMPILE_HALBACKEND"
-fi
-
-AC_SUBST(MEDIA_CPPFLAGS)
-
--- trunk/KDE/kdebase/kioslave/media/kcmodule/Makefile.am #437759:437760
@@ -1,8 +1,6 @@
 INCLUDES = -I$(srcdir)/../libmediacommon -I../libmediacommon $(all_includes)
 METASOURCES = AUTO
 
-AM_CPPFLAGS = $(MEDIA_CPPFLAGS)
-
 kde_module_LTLIBRARIES = kcm_media.la
 kcm_media_la_SOURCES = notifiermodule.cpp notifiermoduleview.ui \
                        serviceconfigdialog.cpp serviceview.ui \
@@ -10,8 +8,8 @@
                        managermodule.cpp managermoduleview.ui \
                        main.cpp
 
-kcm_media_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
-kcm_media_la_LIBADD = ../libmediacommon/libmediacommon.la $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
+kcm_media_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+kcm_media_la_LIBADD = ../libmediacommon/libmediacommon.la $(LIB_KIO)
 
 noinst_HEADERS = notifiermodule.h managermodule.h \
                  serviceconfigdialog.h mimetypelistboxitem.h \
--- trunk/KDE/kdebase/kioslave/media/kcmodule/managermodule.cpp #437759:437760
@@ -16,6 +16,8 @@
    Boston, MA 02110-1301, USA.
 */
 
+#include <config.h>
+
 #include "managermodule.h"
 
 #include <klocale.h>
[prev in list] [next in list] [prev in thread] [next in thread]