LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File udisks2-makefile.patch of Package kdebase3 (Project openSUSE:Factory)

diff -wruN kdebase-3.5.10.orig/kioslave/media/mediamanager/Makefile.am kdebase-3.5.10/kioslave/media/mediamanager/Makefile.am
--- kdebase-3.5.10.orig/kioslave/media/mediamanager/Makefile.am	2005-09-10 12:25:36.000000000 +0400
+++ kdebase-3.5.10/kioslave/media/mediamanager/Makefile.am	2012-06-01 04:36:13.045367760 +0400
@@ -22,7 +22,7 @@
 
 noinst_LTLIBRARIES = $(LINUXCDPOLLING_LIB) $(HALBACKEND_LIB)
 
-kded_mediamanager_la_SOURCES = mediamanager.cpp mediamanager.skel medialist.cpp backendbase.cpp fstabbackend.cpp removablebackend.cpp mediadirnotify.cpp mediadirnotify.skel
+kded_mediamanager_la_SOURCES = mediamanager.cpp mediamanager.skel medialist.cpp backendbase.cpp fstabbackend.cpp removablebackend.cpp mediadirnotify.cpp mediadirnotify.skel udisks2backend.cpp
 kded_mediamanager_la_LDFLAGS = $(all_libraries) -module -avoid-version
 kded_mediamanager_la_LIBADD = $(LIB_KSYCOCA) ../libmediacommon/libmediacommon.la $(HALBACKEND_LIB) $(LINUXCDPOLLING_LIB)
 
diff -wruN kdebase-3.5.10.orig/kioslave/media/mediamanager/Makefile.in kdebase-3.5.10/kioslave/media/mediamanager/Makefile.in
--- kdebase-3.5.10.orig/kioslave/media/mediamanager/Makefile.in	2008-08-20 20:01:47.000000000 +0400
+++ kdebase-3.5.10/kioslave/media/mediamanager/Makefile.in	2012-06-01 04:51:12.110384379 +0400
@@ -60,13 +60,13 @@
 	../libmediacommon/libmediacommon.la $(HALBACKEND_LIB) \
 	$(LINUXCDPOLLING_LIB)
 am_kded_mediamanager_la_OBJECTS = mediamanager.lo medialist.lo \
-	backendbase.lo fstabbackend.lo removablebackend.lo \
+	backendbase.lo fstabbackend.lo udisks2backend.lo removablebackend.lo \
 	mediadirnotify.lo
 #>- kded_mediamanager_la_OBJECTS = $(am_kded_mediamanager_la_OBJECTS)
 #>+ 6
 kded_mediamanager_la_final_OBJECTS = kded_mediamanager_la.all_cpp.lo 
 kded_mediamanager_la_nofinal_OBJECTS = mediamanager.lo medialist.lo \
-	backendbase.lo fstabbackend.lo removablebackend.lo \
+	backendbase.lo fstabbackend.lo udisks2backend.lo removablebackend.lo \
 	mediadirnotify.lo mediamanager_skel.lo mediadirnotify_skel.lo
 @KDE_USE_FINAL_FALSE@kded_mediamanager_la_OBJECTS = $(kded_mediamanager_la_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@kded_mediamanager_la_OBJECTS = $(kded_mediamanager_la_final_OBJECTS)
@@ -508,9 +508,9 @@
 @include_media_linuxcdpolling_TRUE@liblinuxcdpolling_la_SOURCES = linuxcdpolling.cpp
 @include_media_linuxcdpolling_TRUE@liblinuxcdpolling_la_LDFLAGS = -avoid-version $(all_libraries) -no-undefined
 noinst_LTLIBRARIES = $(LINUXCDPOLLING_LIB) $(HALBACKEND_LIB)
-#>- kded_mediamanager_la_SOURCES = mediamanager.cpp mediamanager.skel medialist.cpp backendbase.cpp fstabbackend.cpp removablebackend.cpp mediadirnotify.cpp mediadirnotify.skel
+#>- kded_mediamanager_la_SOURCES = mediamanager.cpp mediamanager.skel medialist.cpp backendbase.cpp fstabbackend.cpp udisks2backend.cpp removablebackend.cpp mediadirnotify.cpp mediadirnotify.skel
 #>+ 1
-kded_mediamanager_la_SOURCES=mediamanager.cpp  medialist.cpp backendbase.cpp fstabbackend.cpp removablebackend.cpp mediadirnotify.cpp  mediamanager_skel.cpp mediadirnotify_skel.cpp
+kded_mediamanager_la_SOURCES=mediamanager.cpp  medialist.cpp backendbase.cpp fstabbackend.cpp udisks2backend.cpp removablebackend.cpp mediadirnotify.cpp  mediamanager_skel.cpp mediadirnotify_skel.cpp
 kded_mediamanager_la_LDFLAGS = $(all_libraries) -module -avoid-version
 kded_mediamanager_la_LIBADD = $(LIB_KSYCOCA) ../libmediacommon/libmediacommon.la $(HALBACKEND_LIB) $(LINUXCDPOLLING_LIB)
 servicesdir = $(kde_servicesdir)/kded
@@ -891,6 +891,13 @@
 mocs: fstabbackend.moc
 
 #>+ 3
+udisks2backend.moc: $(srcdir)/udisks2backend.h
+	$(MOC) $(srcdir)/udisks2backend.h -o udisks2backend.moc
+
+#>+ 2
+mocs: udisks2backend.moc
+
+#>+ 3
 halbackend.moc: $(srcdir)/halbackend.h
 	$(MOC) $(srcdir)/halbackend.h -o halbackend.moc
 
@@ -913,10 +920,10 @@
 
 #>+ 3
 clean-metasources:
-	-rm -f  removablebackend.moc mediamanager.moc fstabbackend.moc halbackend.moc linuxcdpolling.moc medialist.moc
+	-rm -f  removablebackend.moc mediamanager.moc fstabbackend.moc udisks2backend.moc halbackend.moc linuxcdpolling.moc medialist.moc
 
 #>+ 2
-KDE_DIST=fstabbackend.h mediadirnotify.h linuxcdpolling.h removablebackend.h Makefile.in halbackend.h mediamanager.desktop mediamanager.h backendbase.h medialist.h Makefile.am 
+KDE_DIST=fstabbackend.h udisks2backend.h mediadirnotify.h linuxcdpolling.h removablebackend.h Makefile.in halbackend.h mediamanager.desktop mediamanager.h backendbase.h medialist.h Makefile.am 
 
 #>+ 5
 clean-idl:
@@ -966,11 +973,11 @@
 
 
 #>+ 11
-kded_mediamanager_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/mediamanager.cpp $(srcdir)/medialist.cpp $(srcdir)/backendbase.cpp $(srcdir)/fstabbackend.cpp $(srcdir)/removablebackend.cpp $(srcdir)/mediadirnotify.cpp mediamanager_skel.cpp mediadirnotify_skel.cpp  removablebackend.moc mediamanager.moc fstabbackend.moc medialist.moc
+kded_mediamanager_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/mediamanager.cpp $(srcdir)/medialist.cpp $(srcdir)/backendbase.cpp $(srcdir)/fstabbackend.cpp $(srcdir)/udisks2backend.cpp $(srcdir)/removablebackend.cpp $(srcdir)/mediadirnotify.cpp mediamanager_skel.cpp mediadirnotify_skel.cpp  removablebackend.moc mediamanager.moc fstabbackend.moc udisks2backend.cpp medialist.moc
 	@echo 'creating kded_mediamanager_la.all_cpp.cpp ...'; \
 	rm -f kded_mediamanager_la.all_cpp.files kded_mediamanager_la.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> kded_mediamanager_la.all_cpp.final; \
-	for file in mediamanager.cpp medialist.cpp backendbase.cpp fstabbackend.cpp removablebackend.cpp mediadirnotify.cpp mediamanager_skel.cpp mediadirnotify_skel.cpp ; do \
+	for file in mediamanager.cpp medialist.cpp backendbase.cpp fstabbackend.cpp udisks2backend.cpp removablebackend.cpp mediadirnotify.cpp mediamanager_skel.cpp mediadirnotify_skel.cpp ; do \
 	  echo "#include \"$$file\"" >> kded_mediamanager_la.all_cpp.files; \
 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kded_mediamanager_la.all_cpp.final; \
 	done; \
@@ -1003,6 +1010,7 @@
 
 #>+ 15
 fstabbackend.o: fstabbackend.moc 
+udisks2backend.o: udisks2backend.moc
 medialist.o: medialist.moc 
 halbackend.lo: halbackend.moc 
 linuxcdpolling.o: linuxcdpolling.moc 
@@ -1012,6 +1020,7 @@
 nmcheck-am: nmcheck
 removablebackend.lo: removablebackend.moc 
 fstabbackend.lo: fstabbackend.moc 
+udisks2backend.lo: udisks2backend.moc
 halbackend.o: halbackend.moc 
 medialist.lo: medialist.moc 
 removablebackend.o: removablebackend.moc