iiiypuk/hexchat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More autotools cleanup

Browse Source 
- Don't build msproxy if unused
- Add resources to cleanfiles
- Remove old extra_dist from plugins
This commit is contained in:
TingPing 2014-01-30 02:01:42 -05:00
parent 9ec4aa897a
commit 83bf77f4d0
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -600,6 +600,7 @@ dnl *********************************************************************
AM_CONDITIONAL(USE_OPENSSL, test "x$openssl" = "xyes") AM_CONDITIONAL(USE_OPENSSL, test "x$openssl" = "xyes")
AM_CONDITIONAL(USE_LIBNOTIFY, test "x$libnotify" = "xyes") AM_CONDITIONAL(USE_LIBNOTIFY, test "x$libnotify" = "xyes")
AM_CONDITIONAL(USE_LIBCANBERRA, test "x$libcanberra" = "xyes") AM_CONDITIONAL(USE_LIBCANBERRA, test "x$libcanberra" = "xyes")
AM_CONDITIONAL(USE_MSPROXY, test "x$ntlm" = "xyes")
AM_CONDITIONAL(DO_TEXT, test "x$textfe" = "xyes") AM_CONDITIONAL(DO_TEXT, test "x$textfe" = "xyes")
AM_CONDITIONAL(DO_GTK, test "x$gtkfe" = "xyes") AM_CONDITIONAL(DO_GTK, test "x$gtkfe" = "xyes")
AM_CONDITIONAL(DO_PERL, test "x$perl" = "xyes") AM_CONDITIONAL(DO_PERL, test "x$perl" = "xyes")

8
plugins/Makefile.am
View File

@ -1,8 +1,3 @@
# temp. solution while mailcheck & xdcc arn't in SUBDIRS
EXTRA_DIST = Make.plugin plugin-conf.in xdcc/xdcc.c xdcc/Makefile.am
# noinst_HEADERS = hexchat-plugin.h
if DO_PYTHON if DO_PYTHON
pythondir = python pythondir = python
endif endif
@ -27,5 +22,4 @@ if DO_SYSINFO
sysinfodir = sysinfo sysinfodir = sysinfo
endif endif
#SUBDIRS = . $(pythondir) $(perldir) mailcheck xdcc SUBDIRS = $(pythondir) $(perldir) $(checksumdir) $(doatdir) $(fishlimdir) $(sysinfodir)
SUBDIRS = . $(pythondir) $(perldir) $(checksumdir) $(doatdir) $(fishlimdir) $(sysinfodir)

6
src/common/Makefile.am
View File

@ -44,6 +44,10 @@ if USE_OPENSSL
ssl_c = ssl.c ssl_c = ssl.c
endif endif
if USE_MSPROXY
msproxy_c = msproxy.c
endif
if USE_DBUS if USE_DBUS
dbusdir = dbus dbusdir = dbus
libhexchatcommon_a_LIBADD = \ libhexchatcommon_a_LIBADD = \
@ -58,7 +62,7 @@ endif
noinst_PROGRAMS = make-te noinst_PROGRAMS = make-te
libhexchatcommon_a_SOURCES = cfgfiles.c chanopt.c ctcp.c dcc.c hexchat.c \ libhexchatcommon_a_SOURCES = cfgfiles.c chanopt.c ctcp.c dcc.c hexchat.c \
history.c ignore.c inbound.c modes.c msproxy.c network.c notify.c \ history.c ignore.c inbound.c modes.c $(msproxy_c) network.c notify.c \
outbound.c plugin.c plugin-timer.c proto-irc.c server.c servlist.c \ outbound.c plugin.c plugin-timer.c proto-irc.c server.c servlist.c \
$(ssl_c) text.c tree.c url.c userlist.c util.c $(ssl_c) text.c tree.c url.c userlist.c util.c
libhexchatcommon_a_CFLAGS = $(LIBPROXY_CFLAGS) libhexchatcommon_a_CFLAGS = $(LIBPROXY_CFLAGS)

4
src/fe-gtk/Makefile.am
View File

@ -14,6 +14,10 @@ EXTRA_DIST = \
sexy-spell-entry.h sexy-marshal.h textgui.h urlgrab.h userlistgui.h xtext.h \ sexy-spell-entry.h sexy-marshal.h textgui.h urlgrab.h userlistgui.h xtext.h \
../../data/hexchat.gresource.xml ../../data/hexchat.gresource.xml
BUILT_SOURCES = resources.c
CLEANFILES = $(BUILT_SOURCES)
if DO_PLUGIN if DO_PLUGIN
plugingui_c = plugingui.c plugingui_c = plugingui.c
endif endif