From 6a82e806b4d8ae146295c5b3d8fe4986f8ff747e Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Mon, 5 Nov 2001 14:48:03 +0000 Subject: [PATCH] Moved $(GLIB_CFLAGS) after -I includes, to make sure our own .h files get before possibly identically named headers in the glib's include directory. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1975 dbcabf3a-b0e7-0310-adc4-f8d773084564 --- src/core/Makefile.am | 6 +++--- src/fe-common/core/Makefile.am | 2 +- src/fe-common/irc/Makefile.am | 2 +- src/fe-common/irc/dcc/Makefile.am | 2 +- src/fe-common/irc/notifylist/Makefile.am | 2 +- src/fe-none/Makefile.am | 4 ++-- src/fe-text/Makefile.am | 2 +- src/irc/bot/Makefile.am | 7 +++++-- src/irc/core/Makefile.am | 5 +++-- src/irc/dcc/Makefile.am | 7 +++++-- src/irc/flood/Makefile.am | 7 +++++-- src/irc/notifylist/Makefile.am | 7 +++++-- src/irc/proxy/Makefile.am | 7 +++++-- src/lib-config/Makefile.am | 4 ++-- src/lib-popt/Makefile.am | 4 ++-- src/perl/Makefile.am | 11 ++++++----- 16 files changed, 48 insertions(+), 31 deletions(-) diff --git a/src/core/Makefile.am b/src/core/Makefile.am index ae932aa6..feedfc59 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -1,11 +1,11 @@ noinst_LIBRARIES = libcore.a INCLUDES = \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/core \ $(GLIB_CFLAGS) \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DMODULEDIR=\""$(libdir)/irssi/modules"\" \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/core + -DMODULEDIR=\""$(libdir)/irssi/modules"\" if BUILD_MEMDEBUG memdebug_src=memdebug.c diff --git a/src/fe-common/core/Makefile.am b/src/fe-common/core/Makefile.am index 01c4f002..67cb6504 100644 --- a/src/fe-common/core/Makefile.am +++ b/src/fe-common/core/Makefile.am @@ -1,8 +1,8 @@ noinst_LIBRARIES = libfe_common_core.a INCLUDES = \ - $(GLIB_CFLAGS) \ -I$(top_srcdir)/src -I$(top_srcdir)/src/core/ \ + $(GLIB_CFLAGS) \ -DHELPDIR=\""$(datadir)/irssi/help"\" \ -DTHEMESDIR=\""$(datadir)/irssi/themes"\" diff --git a/src/fe-common/irc/Makefile.am b/src/fe-common/irc/Makefile.am index 08d56540..83f06dbd 100644 --- a/src/fe-common/irc/Makefile.am +++ b/src/fe-common/irc/Makefile.am @@ -3,11 +3,11 @@ SUBDIRS = dcc notifylist noinst_LIBRARIES = libfe_common_irc.a INCLUDES = \ - $(GLIB_CFLAGS) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core/ \ -I$(top_srcdir)/src/irc/core/ \ -I$(top_srcdir)/src/fe-common/core/ \ + $(GLIB_CFLAGS) \ -DHELPDIR=\""$(datadir)/irssi/help"\" \ -DSYSCONFDIR=\""$(sysconfdir)"\" diff --git a/src/fe-common/irc/dcc/Makefile.am b/src/fe-common/irc/dcc/Makefile.am index e8118602..ad487e95 100644 --- a/src/fe-common/irc/dcc/Makefile.am +++ b/src/fe-common/irc/dcc/Makefile.am @@ -1,12 +1,12 @@ noinst_LIBRARIES = libfe_irc_dcc.a INCLUDES = \ - $(GLIB_CFLAGS) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core/ \ -I$(top_srcdir)/src/irc/core/ \ -I$(top_srcdir)/src/irc/dcc/ \ -I$(top_srcdir)/src/fe-common/core/ \ + $(GLIB_CFLAGS) \ -DHELPDIR=\""$(datadir)/irssi/help"\" \ -DSYSCONFDIR=\""$(sysconfdir)"\" diff --git a/src/fe-common/irc/notifylist/Makefile.am b/src/fe-common/irc/notifylist/Makefile.am index b8b9bef3..17523f75 100644 --- a/src/fe-common/irc/notifylist/Makefile.am +++ b/src/fe-common/irc/notifylist/Makefile.am @@ -1,11 +1,11 @@ noinst_LIBRARIES = libfe_irc_notifylist.a INCLUDES = \ - $(GLIB_CFLAGS) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core/ \ -I$(top_srcdir)/src/irc/core/ \ -I$(top_srcdir)/src/fe-common/core/ \ + $(GLIB_CFLAGS) \ -DHELPDIR=\""$(datadir)/irssi/help"\" \ -DSYSCONFDIR=\""$(sysconfdir)"\" diff --git a/src/fe-none/Makefile.am b/src/fe-none/Makefile.am index 901de7ce..d06f04e1 100644 --- a/src/fe-none/Makefile.am +++ b/src/fe-none/Makefile.am @@ -1,10 +1,10 @@ bin_PROGRAMS = botti INCLUDES = \ - $(GLIB_CFLAGS) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core/ \ - -I$(top_srcdir)/src/irc/core/ + -I$(top_srcdir)/src/irc/core/ \ + $(GLIB_CFLAGS) botti_DEPENDENCIES = @COMMON_NOUI_LIBS@ diff --git a/src/fe-text/Makefile.am b/src/fe-text/Makefile.am index 999b47bf..4adbd782 100644 --- a/src/fe-text/Makefile.am +++ b/src/fe-text/Makefile.am @@ -1,10 +1,10 @@ bin_PROGRAMS = irssi INCLUDES = \ - $(GLIB_CFLAGS) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core/ \ -I$(top_srcdir)/src/fe-common/core/ \ + $(GLIB_CFLAGS) \ $(CURSES_INCLUDEDIR) \ -DLOCALEDIR=\""$(datadir)/locale"\" diff --git a/src/irc/bot/Makefile.am b/src/irc/bot/Makefile.am index 4e5e83ea..a97abf07 100644 --- a/src/irc/bot/Makefile.am +++ b/src/irc/bot/Makefile.am @@ -3,8 +3,11 @@ module_LTLIBRARIES = libirc_bot.la libirc_bot_la_LDFLAGS = -avoid-version -INCLUDES = $(GLIB_CFLAGS) \ - -I$(top_srcdir)/src -I$(top_srcdir)/src/core/ -I$(top_srcdir)/src/irc/core/ +INCLUDES = \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/core/ \ + -I$(top_srcdir)/src/irc/core/ \ + $(GLIB_CFLAGS) libirc_bot_la_LIBADD = -lcrypt diff --git a/src/irc/core/Makefile.am b/src/irc/core/Makefile.am index 9cf60f06..d4ee0fa3 100644 --- a/src/irc/core/Makefile.am +++ b/src/irc/core/Makefile.am @@ -1,9 +1,10 @@ noinst_LIBRARIES = libirc_core.a INCLUDES = \ - $(GLIB_CFLAGS) \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/core \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -I$(top_srcdir)/src -I$(top_srcdir)/src/core + $(GLIB_CFLAGS) libirc_core_a_SOURCES = \ bans.c \ diff --git a/src/irc/dcc/Makefile.am b/src/irc/dcc/Makefile.am index d59aa043..bd6d440a 100644 --- a/src/irc/dcc/Makefile.am +++ b/src/irc/dcc/Makefile.am @@ -1,7 +1,10 @@ noinst_LIBRARIES = libirc_dcc.a -INCLUDES = $(GLIB_CFLAGS) \ - -I$(top_srcdir)/src -I$(top_srcdir)/src/core/ -I$(top_srcdir)/src/irc/core/ +INCLUDES = \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/core/ \ + -I$(top_srcdir)/src/irc/core/ \ + $(GLIB_CFLAGS) libirc_dcc_a_SOURCES = \ dcc.c \ diff --git a/src/irc/flood/Makefile.am b/src/irc/flood/Makefile.am index 2891842b..066da565 100644 --- a/src/irc/flood/Makefile.am +++ b/src/irc/flood/Makefile.am @@ -1,7 +1,10 @@ noinst_LIBRARIES = libirc_flood.a -INCLUDES = $(GLIB_CFLAGS) \ - -I$(top_srcdir)/src -I$(top_srcdir)/src/core/ -I$(top_srcdir)/src/irc/core/ +INCLUDES = \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/core/ \ + -I$(top_srcdir)/src/irc/core/ \ + $(GLIB_CFLAGS) libirc_flood_a_SOURCES = \ autoignore.c \ diff --git a/src/irc/notifylist/Makefile.am b/src/irc/notifylist/Makefile.am index a5fb387e..5734f9a7 100644 --- a/src/irc/notifylist/Makefile.am +++ b/src/irc/notifylist/Makefile.am @@ -1,7 +1,10 @@ noinst_LIBRARIES = libirc_notifylist.a -INCLUDES = $(GLIB_CFLAGS) \ - -I$(top_srcdir)/src -I$(top_srcdir)/src/core/ -I$(top_srcdir)/src/irc/core/ +INCLUDES = \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/core/ \ + -I$(top_srcdir)/src/irc/core/ \ + $(GLIB_CFLAGS) libirc_notifylist_a_SOURCES = \ notifylist.c \ diff --git a/src/irc/proxy/Makefile.am b/src/irc/proxy/Makefile.am index c711da0a..18d26081 100644 --- a/src/irc/proxy/Makefile.am +++ b/src/irc/proxy/Makefile.am @@ -1,8 +1,11 @@ moduledir = $(libdir)/irssi/modules module_LTLIBRARIES = libirc_proxy.la -INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/src/core/ \ - -I$(top_srcdir)/src/irc/core/ +INCLUDES = \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/core/ \ + -I$(top_srcdir)/src/irc/core/ \ + $(GLIB_CFLAGS) libirc_proxy.a: rm -f libirc_proxy.a diff --git a/src/lib-config/Makefile.am b/src/lib-config/Makefile.am index 3907ac3d..f8acdbd9 100644 --- a/src/lib-config/Makefile.am +++ b/src/lib-config/Makefile.am @@ -1,8 +1,8 @@ noinst_LIBRARIES = libirssi_config.a INCLUDES = \ - $(GLIB_CFLAGS) \ - -I$(top_srcdir)/src + -I$(top_srcdir)/src \ + $(GLIB_CFLAGS) libirssi_config_a_SOURCES = \ get.c \ diff --git a/src/lib-popt/Makefile.am b/src/lib-popt/Makefile.am index 928e5c0b..01163b79 100644 --- a/src/lib-popt/Makefile.am +++ b/src/lib-popt/Makefile.am @@ -1,8 +1,8 @@ noinst_LIBRARIES = libpopt.a INCLUDES = \ - $(GLIB_CFLAGS) \ - -I$(top_srcdir)/src + -I$(top_srcdir)/src \ + $(GLIB_CFLAGS) libpopt_a_SOURCES = \ findme.c popt.c poptconfig.c popthelp.c poptparse.c diff --git a/src/perl/Makefile.am b/src/perl/Makefile.am index 220397d6..739da6f4 100644 --- a/src/perl/Makefile.am +++ b/src/perl/Makefile.am @@ -13,14 +13,15 @@ libfe_perl_la_LDFLAGS = -avoid-version -rpath $(moduledir) perl-core.c: perl-signals-list.h irssi-core.pl.h -INCLUDES = $(GLIB_CFLAGS) \ +INCLUDES = \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/core \ + -I$(top_srcdir)/src/fe-common/core \ + $(GLIB_CFLAGS) \ -DSCRIPTDIR=\""$(libdir)/irssi/scripts"\" \ -DPERL_USE_LIB=\""$(PERL_USE_LIB)"\" \ -DPERL_STATIC_LIBS=$(PERL_STATIC_LIBS) \ - $(PERL_CFLAGS) \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/core \ - -I$(top_srcdir)/src/fe-common/core + $(PERL_CFLAGS) perl_sources = \ perl-core.c \