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

List:       kde-commits
Subject:    kdemultimedia/noatun/library
From:       Stephan Kulow <coolo () kde ! org>
Date:       2004-10-06 11:03:15
Message-ID: 20041006110315.9542F126EF () office ! kde ! org
[Download RAW message or body]

CVS commit by coolo: 

creating moc files by a dummy library in a subdir is so damn much wasting time
- ah, and dependencies are missing for non-recursive make


  M +2 -2      Makefile.am   1.83
  M +1 -1      app.cpp   1.33
  M +1 -1      controls.cpp   1.6
  M +1 -1      downloader.cpp   1.23
  M +1 -1      effects.cpp   1.30
  M +2 -2      engine.cpp   1.97
  M +1 -1      equalizer.cpp   1.23
  M +1 -1      noatunstdaction.cpp   1.21
  M +1 -1      player.cpp   1.87
  M +1 -1      playlist.cpp   1.21
  M +1 -1      plugin.cpp   1.48
  M +1 -1      pref.cpp   1.9
  M +1 -1      scrollinglabel.cpp   1.5
  M +1 -1      stereobuttonaction.cpp   1.3
  M +1 -1      vequalizer.cpp   1.9
  M +1 -1      video.cpp   1.10
  M +0 -6      noatun/Makefile.am   1.9


--- kdemultimedia/noatun/library/Makefile.am  #1.82:1.83
@@ -8,5 +8,5 @@
          $(all_includes)
 
-SUBDIRS= noatun noatunarts . noatuntags
+SUBDIRS= noatunarts . noatuntags noatun
 
 lib_LTLIBRARIES = libnoatun.la libnoatuncontrols.la
@@ -38,5 +38,5 @@
 
 METASOURCES = AUTO
-
+META_INCLUDES = $(srcdir)/noatun
 
 noinst_PROGRAMS = gentable

--- kdemultimedia/noatun/library/app.cpp  #1.32:1.33
@@ -538,3 +538,3 @@ void NoatunApp::saveEngineState()
 }
 
-#include <noatun/app.moc>
+#include "app.moc"

--- kdemultimedia/noatun/library/controls.cpp  #1.5:1.6
@@ -112,3 +112,3 @@ void SliderAction::unplug( QWidget *w )
 }
 
-#include "noatun/controls.moc"
+#include "controls.moc"

--- kdemultimedia/noatun/library/downloader.cpp  #1.22:1.23
@@ -232,4 +232,4 @@ void Downloader::percent( KIO::Job *, un
 }
 
-#include "noatun/downloader.moc"
+#include "downloader.moc"
 

--- kdemultimedia/noatun/library/effects.cpp  #1.29:1.30
@@ -282,3 +282,3 @@ QPtrList<Effect> Effects::effects() cons
 #undef engine
 
-#include "noatun/effects.moc"
+#include "effects.moc"

--- kdemultimedia/noatun/library/engine.cpp  #1.96:1.97
@@ -559,4 +559,4 @@ bool Engine::initArts()
 
 
-#include "noatun/engine.moc"
+#include "engine.moc"
 

--- kdemultimedia/noatun/library/equalizer.cpp  #1.22:1.23
@@ -336,4 +336,4 @@ void Equalizer::enableUpdates(bool)
 #undef EQBACK
 
-#include "noatun/equalizer.moc"
+#include "equalizer.moc"
 

--- kdemultimedia/noatun/library/noatunstdaction.cpp  #1.20:1.21
@@ -359,3 +359,3 @@ void ContextMenu::showContextMenu()
 } // END namespace NoatunStdAction
 
-#include "noatun/stdaction.moc"
+#include "stdaction.moc"

--- kdemultimedia/noatun/library/player.cpp  #1.86:1.87
@@ -338,3 +338,3 @@ void Player::aboutToPlay()
 }
 
-#include "noatun/player.moc"
+#include "player.moc"

--- kdemultimedia/noatun/library/playlist.cpp  #1.20:1.21
@@ -439,4 +439,4 @@ PlaylistNotifier::~PlaylistNotifier()
 
 
-#include "noatun/playlist.moc"
+#include "playlist.moc"
 

--- kdemultimedia/noatun/library/plugin.cpp  #1.47:1.48
@@ -575,4 +575,4 @@ SessionManagement::~SessionManagement() 
 void SessionManagement::restore() { }
 
-#include "noatun/plugin.moc"
+#include "plugin.moc"
 #include "plugin_deps.moc"

--- kdemultimedia/noatun/library/pref.cpp  #1.8:1.9
@@ -93,3 +93,3 @@ void CModule::ownerDeleted()
 }
 
-#include <noatun/pref.moc>
+#include "pref.moc"

--- kdemultimedia/noatun/library/scrollinglabel.cpp  #1.4:1.5
@@ -191,5 +191,5 @@ ScrollingLabel::setScroll(bool b)
 }
 
-#include "noatun/scrollinglabel.moc"
+#include "scrollinglabel.moc"
 
 // vim:ts=2:sw=2:tw=78:noet

--- kdemultimedia/noatun/library/stereobuttonaction.cpp  #1.2:1.3
@@ -45,3 +45,3 @@ void StereoButtonAction::toggleEnabled(v
 }
 
-#include "noatun/stereobuttonaction.moc"
+#include "stereobuttonaction.moc"

--- kdemultimedia/noatun/library/vequalizer.cpp  #1.8:1.9
@@ -933,4 +933,4 @@ void VPreset::remove()
 #undef EQBACK
 
-#include "noatun/vequalizer.moc"
+#include "vequalizer.moc"
 

--- kdemultimedia/noatun/library/video.cpp  #1.9:1.10
@@ -159,4 +159,4 @@ void GlobalVideo::mouseReleaseEvent(QMou
 
 #include "globalvideo.moc"
-#include "noatun/video.moc"
+#include "video.moc"
 

--- kdemultimedia/noatun/library/noatun/Makefile.am  #1.8:1.9
@@ -1,6 +1,2 @@
-INCLUDES = -I$(top_srcdir)/noatun/library $(all_includes)
-noinst_LTLIBRARIES = libdummy.la
-
-libdummy_la_SOURCES = mocs.cpp
 
 noatuninclude_HEADERS = \
@@ -13,4 +9,2 @@
 noatunincludedir = $(includedir)/noatun
 
-METASOURCES = AUTO
-


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