Merged silc_1_0_branch to trunk.

[silc.git] / apps / irssi / src / fe-common / silc / Makefile.am

diff --git a/apps/irssi/src/fe-common/silc/Makefile.am b/apps/irssi/src/fe-common/silc/Makefile.am
index 74efdc416f593ef86126cd9d5347c24d75816cc4..ccf0f98c01ebfe480e2f29ea4e6941f88bff56de 100644 (file)
--- a/apps/irssi/src/fe-common/silc/Makefile.am
+++ b/apps/irssi/src/fe-common/silc/Makefile.am
@@ -1,13 +1,13 @@
-INCLUDES = $(GLIB_CFLAGS) -I$(IRSSI_INCLUDE) -I$(IRSSI_INCLUDE)/src
-
-SILC_INCLUDE=../../../..
 IRSSI_INCLUDE=../../..
 
-INCLUDES = \
+include $(top_srcdir)/Makefile.defines.in
+
+ADD_INCLUDES = \
         $(GLIB_CFLAGS) \
-        -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/silc \
         -I$(IRSSI_INCLUDE)/src/silc/core \
         -I$(SILC_INCLUDE)/includes \
@@ -24,10 +24,19 @@ INCLUDES = \
 noinst_LIBRARIES = libfe_common_silc.a
 
 libfe_common_silc_a_SOURCES = \
-       fe-channels.c \
+       fe-silc-channels.c \
        fe-common-silc.c \
-       silc-modules.c 
+       module-formats.c \
+       silc-modules.c \
+       fe-silc-messages.c \
+       fe-silcnet.c \
+       fe-silc-queries.c
 
 noinst_HEADERS = \
+       module-formats.h \
+       fe-silc-channels.h \
+       fe-silc-messages.h \
+       fe-silc-queries.h \
+       fe-silcnet.h \
        fe-common-silc.h \
        module.h