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

List:       kde-commits
Subject:    kdeextragear-1/amarok/amarok
From:       Stanislav Karchebny <berk () upnet ! ru>
Date:       2004-01-31 19:20:01
Message-ID: 20040131192001.0D401993C () office ! kde ! org
[Download RAW message or body]

CVS commit by karchebny: 

* Fixed build issues (fixed build order)
  - works with both regular make and unsermake


  A            amarokcore/Makefile.am   1.1
  A            amarokcore/amarok.kcfg   1.1
  A            amarokcore/amarokconfig.kcfgc   1.1
  A            amarokcore/amarokdcophandler.cpp   1.1 [no copyright]
  A            amarokcore/amarokdcophandler.h   1.1 [no copyright]
  A            amarokcore/amarokdcopiface.h   1.1 [GPL (v2+)]
  A            amarokcore/main.cpp   1.1 [GPL (v2+)]
  M +11 -11    Makefile.am   1.45
  M +1 -1      analyzers/Makefile.am   1.13
  M +1 -1      analyzers/analyzerfactory.cpp   1.3
  M +1 -1      engine/artsengine.cpp   1.22
  R            amarok.kcfg   1.6
  R            amarokconfig.kcfgc   1.1
  R            amarokdcophandler.cpp   1.8
  R            amarokdcophandler.h   1.2
  R            amarokdcopiface.h   1.5
  R            main.cpp   1.25


--- kdeextragear-1/amarok/amarok/Makefile.am  #1.44:1.45
@@ -1,26 +1,26 @@
-kde_kcfg_DATA = amarok.kcfg
-
-SUBDIRS = images amarokarts analyzers titleproxy data engine
+SUBDIRS = amarokcore images amarokarts analyzers titleproxy data engine
 
 INCLUDES = \
         -I$(kde_includes)/arts \
         $(taglib_includes) \
-        $(all_includes)
+        $(all_includes) \
+        -I$(top_builddir)/amarok/amarokcore
 
 bin_PROGRAMS = amarok
 
 amarok_SOURCES = \
-        main.cpp browserwin.cpp streambrowser.cpp playlistwidget.cpp \
+        browserwin.cpp streambrowser.cpp playlistwidget.cpp \
         playlistitem.cpp playlistloader.cpp expandbutton.cpp effectwidget.cpp \
-        amarokdcopiface.skel amarokdcophandler.cpp amarokbutton.cpp amarokfilelist.cpp \
-        amarokconfig.kcfgc Options1.ui Options2.ui Options3.ui Options4.ui Options5.ui \
+        amarokbutton.cpp amarokfilelist.cpp \
+        Options1.ui Options2.ui Options3.ui Options4.ui Options5.ui \
         amarokslider.cpp amaroksystray.cpp osd.cpp filebrowser.cpp kactionselector.cpp \
         kbookmarkhandler.cpp fht.cpp playerapp.cpp playerwidget.cpp
 
 amarok_LDADD = \
-        $(top_builddir)/amarok/amarok/engine/libengine.a \
-        $(top_builddir)/amarok/amarok/titleproxy/libtitleproxy.a \
-        $(top_builddir)/amarok/amarok/analyzers/libanalyzers.a \
-        $(top_builddir)/amarok/amarok/amarokarts/libamarokarts.la \
+        $(top_builddir)/amarok/amarokcore/libamarokcore.a \
+        $(top_builddir)/amarok/engine/libengine.a \
+        $(top_builddir)/amarok/titleproxy/libtitleproxy.a \
+        $(top_builddir)/amarok/analyzers/libanalyzers.a \
+        $(top_builddir)/amarok/amarokarts/libamarokarts.la \
         -lqtmcop -lkmedia2_idl -lartsflow -lsoundserver_idl -lartskde \
         -lartsgui -lartsgui_kde -lartsmodules -lGL $(LIB_KUTILS) $(LIB_KFILE) \

--- kdeextragear-1/amarok/amarok/analyzers/Makefile.am  #1.12:1.13
@@ -1,3 +1,3 @@
-INCLUDES = $(all_includes)
+INCLUDES = $(all_includes) -I$(top_builddir)/amarok/amarokcore
 METASOURCES = AUTO
 noinst_LIBRARIES =  libanalyzers.a

--- kdeextragear-1/amarok/amarok/analyzers/analyzerfactory.cpp  #1.2:1.3
@@ -16,5 +16,5 @@
  ***************************************************************************/
 
-#include "../amarokconfig.h"
+#include "amarokconfig.h"
 #include "analyzerbase.h" //declaration here
 #include "baranalyzer.h"


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