[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-devel
Subject: Re: [kde-freebsd] wrong include order for custom KDEDIR(S)
From: Raphael Langerhorst <raphael-langerhorst () gmx ! at>
Date: 2004-12-26 10:26:06
Message-ID: 200412261126.06685.raphael-langerhorst () gmx ! at
[Download RAW message or body]
On Friday 24 December 2004 16:19, Thiago Macieira wrote:
> Raphael Langerhorst wrote:
> >On Friday 24 December 2004 11:24, Raphael Langerhorst wrote:
> >As you can see the at the compile line, -I/usr/local/include comes
> >BEFORE -I/usr/home/kdedev/local/kde-head/include (which is
> >$KDEDIR/include). The stable KDE header files are located
> >in /usr/local/include.
> >
> >This leads to including wrong headers. As long as the headers are
> >fairly compatible, this doesn't matter much of course, but in this
> >case the visibility patch was applied AFTER the 3.3 release, so
> > this leads to failure because wrong headers are used.
> >
> >If I compile this file by hand and move -I/usr/local/include after
> > the KDE includes, then it compiles fine.
>
> It looks like the configure scripts found your libfreetype/libXft
> includes in /usr/local/include. That's why you get wrongly ordered
> includes.
>
> The line in Makefile.am is:
>
> AM_CPPFLAGS= $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS)
> $(all_includes)-D_LARGEFILE64_SOURCE
>
> What happens if you move $(all_includes) to the beginning of the
> line?
what happens is that kdebase compiles fine :) Thanks a lot!!
attached is the patch of all Makefile.am changes I made, if there are
no objections until end of the day (CET time), then I'll commit (in
about 8 hours).
Regards,
Raphael
--
G System, The Evolving Universe - http://www.g-system.at
["kdebase_makefile_am_include_order.patch" (text/x-diff)]
Index: kcmfontinst/Makefile.am
===================================================================
RCS file: /home/kde/kdebase/kcontrol/kfontinst/kcmfontinst/Makefile.am,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile.am
--- kcmfontinst/Makefile.am 12 Nov 2004 22:42:22 -0000 1.12
+++ kcmfontinst/Makefile.am 26 Dec 2004 10:24:50 -0000
@@ -2,7 +2,7 @@ kde_module_LTLIBRARIES = kcm_fontinst.la
kcm_fontinst_la_LIBADD = $(LIB_KIO) $(LIBFREETYPE_LIBS) $(LIBFONTCONFIG_LIBS) \
../lib/libkfontinst.la METASOURCES = AUTO
kcm_fontinst_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) -module \
-avoid-version -no-undefined
-AM_CPPFLAGS = $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -I$(srcdir)/../lib \
-I$(srcdir)/../../fonts $(all_includes) +AM_CPPFLAGS = $(all_includes) \
$(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -I$(srcdir)/../lib \
-I$(srcdir)/../../fonts
xdg_apps_DATA = kcmfontinst.desktop
Index: kfile-plugin/Makefile.am
===================================================================
RCS file: /home/kde/kdebase/kcontrol/kfontinst/kfile-plugin/Makefile.am,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile.am
--- kfile-plugin/Makefile.am 22 Oct 2004 19:11:19 -0000 1.8
+++ kfile-plugin/Makefile.am 26 Dec 2004 10:24:50 -0000
@@ -7,7 +7,7 @@ kfile_font_la_LIBADD = $(LIB_KIO) $(LIBF
kdelnkdir = $(kde_servicesdir)
kde_services_DATA = kfile_font.desktop
-AM_CPPFLAGS = $(LIBFREETYPE_CFLAGS) -I$(srcdir)/../lib -I$(srcdir)/../../fonts \
$(all_includes) +AM_CPPFLAGS = $(all_includes) $(LIBFREETYPE_CFLAGS) \
-I$(srcdir)/../lib -I$(srcdir)/../../fonts
METASOURCES = AUTO
noinst_HEADERS = KFileFont.h
Index: kfontinst/Makefile.am
===================================================================
RCS file: /home/kde/kdebase/kcontrol/kfontinst/kfontinst/Makefile.am,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile.am
--- kfontinst/Makefile.am 12 Nov 2004 22:42:24 -0000 1.33
+++ kfontinst/Makefile.am 26 Dec 2004 10:24:50 -0000
@@ -17,4 +17,4 @@ XConfig.h
kfontinst_LDADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) \
$(LIBFREETYPE_LIBS) $(LIB_FONT_ENC) $(LIBZ) $(LIB_KIO) ../lib/libkfontinst.la \
kfontinst_LDFLAGS = $(all_libraries) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) \
$(KDE_RPATH)
-AM_CPPFLAGS= $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -DOS_$(UNAME) \
-I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) +AM_CPPFLAGS= \
$(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -DOS_$(UNAME) \
-I$(srcdir)/../lib -I$(srcdir)/../../fonts
Index: kio/Makefile.am
===================================================================
RCS file: /home/kde/kdebase/kcontrol/kfontinst/kio/Makefile.am,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile.am
--- kio/Makefile.am 12 Nov 2004 22:42:25 -0000 1.9
+++ kio/Makefile.am 26 Dec 2004 10:24:50 -0000
@@ -4,7 +4,7 @@ KioFonts.cpp
kio_fonts_la_LIBADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) \
$(LIBFREETYPE_LIBS) $(LIB_KIO) -lkdesu ../lib/libkfontinst.la kio_fonts_la_LDFLAGS = \
$(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) \
$(LIBFREETYPE_RPATH) -module -avoid-version -no-undefined
-AM_CPPFLAGS= $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -I$(srcdir)/../lib \
-I$(srcdir)/../../fonts $(all_includes) -D_LARGEFILE64_SOURCE +AM_CPPFLAGS= \
$(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -I$(srcdir)/../lib \
-I$(srcdir)/../../fonts -D_LARGEFILE64_SOURCE
# The kxftconfig stuf really belongs to kdebase/kcontrol/fonts - here only so that \
can distribute this as an archive. noinst_HEADERS = \
Index: lib/Makefile.am
===================================================================
RCS file: /home/kde/kdebase/kcontrol/kfontinst/lib/Makefile.am,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile.am
--- lib/Makefile.am 12 Nov 2004 22:42:26 -0000 1.14
+++ lib/Makefile.am 26 Dec 2004 10:24:50 -0000
@@ -11,4 +11,4 @@ KfiConstants.h
libkfontinst_la_LIBADD = $(LIB_KDECORE) $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) \
$(LIB_KIO) $(LIBXFT_LIB) libkfontinst_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) \
$(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -no-undefined
-AM_CPPFLAGS= $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) \
$(all_includes)-D_LARGEFILE64_SOURCE +AM_CPPFLAGS= $(all_includes) \
$(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE
Index: thumbnail/Makefile.am
===================================================================
RCS file: /home/kde/kdebase/kcontrol/kfontinst/thumbnail/Makefile.am,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile.am
--- thumbnail/Makefile.am 22 Oct 2004 19:11:21 -0000 1.9
+++ thumbnail/Makefile.am 26 Dec 2004 10:24:50 -0000
@@ -11,4 +11,4 @@ kdelnkdir = $(kde_servicesdir)
kde_services_DATA = fontthumbnail.desktop
-AM_CPPFLAGS= $(LIBFREETYPE_CFLAGS) -I$(srcdir)/../lib -I$(srcdir)/../../fonts \
$(all_includes) +AM_CPPFLAGS= $(all_includes) $(LIBFREETYPE_CFLAGS) \
-I$(srcdir)/../lib -I$(srcdir)/../../fonts
>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic