projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged silc_1_1_branch to trunk.
[silc.git]
/
apps
/
irssi
/
src
/
core
/
Makefile.am
diff --git
a/apps/irssi/src/core/Makefile.am
b/apps/irssi/src/core/Makefile.am
index 1443bc91cc5a8186498e3aff04a8b425231c5dfc..d9ea60a943d38c88539000fc03ff952d42ad8c43 100644
(file)
--- a/
apps/irssi/src/core/Makefile.am
+++ b/
apps/irssi/src/core/Makefile.am
@@
-2,18
+2,12
@@
noinst_LIBRARIES = libcore.a
include $(top_srcdir)/Makefile.defines.in
include $(top_srcdir)/Makefile.defines.in
-INCLUDES = \
+INCLUDES += \
+ -I$(top_srcdir)/src \
+ -I$(top_srcdir)/src/core \
$(GLIB_CFLAGS) \
-DSYSCONFDIR=\""$(silc_etcdir)"\" \
$(GLIB_CFLAGS) \
-DSYSCONFDIR=\""$(silc_etcdir)"\" \
- -DMODULEDIR=\""$(silc_modulesdir)"\" \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/src/core
-
-if BUILD_MEMDEBUG
-memdebug_src=memdebug.c
-else
-memdebug_src=
-endif
+ -DMODULEDIR=\""@SILC_IRSSIDIR@"\"
libcore_a_SOURCES = \
args.c \
libcore_a_SOURCES = \
args.c \
@@
-29,23
+23,26
@@
libcore_a_SOURCES = \
levels.c \
line-split.c \
log.c \
levels.c \
line-split.c \
log.c \
+ log-away.c \
masks.c \
masks.c \
- $(memdebug_src) \
misc.c \
modules.c \
misc.c \
modules.c \
+ modules-load.c \
net-disconnect.c \
net-nonblock.c \
net-sendbuffer.c \
network.c \
net-disconnect.c \
net-nonblock.c \
net-sendbuffer.c \
network.c \
+ network-openssl.c \
nicklist.c \
nickmatch-cache.c \
pidwait.c \
queries.c \
rawlog.c \
nicklist.c \
nickmatch-cache.c \
pidwait.c \
queries.c \
rawlog.c \
+ recode.c \
servers.c \
servers-reconnect.c \
servers.c \
servers-reconnect.c \
- servers-redirect.c \
servers-setup.c \
servers-setup.c \
+ session.c \
settings.c \
signals.c \
special-vars.c \
settings.c \
signals.c \
special-vars.c \
@@
-75,10
+72,10
@@
noinst_HEADERS = \
line-split.h \
log.h \
masks.h \
line-split.h \
log.h \
masks.h \
- memdebug.h \
misc.h \
module.h \
modules.h \
misc.h \
module.h \
modules.h \
+ modules-load.h \
net-disconnect.h \
net-nonblock.h \
net-sendbuffer.h \
net-disconnect.h \
net-nonblock.h \
net-sendbuffer.h \
@@
-89,16
+86,14
@@
noinst_HEADERS = \
pidwait.h \
queries.h \
rawlog.h \
pidwait.h \
queries.h \
rawlog.h \
+ recode.h \
servers.h \
servers-reconnect.h \
servers.h \
servers-reconnect.h \
- servers-redirect.h \
servers-setup.h \
servers-setup.h \
+ session.h \
settings.h \
signals.h \
special-vars.h \
window-item-def.h \
write-buffer.h \
$(structure_headers)
settings.h \
signals.h \
special-vars.h \
window-item-def.h \
write-buffer.h \
$(structure_headers)
-
-EXTRA_DIST = \
- memdebug.c