aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

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.

Browse Source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1975 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2001-11-05 14:48:03 +00:00 committed by cras
parent a6e9d7dfb7
commit 6a82e806b4
16 changed files with 48 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/Makefile.am
View File

@ -1,11 +1,11 @@
noinst_LIBRARIES = libcore.a noinst_LIBRARIES = libcore.a
INCLUDES = \ INCLUDES = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/core \
$(GLIB_CFLAGS) \ $(GLIB_CFLAGS) \
-DSYSCONFDIR=\""$(sysconfdir)"\" \ -DSYSCONFDIR=\""$(sysconfdir)"\" \
-DMODULEDIR=\""$(libdir)/irssi/modules"\" \ -DMODULEDIR=\""$(libdir)/irssi/modules"\"
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/core
if BUILD_MEMDEBUG if BUILD_MEMDEBUG
memdebug_src=memdebug.c memdebug_src=memdebug.c

2
src/fe-common/core/Makefile.am
View File

@ -1,8 +1,8 @@
noinst_LIBRARIES = libfe_common_core.a noinst_LIBRARIES = libfe_common_core.a
INCLUDES = \ INCLUDES = \
$(GLIB_CFLAGS) \
-I$(top_srcdir)/src -I$(top_srcdir)/src/core/ \ -I$(top_srcdir)/src -I$(top_srcdir)/src/core/ \
$(GLIB_CFLAGS) \
-DHELPDIR=\""$(datadir)/irssi/help"\" \ -DHELPDIR=\""$(datadir)/irssi/help"\" \
-DTHEMESDIR=\""$(datadir)/irssi/themes"\" -DTHEMESDIR=\""$(datadir)/irssi/themes"\"

2
src/fe-common/irc/Makefile.am
View File

@ -3,11 +3,11 @@ SUBDIRS = dcc notifylist
noinst_LIBRARIES = libfe_common_irc.a noinst_LIBRARIES = libfe_common_irc.a
INCLUDES = \ INCLUDES = \
$(GLIB_CFLAGS) \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/core/ \ -I$(top_srcdir)/src/core/ \
-I$(top_srcdir)/src/irc/core/ \ -I$(top_srcdir)/src/irc/core/ \
-I$(top_srcdir)/src/fe-common/core/ \ -I$(top_srcdir)/src/fe-common/core/ \
$(GLIB_CFLAGS) \
-DHELPDIR=\""$(datadir)/irssi/help"\" \ -DHELPDIR=\""$(datadir)/irssi/help"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" -DSYSCONFDIR=\""$(sysconfdir)"\"

2
src/fe-common/irc/dcc/Makefile.am
View File

@ -1,12 +1,12 @@
noinst_LIBRARIES = libfe_irc_dcc.a noinst_LIBRARIES = libfe_irc_dcc.a
INCLUDES = \ INCLUDES = \
$(GLIB_CFLAGS) \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/core/ \ -I$(top_srcdir)/src/core/ \
-I$(top_srcdir)/src/irc/core/ \ -I$(top_srcdir)/src/irc/core/ \
-I$(top_srcdir)/src/irc/dcc/ \ -I$(top_srcdir)/src/irc/dcc/ \
-I$(top_srcdir)/src/fe-common/core/ \ -I$(top_srcdir)/src/fe-common/core/ \
$(GLIB_CFLAGS) \
-DHELPDIR=\""$(datadir)/irssi/help"\" \ -DHELPDIR=\""$(datadir)/irssi/help"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" -DSYSCONFDIR=\""$(sysconfdir)"\"

2
src/fe-common/irc/notifylist/Makefile.am
View File

@ -1,11 +1,11 @@
noinst_LIBRARIES = libfe_irc_notifylist.a noinst_LIBRARIES = libfe_irc_notifylist.a
INCLUDES = \ INCLUDES = \
$(GLIB_CFLAGS) \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/core/ \ -I$(top_srcdir)/src/core/ \
-I$(top_srcdir)/src/irc/core/ \ -I$(top_srcdir)/src/irc/core/ \
-I$(top_srcdir)/src/fe-common/core/ \ -I$(top_srcdir)/src/fe-common/core/ \
$(GLIB_CFLAGS) \
-DHELPDIR=\""$(datadir)/irssi/help"\" \ -DHELPDIR=\""$(datadir)/irssi/help"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" -DSYSCONFDIR=\""$(sysconfdir)"\"

4
src/fe-none/Makefile.am
View File

@ -1,10 +1,10 @@
bin_PROGRAMS = botti bin_PROGRAMS = botti
INCLUDES = \ INCLUDES = \
$(GLIB_CFLAGS) \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/core/ \ -I$(top_srcdir)/src/core/ \
-I$(top_srcdir)/src/irc/core/ -I$(top_srcdir)/src/irc/core/ \
$(GLIB_CFLAGS)
botti_DEPENDENCIES = @COMMON_NOUI_LIBS@ botti_DEPENDENCIES = @COMMON_NOUI_LIBS@

2
src/fe-text/Makefile.am
View File

@ -1,10 +1,10 @@
bin_PROGRAMS = irssi bin_PROGRAMS = irssi
INCLUDES = \ INCLUDES = \
$(GLIB_CFLAGS) \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/core/ \ -I$(top_srcdir)/src/core/ \
-I$(top_srcdir)/src/fe-common/core/ \ -I$(top_srcdir)/src/fe-common/core/ \
$(GLIB_CFLAGS) \
$(CURSES_INCLUDEDIR) \ $(CURSES_INCLUDEDIR) \
-DLOCALEDIR=\""$(datadir)/locale"\" -DLOCALEDIR=\""$(datadir)/locale"\"

7
src/irc/bot/Makefile.am
View File

@ -3,8 +3,11 @@ module_LTLIBRARIES = libirc_bot.la
libirc_bot_la_LDFLAGS = -avoid-version libirc_bot_la_LDFLAGS = -avoid-version
INCLUDES = $(GLIB_CFLAGS) \ INCLUDES = \
-I$(top_srcdir)/src -I$(top_srcdir)/src/core/ -I$(top_srcdir)/src/irc/core/ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/core/ \
-I$(top_srcdir)/src/irc/core/ \
$(GLIB_CFLAGS)
libirc_bot_la_LIBADD = -lcrypt libirc_bot_la_LIBADD = -lcrypt

5
src/irc/core/Makefile.am
View File

@ -1,9 +1,10 @@
noinst_LIBRARIES = libirc_core.a noinst_LIBRARIES = libirc_core.a
INCLUDES = \ INCLUDES = \
$(GLIB_CFLAGS) \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/core \
-DSYSCONFDIR=\""$(sysconfdir)"\" \ -DSYSCONFDIR=\""$(sysconfdir)"\" \
-I$(top_srcdir)/src -I$(top_srcdir)/src/core $(GLIB_CFLAGS)
libirc_core_a_SOURCES = \ libirc_core_a_SOURCES = \
bans.c \ bans.c \

7
src/irc/dcc/Makefile.am
View File

@ -1,7 +1,10 @@
noinst_LIBRARIES = libirc_dcc.a noinst_LIBRARIES = libirc_dcc.a
INCLUDES = $(GLIB_CFLAGS) \ INCLUDES = \
-I$(top_srcdir)/src -I$(top_srcdir)/src/core/ -I$(top_srcdir)/src/irc/core/ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/core/ \
-I$(top_srcdir)/src/irc/core/ \
$(GLIB_CFLAGS)
libirc_dcc_a_SOURCES = \ libirc_dcc_a_SOURCES = \
dcc.c \ dcc.c \

7
src/irc/flood/Makefile.am
View File

@ -1,7 +1,10 @@
noinst_LIBRARIES = libirc_flood.a noinst_LIBRARIES = libirc_flood.a
INCLUDES = $(GLIB_CFLAGS) \ INCLUDES = \
-I$(top_srcdir)/src -I$(top_srcdir)/src/core/ -I$(top_srcdir)/src/irc/core/ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/core/ \
-I$(top_srcdir)/src/irc/core/ \
$(GLIB_CFLAGS)
libirc_flood_a_SOURCES = \ libirc_flood_a_SOURCES = \
autoignore.c \ autoignore.c \

7
src/irc/notifylist/Makefile.am
View File

@ -1,7 +1,10 @@
noinst_LIBRARIES = libirc_notifylist.a noinst_LIBRARIES = libirc_notifylist.a
INCLUDES = $(GLIB_CFLAGS) \ INCLUDES = \
-I$(top_srcdir)/src -I$(top_srcdir)/src/core/ -I$(top_srcdir)/src/irc/core/ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/core/ \
-I$(top_srcdir)/src/irc/core/ \
$(GLIB_CFLAGS)
libirc_notifylist_a_SOURCES = \ libirc_notifylist_a_SOURCES = \
notifylist.c \ notifylist.c \

7
src/irc/proxy/Makefile.am
View File

@ -1,8 +1,11 @@
moduledir = $(libdir)/irssi/modules moduledir = $(libdir)/irssi/modules
module_LTLIBRARIES = libirc_proxy.la module_LTLIBRARIES = libirc_proxy.la
INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/src/core/ \ INCLUDES = \
-I$(top_srcdir)/src/irc/core/ -I$(top_srcdir)/src \
-I$(top_srcdir)/src/core/ \
-I$(top_srcdir)/src/irc/core/ \
$(GLIB_CFLAGS)
libirc_proxy.a: libirc_proxy.a:
rm -f libirc_proxy.a rm -f libirc_proxy.a

4
src/lib-config/Makefile.am
View File

@ -1,8 +1,8 @@
noinst_LIBRARIES = libirssi_config.a noinst_LIBRARIES = libirssi_config.a
INCLUDES = \ INCLUDES = \
$(GLIB_CFLAGS) \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src $(GLIB_CFLAGS)
libirssi_config_a_SOURCES = \ libirssi_config_a_SOURCES = \
get.c \ get.c \

4
src/lib-popt/Makefile.am
View File

@ -1,8 +1,8 @@
noinst_LIBRARIES = libpopt.a noinst_LIBRARIES = libpopt.a
INCLUDES = \ INCLUDES = \
$(GLIB_CFLAGS) \ -I$(top_srcdir)/src \
-I$(top_srcdir)/src $(GLIB_CFLAGS)
libpopt_a_SOURCES = \ libpopt_a_SOURCES = \
findme.c popt.c poptconfig.c popthelp.c poptparse.c findme.c popt.c poptconfig.c popthelp.c poptparse.c

11
src/perl/Makefile.am
View File

@ -13,14 +13,15 @@ libfe_perl_la_LDFLAGS = -avoid-version -rpath $(moduledir)
perl-core.c: perl-signals-list.h irssi-core.pl.h 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"\" \ -DSCRIPTDIR=\""$(libdir)/irssi/scripts"\" \
-DPERL_USE_LIB=\""$(PERL_USE_LIB)"\" \ -DPERL_USE_LIB=\""$(PERL_USE_LIB)"\" \
-DPERL_STATIC_LIBS=$(PERL_STATIC_LIBS) \ -DPERL_STATIC_LIBS=$(PERL_STATIC_LIBS) \
$(PERL_CFLAGS) \ $(PERL_CFLAGS)
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/core \
-I$(top_srcdir)/src/fe-common/core
perl_sources = \ perl_sources = \
perl-core.c \ perl-core.c \