X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=apps%2Firssi%2Fsrc%2Fperl%2FMakefile.am;h=3b978476929d241fe4b62b83ce54430d76cc7dc3;hb=1db7801dd7c7890ebc8bbec651a9d18cbbe9012b;hp=965605a2c7d8449242be3b40872423517dcf0f40;hpb=d067e054d2b76c94dd92a9aefbfc2185e52d0473;p=silc.git

diff --git a/apps/irssi/src/perl/Makefile.am b/apps/irssi/src/perl/Makefile.am
index 965605a2..3b978476 100644
--- a/apps/irssi/src/perl/Makefile.am
+++ b/apps/irssi/src/perl/Makefile.am
@@ -4,24 +4,26 @@ include $(top_srcdir)/Makefile.defines.in
 
 moduledir = $(silc_modulesdir)
 
+perl_dirs = common ui textui silc
+
 module_LTLIBRARIES = $(perl_module_lib) $(perl_module_fe_lib)
 noinst_LTLIBRARIES = $(perl_static_lib) $(perl_static_fe_lib)
 EXTRA_LTLIBRARIES = \
 	libperl_core.la libfe_perl.la \
 	libperl_core_static.la libfe_perl_static.la
 
-libperl_core_la_LDFLAGS = -avoid-version -rpath $(moduledir)
-libfe_perl_la_LDFLAGS = -avoid-version -rpath $(moduledir)
+libperl_core_la_LDFLAGS = -module -avoid-version -rpath $(moduledir)
+libfe_perl_la_LDFLAGS = -module -avoid-version -rpath $(moduledir)
 
 perl-core.c: perl-signals-list.h irssi-core.pl.h
 
-INCLUDES = \
+INCLUDES += \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/core \
 	-I$(top_srcdir)/src/fe-common/core \
 	-I$(top_srcdir)/src/fe-common/silc \
 	$(GLIB_CFLAGS) \
-	-DSCRIPTDIR=\""$(libdir)/irssi/scripts"\" \
+	-DSCRIPTDIR=\""$(datadir)/silc/scripts"\" \
 	-DPERL_USE_LIB=\""$(PERL_USE_LIB)"\" \
 	-DPERL_STATIC_LIBS=$(PERL_STATIC_LIBS) \
 	$(PERL_CFLAGS)
@@ -79,6 +81,7 @@ common_sources = \
 	common/Irssi.pm \
 	common/Channel.xs \
 	common/Core.xs \
+	common/Expando.xs \
 	common/Ignore.xs \
 	common/Log.xs \
 	common/Masks.xs \
@@ -110,6 +113,15 @@ textui_sources = \
 	textui/typemap \
 	textui/module.h
 
+silc_sources = \
+	silc/Silc.xs \
+	silc/Silc.pm \
+	silc/Channel.xs \
+	silc/Server.xs \
+	silc/Query.xs \
+	silc/typemap \
+	silc/module.h
+
 EXTRA_DIST = \
 	libperl_dynaloader.la \
 	libperl_orig.la \
@@ -117,29 +129,37 @@ EXTRA_DIST = \
 	irssi-core.pl \
 	$(common_sources) \
 	$(ui_sources) \
-	$(textui_sources)
+	$(textui_sources) \
+	$(silc_sources)
 
 all-local:
-	for dir in common ui textui; do \
+	for dir in $(perl_dirs); do \
 	  cd $$dir && \
 	  if [ ! -f Makefile ]; then \
-            $(perlpath) Makefile.PL $(PERL_MM_PARAMS); \
+	    $(perlpath) Makefile.PL $(PERL_MM_PARAMS); \
 	  fi && \
-	  ($(MAKE) || $(MAKE)) && \
+	  ($(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS) || \
+	   $(MAKE) CC="$(CC)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS)) && \
 	  cd ..; \
 	done
 
 install-exec-local:
-	for dir in common ui textui; do \
+	for dir in $(perl_dirs); do \
 	  cd $$dir && $(MAKE) install && cd ..; \
 	done
 
 clean-generic:
-	rm -f common/Makefile ui/Makefile textui/Makefile
+	for dir in $(perl_dirs); do \
+	  cd $$dir; \
+	  $(MAKE) clean; \
+	  cd ..; \
+	done
 
 distclean-generic:
-	-(cd common && $(MAKE) realclean && rm -f Makefile.PL)
-	-(cd ui && $(MAKE) realclean && rm -f Makefile.PL)
-	-(cd textui && $(MAKE) realclean && rm -f Makefile.PL)
+	for dir in $(perl_dirs); do \
+	  cd $$dir; \
+	  $(MAKE) realclean; rm -f Makefile.PL Makefile; \
+	  cd ..; \
+	done
 
 libperl_core_la_LIBADD = $(PERL_LDFLAGS)