Hija,

I'm throwing the following fix for consideration. The
problem is that by standard headers are looked for in
various locations under the srcdir, however there're
also header files which are automatically generated
and (rightfully) put into objdir but are not searched
for there. This breaks builds where srcdir != objdir.

My simple fix is to add another include search path
relative to the current directory (i.e. objdir) where
needed. I realize that there might be better ways to
fix that which I currently can not see so I'm posting
it here with a RFC.

Index: app/display/Makefile.am
===================================================================
RCS file: /cvs/gnome/gimp/app/display/Makefile.am,v
retrieving revision 1.42
diff -u -r1.42 Makefile.am
--- app/display/Makefile.am     13 Feb 2005 15:08:04 -0000      1.42
+++ app/display/Makefile.am     26 Feb 2005 17:10:39 -0000
@@ -75,6 +75,7 @@
 INCLUDES = \
        -I$(top_srcdir)         \
        -I$(top_srcdir)/app     \
+       -I..                    \
        $(GTK_CFLAGS)           \
        -I$(includedir)

Index: app/tools/Makefile.am
===================================================================
RCS file: /cvs/gnome/gimp/app/tools/Makefile.am,v
retrieving revision 1.88
diff -u -r1.88 Makefile.am
--- app/tools/Makefile.am       13 Feb 2005 15:08:07 -0000      1.88
+++ app/tools/Makefile.am       26 Feb 2005 17:10:39 -0000
@@ -157,6 +157,7 @@
 INCLUDES = \
        -I$(top_srcdir)         \
        -I$(top_srcdir)/app     \
+       -I..                    \
        $(GTK_CFLAGS)           \
        -I$(includedir)

Index: app/vectors/Makefile.am
===================================================================
RCS file: /cvs/gnome/gimp/app/vectors/Makefile.am,v
retrieving revision 1.16
diff -u -r1.16 Makefile.am
--- app/vectors/Makefile.am     13 Feb 2005 15:08:07 -0000      1.16
+++ app/vectors/Makefile.am     26 Feb 2005 17:10:40 -0000
@@ -7,6 +7,7 @@
 INCLUDES = \
        -I$(top_srcdir)         \
        -I$(top_srcdir)/app     \
+       -I..                    \
        $(GDK_PIXBUF_CFLAGS)    \
        $(LIBART_CFLAGS)        \
        -I$(includedir)

Servus,
      Daniel

Attachment: PGP.sig
Description: This is a digitally signed message part



Reply via email to