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

List:       kde-commits
Subject:    kdebase/kcontrol
From:       İsmail Dönmez <ismail.donmez () gmail ! com>
Date:       2004-10-24 18:01:27
Message-ID: 20041024180127.4AF2F16BB6 () office ! kde ! org
[Download RAW message or body]

CVS commit by cartman: 


Fix multiple definition of AM_CPPFLAGS

CCMAIL: frans.englich@telia.com


  M +1 -3      ebrowsing/plugins/localdomain/Makefile.am   1.8
  M +1 -3      ebrowsing/plugins/shorturi/Makefile.am   1.13
  M +1 -3      fonts/Makefile.am   1.22
  M +1 -3      kfontinst/kio/Makefile.am   1.8
  M +1 -3      kfontinst/lib/Makefile.am   1.13
  M +1 -2      kicker/Makefile.am   1.47


--- kdebase/kcontrol/ebrowsing/plugins/localdomain/Makefile.am  #1.7:1.8
@@ -1,7 +1,5 @@
 ## Makefile.am of kdebase/kcontrol/ebrowsing/plugins/localdomain
 
-AM_CPPFLAGS = -DQT_NO_CAST_ASCII
-
-AM_CPPFLAGS   =  $(all_includes)
+AM_CPPFLAGS   =  $(all_includes) -DQT_NO_CAST_ASCII
 AM_LDFLAGS   = $(all_libraries)
 

--- kdebase/kcontrol/ebrowsing/plugins/shorturi/Makefile.am  #1.12:1.13
@@ -1,7 +1,5 @@
 ## Makefile.am of kdebase/kcontrol/ebrowsing/plugins/shorturi
 
-AM_CPPFLAGS = -DQT_NO_CAST_ASCII
-
-AM_CPPFLAGS   =  $(all_includes)
+AM_CPPFLAGS   =  $(all_includes) -DQT_NO_CAST_ASCII
 AM_LDFLAGS   = $(all_libraries)
 

--- kdebase/kcontrol/fonts/Makefile.am  #1.21:1.22
@@ -1,4 +1,2 @@
-AM_CPPFLAGS = -D_LARGEFILE64_SOURCE
-
 noinst_LTLIBRARIES = libkxftconfig.la
 
@@ -7,5 +5,5 @@
 libkxftconfig_la_LDFLAGS = $(LIBFONTCONFIG_RPATH)
 
-AM_CPPFLAGS  = $(all_includes) $(LIBFONTCONFIG_CFLAGS)
+AM_CPPFLAGS  = $(all_includes) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE
 
 kde_module_LTLIBRARIES = kcm_fonts.la

--- kdebase/kcontrol/kfontinst/kio/Makefile.am  #1.7:1.8
@@ -1,4 +1,2 @@
-AM_CPPFLAGS = -D_LARGEFILE64_SOURCE
-
 kde_module_LTLIBRARIES = kio_fonts.la
 kio_fonts_la_SOURCES = \
@@ -7,5 +5,5 @@
 kio_fonts_la_LIBADD = $(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) +AM_CPPFLAGS= $(LIBFREETYPE_CFLAGS) \
$(LIBFONTCONFIG_CFLAGS) -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) \
-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.12:1.13
@@ -1,4 +1,2 @@
-AM_CPPFLAGS = -D_LARGEFILE64_SOURCE
-
 lib_LTLIBRARIES = libkfontinst.la
 
@@ -26,3 +24,3 @@
 libkfontinst_la_LIBADD = ../../fonts/libkxftconfig.la $(LIB_FONT_ENC) $(LIB_KIO) \
$(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIBZ)  libkfontinst_la_LDFLAGS = $(all_libraries) \
                $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -no-undefined
-AM_CPPFLAGS= $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -DOS_$(UNAME) \
-I$(srcdir)/../../fonts $(all_includes) +AM_CPPFLAGS= $(LIBFREETYPE_CFLAGS) \
$(LIBFONTCONFIG_CFLAGS) -DOS_$(UNAME) -I$(srcdir)/../../fonts $(all_includes) \
-D_LARGEFILE64_SOURCE

--- kdebase/kcontrol/kicker/Makefile.am  #1.46:1.47
@@ -1,3 +1,2 @@
-AM_CPPFLAGS = -I$(top_srcdir)/kicker/core
 kde_module_LTLIBRARIES = kcm_kicker.la
 
@@ -9,5 +8,5 @@
 kcm_kicker_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
 kcm_kicker_la_LIBADD =  ../background/libbgnd.la $(LIB_KIO)
-AM_CPPFLAGS = -I$(srcdir)/../background $(all_includes)
+AM_CPPFLAGS = -I$(top_srcdir)/kicker/core -I$(srcdir)/../background $(all_includes)
 
 METASOURCES = AUTO


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