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

List:       kde-commits
Subject:    kdebase/kcontrol/kfontinst
From:       Raphael Langerhorst <raphael-langerhorst () gmx ! at>
Date:       2004-12-26 13:35:39
Message-ID: 20041226133539.48DB11BC19 () office ! kde ! org
[Download RAW message or body]

CVS commit by raphael: 

fix include order in Makefile.am files for kdebase/kcontrol/kfontinst


  M +1 -1      kcmfontinst/Makefile.am   1.13
  M +1 -1      kfile-plugin/Makefile.am   1.9
  M +1 -1      kfontinst/Makefile.am   1.34
  M +1 -1      kio/Makefile.am   1.10
  M +1 -1      lib/Makefile.am   1.15
  M +1 -1      thumbnail/Makefile.am   1.10


--- kdebase/kcontrol/kfontinst/kcmfontinst/Makefile.am  #1.12:1.13
@@ -3,5 +3,5 @@
 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 = -I$(srcdir)/../lib \
-I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) \
  xdg_apps_DATA = kcmfontinst.desktop

--- kdebase/kcontrol/kfontinst/kfile-plugin/Makefile.am  #1.8:1.9
@@ -8,5 +8,5 @@
 kde_services_DATA = kfile_font.desktop
 
-AM_CPPFLAGS = $(LIBFREETYPE_CFLAGS) -I$(srcdir)/../lib -I$(srcdir)/../../fonts \
$(all_includes) +AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts \
$(all_includes) $(LIBFREETYPE_CFLAGS)  
 METASOURCES = AUTO

--- kdebase/kcontrol/kfontinst/kfontinst/Makefile.am  #1.33:1.34
@@ -18,3 +18,3 @@
 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= \
-DOS_$(UNAME) -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) \
$(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS)

--- kdebase/kcontrol/kfontinst/kio/Makefile.am  #1.9:1.10
@@ -5,5 +5,5 @@
 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= \
-I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) \
$(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE  
 # The kxftconfig stuf really belongs to kdebase/kcontrol/fonts - here only so that \
can distribute this as an archive.

--- kdebase/kcontrol/kfontinst/lib/Makefile.am  #1.14:1.15
@@ -12,3 +12,3 @@
 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

--- kdebase/kcontrol/kfontinst/thumbnail/Makefile.am  #1.9:1.10
@@ -12,3 +12,3 @@
 kde_services_DATA = fontthumbnail.desktop
 
-AM_CPPFLAGS= $(LIBFREETYPE_CFLAGS) -I$(srcdir)/../lib -I$(srcdir)/../../fonts \
$(all_includes) +AM_CPPFLAGS= -I$(srcdir)/../lib -I$(srcdir)/../../fonts \
$(all_includes) $(LIBFREETYPE_CFLAGS)


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