From 6277ccf67fb6cee50565318e458ebedbb75b4873 Mon Sep 17 00:00:00 2001 From: ailin-nemui Date: Thu, 18 Jul 2019 18:04:42 +0200 Subject: [PATCH] manually maintain irc loader --- configure.ac | 31 ------------------------------- src/fe-common/irc/Makefile.am | 3 --- src/irc/Makefile.am | 3 --- 3 files changed, 37 deletions(-) diff --git a/configure.ac b/configure.ac index 7d35aefa..9198fd67 100644 --- a/configure.ac +++ b/configure.ac @@ -633,47 +633,16 @@ FE_COMMON_LIBS="" CHAT_LIBS="" for c in $CHAT_MODULES; do - module_inits="" - module_deinits="" - fe_module_inits="" - fe_module_deinits="" CHAT_LIBS="$CHAT_LIBS ../$c/lib$c.a ../$c/core/lib${c}_core.a" if test -f $srcdir/src/fe-common/$c/module.h; then FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/$c/libfe_common_$c.a " fi for s in `eval echo \\$${c}_MODULES`; do CHAT_LIBS="$CHAT_LIBS ../$c/$s/lib${c}_$s.a" - module_inits="$module_inits ${c}_${s}_init();" - module_deinits="${c}_${s}_deinit(); $module_deinits" if test -f $srcdir/src/fe-common/$c/$s/module.h; then FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/$c/$s/libfe_${c}_$s.a " - fe_module_inits="$fe_module_inits fe_${c}_${s}_init();" - fe_module_deinits="fe_${c}_${s}_deinit(); $fe_module_deinits" fi done - - mkdir -p src/$c - file="src/$c/$c.c" - echo "/* this file is automatically generated by configure - don't change */" > $file - echo "void ${c}_core_init(void); void ${c}_core_deinit(void);" >> $file - if test -n "$module_inits"; then - echo "$module_inits" | $sedpath -e 's/()/(void)/g' -e 's/ /void /g' >> $file - echo "$module_deinits" | $sedpath -e 's/ *$//' -e 's/()/(void)/g' -e 's/ /void /g' -e 's/^/void /' >> $file - fi - echo "void ${c}_init(void) { ${c}_core_init(); $module_inits }" >> $file - echo "void ${c}_deinit(void) { $module_deinits ${c}_core_deinit(); }" >> $file - - if test -f $srcdir/src/fe-common/$c/module.h; then - mkdir -p src/fe-common/$c - file="src/fe-common/$c/${c}-modules.c" - echo "/* this file is automatically generated by configure - don't change */" > $file - if test -n "$fe_module_inits"; then - echo "$fe_module_inits" | $sedpath -e 's/()/(void)/g' -e 's/ /void /g' >> $file - echo "$fe_module_deinits" | $sedpath -e 's/ *$//' -e 's/()/(void)/g' -e 's/ /void /g' -e 's/^/void /' >> $file - fi - echo "void fe_${c}_modules_init(void) { $fe_module_inits }" >> $file - echo "void fe_${c}_modules_deinit(void) { $fe_module_deinits }" >> $file - fi done FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/core/libfe_common_core.a" diff --git a/src/fe-common/irc/Makefile.am b/src/fe-common/irc/Makefile.am index 704de297..f14d6942 100644 --- a/src/fe-common/irc/Makefile.am +++ b/src/fe-common/irc/Makefile.am @@ -39,6 +39,3 @@ pkginc_fe_common_irc_HEADERS = \ module-formats.h DISTFILES = $(DIST_COMMON) $(real_sources) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -distclean-generic: - rm -f irc-modules.c diff --git a/src/irc/Makefile.am b/src/irc/Makefile.am index f9d3eb40..9eda2a2f 100644 --- a/src/irc/Makefile.am +++ b/src/irc/Makefile.am @@ -9,6 +9,3 @@ noinst_LIBRARIES = libirc.a libirc_a_SOURCES = irc.c DISTFILES = $(DIST_COMMON) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -distclean-generic: - rm -f irc.c