X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=apps%2Firssi%2Fsrc%2Fsilc%2Fcore%2FMakefile.am;h=46b85d10506294f293bb1509328da572a33d8798;hb=ea3a5809967d56924ff8f81106fd1c373cf41994;hp=b25d74302a8f2dc18ed64348be896d5d1d822dd1;hpb=6bdd7d2dd5279434f63b673e327b43d2513ec3a5;p=silc.git

diff --git a/apps/irssi/src/silc/core/Makefile.am b/apps/irssi/src/silc/core/Makefile.am
index b25d7430..46b85d10 100644
--- a/apps/irssi/src/silc/core/Makefile.am
+++ b/apps/irssi/src/silc/core/Makefile.am
@@ -1,58 +1,78 @@
-moduledir = $(libdir)/irssi/modules
+include $(top_srcdir)/Makefile.defines.in
 
-INCLUDES = $(GLIB_CFLAGS) -I$(IRSSI_INCLUDE) -I$(IRSSI_INCLUDE)/src
+moduledir = @SILC_IRSSIDIR@
 
-module_LTLIBRARIES = libsilc_core.la
 
-libsilc_core_la_LDFLAGS = -avoid-version
+IRSSI_INCLUDE=../../..
 
-INCLUDES = \
-	$(GLIB_CFLAGS) \
-	-DSYSCONFDIR=\""$(sysconfdir)"\" \
-	-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
+if SILCPLUGIN
+EXTRA_CFLAGS=-DSILC_PLUGIN
+LBDD= \
+	$(top_srcdir)/../../lib/libsilc.la \
+	$(top_srcdir)/../../lib/libsilcclient.la
+LTLB= libsilc_core.la
+NILB=
+LBLDFLGS= \
+	-avoid-version \
+	-rpath $(moduledir)
+else
+EXTRA_CFLAGS=
+LBDD=
+NILB= libsilc_core.la
+LTLB=
+LBLDFLGS=
+endif
 
-libsilc_core_la_DEPENDENCIES = .libs/libsilcclient.a .libs/libsilcorig.a
+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$(IRSSI_INCLUDE)/src/fe-common/core \
+        -I$(IRSSI_INCLUDE)/src/fe-common/silc \
+	$(EXTRA_CFLAGS)
+
+noinst_LTLIBRARIES= $(NILB)
+module_LTLIBRARIES = $(LTLB)
 
 libsilc_core_la_SOURCES = \
+	clientutil.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 \
+	silc-chatnets.c \
+	silc-cmdqueue.c \
+	client_ops.c
+
+libsilc_core_la_LIBADD = \
+	$(LBDD)
+
+libsilc_core_la_LDFLAGS = \
+	$(LBDFLGS)
 
 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_LIBS = \
-	libsilcclient.la \
-	libsilcorig.la
-
-libsilc_core_la_LIBADD = \
-	$(SILC_LIBS)
+	silc-servers.h \
+	silc-chatnets.h \
+	silc-cmdqueue.h
 
-EXTRA_DIST = \
-	$(SILC_LIBS)
+all-local: libsilc_core.a
 
-.libs/libsilcclient.a:
-	if [ ! -d .libs ]; then mkdir .libs; fi
-	cd .libs && ln -sf ../../../libsilcclient.a . && cd ..
+clean-local:
+	-rm -f libsilc_core.a
 
-.libs/libsilcorig.a: .libs/libsilcclient.a
-	cd .libs && ln -sf ../../../libsilcorig.a . && cd ..
+libsilc_core.a: libsilc_core.la
+	cp .libs/libsilc_core.a .