Merged silc_1_0_branch to trunk.

[silc.git] / apps / irssi / src / silc / core / Makefile.am

diff --git a/apps/irssi/src/silc/core/Makefile.am b/apps/irssi/src/silc/core/Makefile.am
index 3c8078c88499f0b26f68695451f3a991a2ecfdce..98f3398f0b3c3f717bfdc9b85ee67b8e290132dc 100644 (file)
--- a/apps/irssi/src/silc/core/Makefile.am
+++ b/apps/irssi/src/silc/core/Makefile.am
@@ -1,47 +1,38 @@
+include $(top_srcdir)/Makefile.defines.in
+
 IRSSI_INCLUDE=../../..
-silc_top_srcdir=../../../..
 
-INCLUDES = \
+ADD_INCLUDES = \
        $(GLIB_CFLAGS) -I$(IRSSI_INCLUDE) -I$(IRSSI_INCLUDE)/src \
-        -DSYSCONFDIR=\""$(sysconfdir)"\" \
+        -DSYSCONFDIR=\""$(silc_etcdir)"\" \
         -I$(IRSSI_INCLUDE) \
        -I$(IRSSI_INCLUDE)/src \
         -I$(IRSSI_INCLUDE)/src/core \
         -I$(IRSSI_INCLUDE)/src/fe-common/core \
-        -I$(IRSSI_INCLUDE)/src/fe-common/silc \
-       -I$(silc_top_srcdir)/lib/silccore \
-       -I$(silc_top_srcdir)/lib/silccrypt \
-        -I$(silc_top_srcdir)/lib/silcmath \
-        -I$(silc_top_srcdir)/lib/silcmath/gmp \
-       -I$(silc_top_srcdir)/lib/silcske \
-       -I$(silc_top_srcdir)/lib/silcsim \
-       -I$(silc_top_srcdir)/lib/silcutil \
-       -I$(silc_top_srcdir)/lib/silcclient \
-       -I$(silc_top_srcdir)/lib/contrib \
-        -I$(silc_top_srcdir)/includes \
-        -I$(silc_top_srcdir)/doc \
-       -I$(silc_top_srcdir)/lib/trq
+        -I$(IRSSI_INCLUDE)/src/fe-common/silc
 
 noinst_LIBRARIES=libsilc_core.a
 
 libsilc_core_a_SOURCES = \
        client_ops.c \
        clientutil.c \
-       clientconfig.c \
        silc-channels.c \
        silc-core.c \
        silc-nicklist.c \
        silc-queries.c \
        silc-servers.c \
-       silc-servers-reconnect.c
+       silc-expandos.c \
+       silc-servers-reconnect.c \
+       silc-lag.c
 
 noinst_HEADERS = \
        module.h \
        client_ops.h \
        clientutil.h \
-       clientconfig.h \
        silc-channels.h \
        silc-core.h \
        silc-nicklist.h \
+       silc-commands.h \
        silc-queries.h \
-       silc-servers.h
+       silc-servers.h 
+