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

List:       kde-commits
Subject:    arts
From:       Stephan Kulow <coolo () kde ! org>
Date:       2004-11-18 12:02:16
Message-ID: 20041118120216.68A8316E65 () office ! kde ! org
[Download RAW message or body]

CVS commit by coolo: 

builddir!=srcdir fixes


  M +1 -1      artsc/Makefile.am   1.15
  M +1 -1      flow/Makefile.am   1.78
  M +1 -1      flow/gsl/Makefile.am   1.35
  M +1 -1      flow/gslpp/Makefile.am   1.2
  M +1 -1      gmcop/Makefile.am   1.7
  M +1 -1      mcop_mt/Makefile.am   1.11
  M +1 -1      mcopidl/Makefile.am   1.21
  M +1 -1      qtmcop/Makefile.am   1.17
  M +2 -2      soundserver/Makefile.am   1.71
  M +1 -1      x11/Makefile.am   1.17


--- arts/artsc/Makefile.am  #1.14:1.15
@@ -3,5 +3,5 @@
 FLOWLIBS = $(top_builddir)/flow/libartsflow.la
 
-INCLUDES = -I$(top_srcdir)/mcop -I$(top_srcdir)/flow \
+INCLUDES = -I$(top_srcdir)/mcop -I$(top_builddir)/mcop -I$(top_srcdir)/flow \
       -I$(top_builddir)/flow -I$(top_builddir)/soundserver \
       -I$(top_srcdir)/libltdl $(all_includes)

--- arts/flow/Makefile.am  #1.77:1.78
@@ -1,5 +1,5 @@
 
 SUBDIRS = mcopclass gsl gslpp
-INCLUDES = -I$(top_srcdir)/mcop $(all_includes)
+INCLUDES = -I$(top_srcdir)/mcop -I$(top_builddir)/mcop $(all_includes)
 AM_CXXFLAGS = $(MAS_CFLAGS) $(JACK_CFLAGS)
 

--- arts/flow/gsl/Makefile.am  #1.34:1.35
@@ -7,5 +7,5 @@
 include gslmakefile.inc
 
-INCLUDES = -I$(top_srcdir)/flow -I$(top_builddir)/flow -I$(top_srcdir)/mcop \
-I$(top_builddir) $(all_includes) +INCLUDES = -I$(top_srcdir)/flow \
-I$(top_builddir)/flow -I$(top_srcdir)/mcop -I$(top_builddir)/mcop -I$(top_builddir) \
$(all_includes)  AM_CFLAGS = $(GSL_CFLAGS)
 

--- arts/flow/gslpp/Makefile.am  #1.1:1.2
@@ -1,3 +1,3 @@
-INCLUDES = -I$(top_srcdir)/flow -I$(top_srcdir)/flow/gsl -I$(top_builddir)/flow \
-I$(top_srcdir)/mcop -I$(top_builddir) $(all_includes) +INCLUDES = \
-I$(top_srcdir)/flow -I$(top_srcdir)/flow/gsl -I$(top_builddir)/flow \
-I$(top_srcdir)/mcop -I$(top_builddir)/mcop -I$(top_builddir) $(all_includes)  
 noinst_LTLIBRARIES = libgslpp.la

--- arts/gmcop/Makefile.am  #1.6:1.7
@@ -1,5 +1,5 @@
 lib_LTLIBRARIES = libgmcop.la
 
-INCLUDES = -I$(top_srcdir)/mcop $(GLIB_CFLAGS) $(all_includes)
+INCLUDES = -I$(top_srcdir)/mcop -I$(top_builddir)/mcop $(GLIB_CFLAGS) \
$(all_includes)  
 libgmcop_la_SOURCES = giomanager.cc

--- arts/mcop_mt/Makefile.am  #1.10:1.11
@@ -1,3 +1,3 @@
-INCLUDES = -I$(top_srcdir)/mcop -I$(top_srcdir)/flow -I$(top_builddir)/flow \
$(all_includes) +INCLUDES = -I$(top_srcdir)/mcop -I$(top_builddir)/mcop \
-I$(top_srcdir)/flow -I$(top_builddir)/flow $(all_includes)  
 lib_LTLIBRARIES = libmcop_mt.la

--- arts/mcopidl/Makefile.am  #1.20:1.21
@@ -1,4 +1,4 @@
 KDE_CXXFLAGS = $(NOOPT_CXXFLAGS) 
-INCLUDES = -I$(top_srcdir)/mcop $(all_includes)
+INCLUDES = -I$(top_srcdir)/mcop -I$(top_builddir)/mcop $(all_includes)
 ####### Files
 

--- arts/qtmcop/Makefile.am  #1.16:1.17
@@ -1,5 +1,5 @@
 lib_LTLIBRARIES = libqtmcop.la
 
-INCLUDES = -I$(top_srcdir)/mcop $(all_includes) $(QT_INCLUDES)
+INCLUDES = -I$(top_srcdir)/mcop -I$(top_builddir)/mcop $(all_includes) \
$(QT_INCLUDES)  KDE_OPTIONS = qtonly
 

--- arts/soundserver/Makefile.am  #1.70:1.71
@@ -4,5 +4,5 @@
 artsdpath = $(bindir)/artsd
 
-INCLUDES = -I$(top_srcdir)/mcop -I$(top_srcdir)/flow \
+INCLUDES = -I$(top_srcdir)/mcop -I$(top_builddir)/mcop -I$(top_srcdir)/flow \
    -I$(top_builddir)/flow -DEXECUTE=\"$(artsdpath)\" $(all_includes)
 MCOPINC   = -I$(srcdir) -I$(top_srcdir)/flow -I$(top_srcdir)/mcop

--- arts/x11/Makefile.am  #1.16:1.17
@@ -1,3 +1,3 @@
-INCLUDES = -I$(top_srcdir)/mcop $(all_includes)
+INCLUDES = -I$(top_srcdir)/mcop -I$(top_builddir)/mcop $(all_includes)
 
 lib_LTLIBRARIES = libx11globalcomm.la


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