projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged silc_1_1_branch to trunk.
[silc.git]
/
apps
/
irssi
/
src
/
perl
/
Makefile.am
diff --git
a/apps/irssi/src/perl/Makefile.am
b/apps/irssi/src/perl/Makefile.am
index 10ef1c655542b878d51f5b627002bb0fccd58ee4..43a6a341ad6813834aba498830cf0d0bab067f44 100644
(file)
--- a/
apps/irssi/src/perl/Makefile.am
+++ b/
apps/irssi/src/perl/Makefile.am
@@
-2,9
+2,16
@@
LIBTOOL = $(PERL_LIBTOOL)
include $(top_srcdir)/Makefile.defines.in
include $(top_srcdir)/Makefile.defines.in
-moduledir = $(silc_modulesdir)
+moduledir = @SILC_IRSSIDIR@
+
+if SILCPLUGIN
+perl_dirs = silc
+SCRIPTDIR="$(datadir)/irssi/scripts"
+else
+perl_dirs = common ui textui silc
+SCRIPTDIR="$(datadir)/silc/scripts"
+endif
-perl_dirs = common ui textui
module_LTLIBRARIES = $(perl_module_lib) $(perl_module_fe_lib)
noinst_LTLIBRARIES = $(perl_static_lib) $(perl_static_fe_lib)
module_LTLIBRARIES = $(perl_module_lib) $(perl_module_fe_lib)
noinst_LTLIBRARIES = $(perl_static_lib) $(perl_static_fe_lib)
@@
-12,18
+19,18
@@
EXTRA_LTLIBRARIES = \
libperl_core.la libfe_perl.la \
libperl_core_static.la libfe_perl_static.la
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
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) \
-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)/silc/scripts
"\" \
+ -DSCRIPTDIR=\""$(
SCRIPTDIR)
"\" \
-DPERL_USE_LIB=\""$(PERL_USE_LIB)"\" \
-DPERL_STATIC_LIBS=$(PERL_STATIC_LIBS) \
$(PERL_CFLAGS)
-DPERL_USE_LIB=\""$(PERL_USE_LIB)"\" \
-DPERL_STATIC_LIBS=$(PERL_STATIC_LIBS) \
$(PERL_CFLAGS)
@@
-113,6
+120,15
@@
textui_sources = \
textui/typemap \
textui/module.h
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 \
EXTRA_DIST = \
libperl_dynaloader.la \
libperl_orig.la \
@@
-120,15
+136,17
@@
EXTRA_DIST = \
irssi-core.pl \
$(common_sources) \
$(ui_sources) \
irssi-core.pl \
$(common_sources) \
$(ui_sources) \
- $(textui_sources)
+ $(textui_sources) \
+ $(silc_sources)
all-local:
for dir in $(perl_dirs); do \
cd $$dir && \
if [ ! -f Makefile ]; then \
all-local:
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 && \
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
cd ..; \
done
@@
-147,7
+165,7
@@
clean-generic:
distclean-generic:
for dir in $(perl_dirs); do \
cd $$dir; \
distclean-generic:
for dir in $(perl_dirs); do \
cd $$dir; \
- $(MAKE) realclean; rm -f Makefile.PL; \
+ $(MAKE) realclean; rm -f Makefile.PL
Makefile
; \
cd ..; \
done
cd ..; \
done