From 8511f9a77e45307389f54afa8ddfc1e112f0f59c Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Sat, 18 Oct 2008 18:04:02 +0200 Subject: [PATCH] Fix compilation of aspell with autotools Sources are renamed with prefix "weechat-", to prevent conflict between two files called "aspell.h". --- po/POTFILES.in | 12 ++++++------ po/srcfiles.cmake | 12 ++++++------ src/plugins/aspell/CMakeLists.txt | 6 +++--- src/plugins/aspell/Makefile.am | 12 ++++++------ .../{aspell-config.c => weechat-aspell-config.c} | 6 +++--- .../{aspell-config.h => weechat-aspell-config.h} | 0 .../{aspell-speller.c => weechat-aspell-speller.c} | 4 ++-- .../{aspell-speller.h => weechat-aspell-speller.h} | 0 src/plugins/aspell/{aspell.c => weechat-aspell.c} | 6 +++--- src/plugins/aspell/{aspell.h => weechat-aspell.h} | 0 10 files changed, 29 insertions(+), 29 deletions(-) rename src/plugins/aspell/{aspell-config.c => weechat-aspell-config.c} (99%) rename src/plugins/aspell/{aspell-config.h => weechat-aspell-config.h} (100%) rename src/plugins/aspell/{aspell-speller.c => weechat-aspell-speller.c} (99%) rename src/plugins/aspell/{aspell-speller.h => weechat-aspell-speller.h} (100%) rename src/plugins/aspell/{aspell.c => weechat-aspell.c} (99%) rename src/plugins/aspell/{aspell.h => weechat-aspell.h} (100%) diff --git a/po/POTFILES.in b/po/POTFILES.in index 5d3e7d699..403e005ee 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -83,12 +83,12 @@ ./src/plugins/alias/alias.h ./src/plugins/alias/alias-info.c ./src/plugins/alias/alias-info.h -./src/plugins/aspell/aspell.c -./src/plugins/aspell/aspell.h -./src/plugins/aspell/aspell-config.c -./src/plugins/aspell/aspell-config.h -./src/plugins/aspell/aspell-speller.c -./src/plugins/aspell/aspell-speller.h +./src/plugins/aspell/weechat-aspell.c +./src/plugins/aspell/weechat-aspell.h +./src/plugins/aspell/weechat-aspell-config.c +./src/plugins/aspell/weechat-aspell-config.h +./src/plugins/aspell/weechat-aspell-speller.c +./src/plugins/aspell/weechat-aspell-speller.h ./src/plugins/charset/charset.c ./src/plugins/debug/debug.c ./src/plugins/demo/demo.c diff --git a/po/srcfiles.cmake b/po/srcfiles.cmake index 05140d3ac..7b5156af0 100644 --- a/po/srcfiles.cmake +++ b/po/srcfiles.cmake @@ -84,12 +84,12 @@ SET(WEECHAT_SOURCES ./src/plugins/alias/alias.h ./src/plugins/alias/alias-info.c ./src/plugins/alias/alias-info.h -./src/plugins/aspell/aspell.c -./src/plugins/aspell/aspell.h -./src/plugins/aspell/aspell-config.c -./src/plugins/aspell/aspell-config.h -./src/plugins/aspell/aspell-speller.c -./src/plugins/aspell/aspell-speller.h +./src/plugins/aspell/weechat-aspell.c +./src/plugins/aspell/weechat-aspell.h +./src/plugins/aspell/weechat-aspell-config.c +./src/plugins/aspell/weechat-aspell-config.h +./src/plugins/aspell/weechat-aspell-speller.c +./src/plugins/aspell/weechat-aspell-speller.h ./src/plugins/charset/charset.c ./src/plugins/debug/debug.c ./src/plugins/demo/demo.c diff --git a/src/plugins/aspell/CMakeLists.txt b/src/plugins/aspell/CMakeLists.txt index d8f31d51c..c2f190057 100644 --- a/src/plugins/aspell/CMakeLists.txt +++ b/src/plugins/aspell/CMakeLists.txt @@ -15,9 +15,9 @@ # ADD_LIBRARY(aspell MODULE -aspell.c aspell.h -aspell-config.c aspell-config.h -aspell-speller.c aspell-speller.h) +weechat-aspell.c weechat-aspell.h +weechat-aspell-config.c weechat-aspell-config.h +weechat-aspell-speller.c weechat-aspell-speller.h) SET_TARGET_PROPERTIES(aspell PROPERTIES PREFIX "") IF(ASPELL_FOUND) diff --git a/src/plugins/aspell/Makefile.am b/src/plugins/aspell/Makefile.am index 595cb97ac..26eef599e 100644 --- a/src/plugins/aspell/Makefile.am +++ b/src/plugins/aspell/Makefile.am @@ -20,11 +20,11 @@ libdir = ${weechat_libdir}/plugins lib_LTLIBRARIES = aspell.la -aspell_la_SOURCES = aspell.c \ - aspell.h \ - aspell-config.c \ - aspell-config.h \ - aspell-speller.c \ - aspell-speller.h +aspell_la_SOURCES = weechat-aspell.c \ + weechat-aspell.h \ + weechat-aspell-config.c \ + weechat-aspell-config.h \ + weechat-aspell-speller.c \ + weechat-aspell-speller.h aspell_la_LDFLAGS = -module aspell_la_LIBADD = $(ASPELL_LFLAGS) diff --git a/src/plugins/aspell/aspell-config.c b/src/plugins/aspell/weechat-aspell-config.c similarity index 99% rename from src/plugins/aspell/aspell-config.c rename to src/plugins/aspell/weechat-aspell-config.c index 661a209bb..11ad09d92 100644 --- a/src/plugins/aspell/aspell-config.c +++ b/src/plugins/aspell/weechat-aspell-config.c @@ -24,9 +24,9 @@ #include #include "../weechat-plugin.h" -#include "aspell.h" -#include "aspell-config.h" -#include "aspell-speller.h" +#include "weechat-aspell.h" +#include "weechat-aspell-config.h" +#include "weechat-aspell-speller.h" struct t_config_file *weechat_aspell_config_file = NULL; diff --git a/src/plugins/aspell/aspell-config.h b/src/plugins/aspell/weechat-aspell-config.h similarity index 100% rename from src/plugins/aspell/aspell-config.h rename to src/plugins/aspell/weechat-aspell-config.h diff --git a/src/plugins/aspell/aspell-speller.c b/src/plugins/aspell/weechat-aspell-speller.c similarity index 99% rename from src/plugins/aspell/aspell-speller.c rename to src/plugins/aspell/weechat-aspell-speller.c index f066cc64a..ca54b4643 100644 --- a/src/plugins/aspell/aspell-speller.c +++ b/src/plugins/aspell/weechat-aspell-speller.c @@ -23,8 +23,8 @@ #include #include "../weechat-plugin.h" -#include "aspell.h" -#include "aspell-speller.h" +#include "weechat-aspell.h" +#include "weechat-aspell-speller.h" struct t_aspell_speller *weechat_aspell_spellers = NULL; diff --git a/src/plugins/aspell/aspell-speller.h b/src/plugins/aspell/weechat-aspell-speller.h similarity index 100% rename from src/plugins/aspell/aspell-speller.h rename to src/plugins/aspell/weechat-aspell-speller.h diff --git a/src/plugins/aspell/aspell.c b/src/plugins/aspell/weechat-aspell.c similarity index 99% rename from src/plugins/aspell/aspell.c rename to src/plugins/aspell/weechat-aspell.c index 33628f78c..778d92647 100644 --- a/src/plugins/aspell/aspell.c +++ b/src/plugins/aspell/weechat-aspell.c @@ -26,9 +26,9 @@ #include #include "../weechat-plugin.h" -#include "aspell.h" -#include "aspell-config.h" -#include "aspell-speller.h" +#include "weechat-aspell.h" +#include "weechat-aspell-config.h" +#include "weechat-aspell-speller.h" WEECHAT_PLUGIN_NAME(ASPELL_PLUGIN_NAME); diff --git a/src/plugins/aspell/aspell.h b/src/plugins/aspell/weechat-aspell.h similarity index 100% rename from src/plugins/aspell/aspell.h rename to src/plugins/aspell/weechat-aspell.h