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

List:       kde-devel
Subject:    Re: [PATCH trunk/kdebase -- try 2] Fix kicker INCLUDE paths
From:       "Joshua J. Berry" <des () condordes ! net>
Date:       2006-03-05 23:51:26
Message-ID: 440B797E.2010007 () condordes ! net
[Download RAW message or body]

[Attachment #2 (multipart/signed)]

[Attachment #4 (multipart/mixed)]


Joshua J. Berry wrote:
> When Kicker was moved into workspace/, some of the INCLUDE paths in various
> "Makefile.am"s were not updated.  This patch fixes those paths so Kicker can
> build again.


> Index: workspace/kicker/taskmanager/Makefile.am
> ===================================================================
> --- workspace/kicker/taskmanager/Makefile.am	(revision 516021)
> +++ workspace/kicker/taskmanager/Makefile.am	(working copy)
> @@ -1,4 +1,4 @@
> -INCLUDES = $(all_includes) -I$(srcdir)/../libkicker
> +INCLUDES = $(all_includes) -I$(srcdir)/../libkicker -I$(builddir)/../libkicker

Whups, this should be "-I../libkicker" instead.  Don't know how that
$(builddir) got in there.  (I had an automake brain-fart, apparently ... I'm
surprised I didn't catch that.)

New patch is attached.  Please apply this one instead.

-- Josh

-- 
Joshua J. Berry

"I haven't lost my mind -- it's backed up on tape somewhere."
    -- /usr/games/fortune

["kicker-build-errors.patch" (text/plain)]

Index: workspace/kicker/taskbar/Makefile.am
===================================================================
--- workspace/kicker/taskbar/Makefile.am	(revision 516021)
+++ workspace/kicker/taskbar/Makefile.am	(working copy)
@@ -1,4 +1,4 @@
-INCLUDES = -I$(srcdir)/../taskmanager -I$(srcdir)/../libkicker \
-I$(top_builddir)/kicker/libkicker $(all_includes) +INCLUDES = \
-I$(srcdir)/../taskmanager -I$(srcdir)/../libkicker -I../libkicker $(all_includes)  
 # KDE 4: rename to libkickertaskbar.la!
 
Index: workspace/kicker/taskmanager/Makefile.am
===================================================================
--- workspace/kicker/taskmanager/Makefile.am	(revision 516021)
+++ workspace/kicker/taskmanager/Makefile.am	(working copy)
@@ -1,4 +1,4 @@
-INCLUDES = $(all_includes) -I$(srcdir)/../libkicker
+INCLUDES = $(all_includes) -I$(srcdir)/../libkicker -I../libkicker
 
 lib_LTLIBRARIES = libtaskmanager.la
 libtaskmanager_la_SOURCES = tasklmbmenu.cpp taskrmbmenu.cpp taskmanager.cpp
Index: workspace/kicker/extensions/taskbar/Makefile.am
===================================================================
--- workspace/kicker/extensions/taskbar/Makefile.am	(revision 516021)
+++ workspace/kicker/extensions/taskbar/Makefile.am	(working copy)
@@ -1,4 +1,4 @@
-INCLUDES = -I$(srcdir)/../../taskmanager -I$(srcdir)/../../taskbar \
-I$(srcdir)/../../libkicker -I$(top_builddir)/kicker/libkicker $(all_includes) \
+INCLUDES = -I$(srcdir)/../../taskmanager -I$(srcdir)/../../taskbar \
-I$(srcdir)/../../libkicker -I../../libkicker $(all_includes)  
 kde_module_LTLIBRARIES = taskbar_panelextension.la
 


["signature.asc" (application/pgp-signature)]

>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<


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