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 5de213a086f639bdfcf9c73d888e9c1af6a1e7fd..98f3398f0b3c3f717bfdc9b85ee67b8e290132dc 100644 (file)
--- a/apps/irssi/src/silc/core/Makefile.am
+++ b/apps/irssi/src/silc/core/Makefile.am
@@ -1,40 +1,38 @@
-INCLUDES = $(GLIB_CFLAGS) -I$(IRSSI_INCLUDE) -I$(IRSSI_INCLUDE)/src
+include $(top_srcdir)/Makefile.defines.in
 
-SILC_INCLUDE=../../../..
 IRSSI_INCLUDE=../../..
 
-INCLUDES = \
-        $(GLIB_CFLAGS) \
-        -DSYSCONFDIR=\""$(sysconfdir)"\" \
-        -I$(IRSSI_INCLUDE) -I$(IRSSI_INCLUDE)/src \
+ADD_INCLUDES = \
+       $(GLIB_CFLAGS) -I$(IRSSI_INCLUDE) -I$(IRSSI_INCLUDE)/src \
+        -DSYSCONFDIR=\""$(silc_etcdir)"\" \
+        -I$(IRSSI_INCLUDE) \
+       -I$(IRSSI_INCLUDE)/src \
         -I$(IRSSI_INCLUDE)/src/core \
-        -I$(SILC_INCLUDE)/includes \
-        -I$(SILC_INCLUDE)/lib/silccore \
-        -I$(SILC_INCLUDE)/lib/silccrypt \
-        -I$(SILC_INCLUDE)/lib/silcmath \
-        -I$(SILC_INCLUDE)/lib/silcske \
-        -I$(SILC_INCLUDE)/lib/silcsim \
-        -I$(SILC_INCLUDE)/lib/silcutil \
-        -I$(SILC_INCLUDE)/lib/silcclient \
-        -I$(SILC_INCLUDE)/lib/silcmath/gmp \
-        -I$(SILC_INCLUDE)/lib/trq
+        -I$(IRSSI_INCLUDE)/src/fe-common/core \
+        -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 \
        silc-channels.h \
        silc-core.h \
        silc-nicklist.h \
+       silc-commands.h \
        silc-queries.h \
-       silc-servers.h
+       silc-servers.h 
+