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

List:       kde-commits
Subject:    kdeextragear-1
From:       David Faure <faure () kde ! org>
Date:       2004-11-23 12:11:39
Message-ID: 20041123121139.782D317148 () office ! kde ! org
[Download RAW message or body]

CVS commit by faure: 

$(all_includes) must be after local includes


  M +0 -2      cdbakeoven/cdbosettings/Makefile.am   1.20
  M +1 -1      cdbakeoven/cdboshared/Makefile.am   1.8
  M +1 -1      cdbakeoven/cdboviews/cdboviewparts/Makefile.am   1.6
  M +1 -1      gwenview/gvdirpart/Makefile.am   1.6
  M +1 -1      gwenview/gvimagepart/Makefile.am   1.4
  M +1 -1      gwenview/gwenviewapp/Makefile.am   1.8
  M +1 -1      gwenview/src/Makefile.am   1.52


--- kdeextragear-1/cdbakeoven/cdbosettings/Makefile.am  #1.19:1.20
@@ -13,6 +13,4 @@
 libkcm_cdbosettings_la_LDFLAGS  = $(all_libraries) -module $(KDE_PLUGIN)
 
-KDE_ICON = cdrom_unmount
-
 apps_DATA = cdbocdromdevices.desktop cdboburnopt.desktop cdboaudioopt.desktop \
         cdboisoopt.desktop cdbodefaultopt.desktop

--- kdeextragear-1/cdbakeoven/cdboshared/Makefile.am  #1.7:1.8
@@ -1,4 +1,4 @@
 
-INCLUDES = $(all_includes) -I$(srcdir)/../cdbowidgets
+INCLUDES = -I$(srcdir)/../cdbowidgets $(all_includes)
 
 METASOURCES = AUTO

--- kdeextragear-1/cdbakeoven/cdboviews/cdboviewparts/Makefile.am  #1.5:1.6
@@ -1,4 +1,4 @@
 
-INCLUDES= -I$(srcdir)/../../cdbowidgets -I$(srcdir)/../../cdboshared $(all_includes) \
-I$(srcdir)/../../cdbodialogs  +INCLUDES= -I$(srcdir)/../../cdbowidgets \
-I$(srcdir)/../../cdboshared -I$(srcdir)/../../cdbodialogs $(all_includes)  
         

--- kdeextragear-1/gwenview/gvdirpart/Makefile.am  #1.5:1.6
@@ -1,3 +1,3 @@
-INCLUDES = $(all_includes) -I$(srcdir)/..
+INCLUDES = -I$(srcdir)/.. $(all_includes)
 
 # These are not really libraries, but modules dynamically opened.

--- kdeextragear-1/gwenview/gvimagepart/Makefile.am  #1.3:1.4
@@ -1,3 +1,3 @@
-INCLUDES = $(all_includes) -I$(srcdir)/..
+INCLUDES = -I$(srcdir)/.. $(all_includes)
 
 # These are not really libraries, but modules dynamically opened.

--- kdeextragear-1/gwenview/gwenviewapp/Makefile.am  #1.7:1.8
@@ -27,5 +27,5 @@
 
 # set the include path for X, qt and KDE
-INCLUDES = $(all_includes) -I$(srcdir)/..
+INCLUDES = -I$(srcdir)/.. $(all_includes)
 
 METASOURCES = AUTO

--- kdeextragear-1/gwenview/src/Makefile.am  #1.51:1.52
@@ -1,3 +1,3 @@
-AM_CPPFLAGS = $(all_includes) -I$(srcdir)/.. -D_LARGEFILE64_SOURCE
+AM_CPPFLAGS = -I$(srcdir)/.. $(all_includes) -D_LARGEFILE64_SOURCE
 
 lib_LTLIBRARIES = libgwenviewcore.la


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