Added build of protocols lib, IRC protocol is now optional for build

Build of src/protocols/lib_weechat_protocols.a was added.
IRC protocol is now optional in configure and cmake builds.

4 files changed, 6 insertions, 28 deletions

diff --git a/src/gui/curses/CMakeLists.txt b/src/gui/curses/CMakeLists.txt
index 667564698..53c5bb4ee 100644
--- a/src/gui/curses/CMakeLists.txt
+++ b/src/gui/curses/CMakeLists.txt
@@ -40,7 +40,8 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
 ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
 
 ADD_EXECUTABLE(${EXECUTABLE} ${WEECHAT_CURSES_SRC})
-INCLUDE_DIRECTORIES(.. ../../common ../../protocols/irc ../../plugins)
+INCLUDE_DIRECTORIES(.. ../../common ../../protocols ../../protocols/irc
+../../plugins)
 TARGET_LINK_LIBRARIES(${EXECUTABLE} ${STATIC_LIBS} ${EXTRA_LIBS})
 
 INSTALL(TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin)
diff --git a/src/gui/curses/Makefile.am b/src/gui/curses/Makefile.am
index 8188ce434..ac5290a16 100644
--- a/src/gui/curses/Makefile.am
+++ b/src/gui/curses/Makefile.am
@@ -18,22 +18,10 @@ INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\"
 
 bin_PROGRAMS = weechat-curses
 
-if PLUGINS
-weechat_curses_LDADD = ../lib_weechat_gui_common.a \
-                       ../../common/lib_weechat_main.a \
-                       ../../protocols/irc/lib_weechat_irc.a \
-                       ../../plugins/lib_weechat_plugins.a \
+weechat_curses_LDADD = $(WEECHAT_STATIC_LIBS) \
                        $(PLUGINS_LIBS) \
                        $(NCURSES_LIBS) \
                        $(GNUTLS_LFLAGS)
-else
-weechat_curses_LDADD = ../lib_weechat_gui_common.a \
-                       ../../common/lib_weechat_main.a \
-                       ../../protocols/irc/lib_weechat_irc.a \
-                       $(PLUGINS_LIBS) \
-                       $(NCURSES_LIBS) \
-                       $(GNUTLS_LFLAGS)
-endif
 
 weechat_curses_SOURCES = gui-curses-chat.c \
                          gui-curses-color.c \
diff --git a/src/gui/gtk/CMakeLists.txt b/src/gui/gtk/CMakeLists.txt
index ac5964aee..68704769e 100644
--- a/src/gui/gtk/CMakeLists.txt
+++ b/src/gui/gtk/CMakeLists.txt
@@ -32,7 +32,8 @@ IF(PKG_CONFIG_FOUND)
 ENDIF(PKG_CONFIG_FOUND)
 
 ADD_EXECUTABLE(${EXECUTABLE} ${WEECHAT_GTK_SRC})
-INCLUDE_DIRECTORIES(.. ../../common ../../protocols/irc ../../plugins)
+INCLUDE_DIRECTORIES(.. ../../common ../../protocols ../../protocols/irc
+../../plugins)
 TARGET_LINK_LIBRARIES(${EXECUTABLE} ${STATIC_LIBS} ${EXTRA_LIBS})
 
 INSTALL(TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin)
diff --git a/src/gui/gtk/Makefile.am b/src/gui/gtk/Makefile.am
index a84db860c..c6968762f 100644
--- a/src/gui/gtk/Makefile.am
+++ b/src/gui/gtk/Makefile.am
@@ -18,22 +18,10 @@ INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\" $(GTK_CFLAGS)
 
 bin_PROGRAMS = weechat-gtk
 
-if PLUGINS
-weechat_gtk_LDADD = ../lib_weechat_gui_common.a \
-                    ../../common/lib_weechat_main.a \
-                    ../../protocols/irc/lib_weechat_irc.a \
-                    ../../plugins/lib_weechat_plugins.a \
+weechat_gtk_LDADD = $(WEECHAT_STATIC_LIBS) \
                     $(PLUGINS_LIBS) \
                     $(GTK_LIBS) \
                     $(GNUTLS_LFLAGS)
-else
-weechat_gtk_LDADD = ../lib_weechat_gui_common.a \
-                    ../../common/lib_weechat_main.a \
-                    ../../protocols/irc/lib_weechat_irc.a \
-                    $(PLUGINS_LIBS) \
-                    $(GTK_LIBS) \
-                    $(GNUTLS_LFLAGS)
-endif
 
 weechat_gtk_SOURCES = gui-gtk-chat.c \
                       gui-gtk-color.c \