[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:46:56
Message-ID: 20040131194656.35F739922 () office ! kde ! org
[Download RAW message or body]

CVS commit by karchebny: 

* Fix fixed build =)


  M +6 -6      Makefile.am   1.46
  M +0 -2      amarokarts/Makefile.am   1.14
  M +1 -1      amarokcore/Makefile.am   1.2


--- kdeextragear-1/amarok/amarok/Makefile.am  #1.45:1.46
@@ -5,5 +5,5 @@
         $(taglib_includes) \
         $(all_includes) \
-        -I$(top_builddir)/amarok/amarokcore
+        -I$(top_builddir)/amarok/amarok/amarokcore
 
 bin_PROGRAMS = amarok
@@ -18,9 +18,9 @@
 
 amarok_LDADD = \
-        $(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 \
+        $(top_builddir)/amarok/amarok/amarokcore/libamarokcore.a \
+        $(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 \
         -lqtmcop -lkmedia2_idl -lartsflow -lsoundserver_idl -lartskde \
         -lartsgui -lartsgui_kde -lartsmodules -lGL $(LIB_KUTILS) $(LIB_KFILE) \

--- kdeextragear-1/amarok/amarok/amarokarts/Makefile.am  #1.13:1.14
@@ -3,6 +3,4 @@
 METASOURCES = AUTO
 
-libamarokarts_la_COMPILE_FIRST = $(top_builddir)/amarok/amarokconfig.h
-
 lib_LTLIBRARIES = libamarokarts.la
 

--- kdeextragear-1/amarok/amarok/amarokcore/Makefile.am  #1.1:1.2
@@ -1,4 +1,4 @@
 
-INCLUDES = $(all_includes) -I$(top_srcdir)/amarok
+INCLUDES = $(all_includes) -I$(top_srcdir)/amarok/amarok
 noinst_LIBRARIES =  libamarokcore.a
 noinst_HEADERS = amarokconfig.h amarokdcophandler.h


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