aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-09-29 04:45:57 -04:00
Code

Merge pull request #68 from falconindy/master

Browse Source 
Autotools cleanup
This commit is contained in:
Alexander Færøy 2014-06-29 14:21:00 +02:00
commit 17b9bb12bf
19 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -1,4 +1,4 @@
ACLOCAL_AMFLAGS = -I .
ACLOCAL_AMFLAGS = -I m4
# create default-config.h
BUILT_SOURCES = default-config.h default-theme.h irssi-version.h

2
autogen.sh
View File

@ -6,7 +6,7 @@ PKG_NAME="Irssi"
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
if test ! -f $srcdir/configure.in; then
if test ! -f $srcdir/configure.ac; then
echo -n "**Error**: Directory \`$srcdir\' does not look like the"
echo " top-level $PKG_NAME directory"
exit 1

1
configure.in → configure.ac
View File

@ -4,6 +4,7 @@ AC_CONFIG_AUX_DIR(build-aux)
AC_PREREQ(2.50)
AC_CONFIG_HEADERS([irssi-config.h])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([1.9 no-define foreign])
AM_MAINTAINER_MODE

0
curses.m4 → m4/curses.m4
View File

0
glib-2.0.m4 → m4/glib-2.0.m4
View File

2
src/core/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LIBRARIES = libcore.a
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/core \
$(GLIB_CFLAGS) \

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

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

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

@ -2,7 +2,7 @@ SUBDIRS = dcc notifylist
noinst_LIBRARIES = libfe_common_irc.a
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/core/ \
-I$(top_srcdir)/src/irc/core/ \

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

@ -1,6 +1,6 @@
noinst_LIBRARIES = libfe_irc_dcc.a
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/core/ \
-I$(top_srcdir)/src/irc/core/ \

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

@ -1,6 +1,6 @@
noinst_LIBRARIES = libfe_irc_notifylist.a
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/core/ \
-I$(top_srcdir)/src/irc/core/ \

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

@ -1,6 +1,6 @@
bin_PROGRAMS = botti
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/core/ \
-I$(top_srcdir)/src/irc/core/ \

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

@ -1,6 +1,6 @@
bin_PROGRAMS = irssi
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/core/ \
-I$(top_srcdir)/src/fe-common/core/ \

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

@ -1,6 +1,6 @@
noinst_LIBRARIES = libirc_core.a
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/core \
-DSYSCONFDIR=\""$(sysconfdir)"\" \

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

@ -1,6 +1,6 @@
noinst_LIBRARIES = libirc_dcc.a
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/core/ \
-I$(top_srcdir)/src/irc/core/ \

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

@ -1,6 +1,6 @@
noinst_LIBRARIES = libirc_flood.a
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/core/ \
-I$(top_srcdir)/src/irc/core/ \

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

@ -1,6 +1,6 @@
noinst_LIBRARIES = libirc_notifylist.a
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/core/ \
-I$(top_srcdir)/src/irc/core/ \

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

@ -1,7 +1,7 @@
moduledir = $(libdir)/irssi/modules
module_LTLIBRARIES = libirc_proxy.la
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/core/ \
-I$(top_srcdir)/src/irc/core/ \

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

@ -1,6 +1,6 @@
noinst_LIBRARIES = libirssi_config.a
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir)/src \
$(GLIB_CFLAGS)

2
src/perl/Makefile.am
View File

@ -14,7 +14,7 @@ libfe_perl_la_LDFLAGS = -module -avoid-version -rpath $(moduledir)
perl-core.lo: irssi-core.pl.h
perl-signals.lo: perl-signals-list.h
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/core \
-I$(top_srcdir)/src/fe-common/core \