diff options
| author | TingPing <tingping@tingping.se> | 2014-01-30 02:01:42 -0500 |
|---|---|---|
| committer | TingPing <tingping@tingping.se> | 2014-01-30 02:01:42 -0500 |
| commit | 83bf77f4d0bfde6345ed31b6d5ce140088bba826 (patch) | |
| tree | e22693860b0debb89055c05155860c0dc9796ebf | |
| parent | 9ec4aa897a4d498c426e8cbebb6f78985363f577 (diff) | |
More autotools cleanup
- Don't build msproxy if unused - Add resources to cleanfiles - Remove old extra_dist from plugins
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | plugins/Makefile.am | 8 | ||||
| -rw-r--r-- | src/common/Makefile.am | 6 | ||||
| -rw-r--r-- | src/fe-gtk/Makefile.am | 4 |
4 files changed, 11 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 699937c3..37ad4d9c 100644 --- a/configure.ac +++ b/configure.ac @@ -600,6 +600,7 @@ dnl ********************************************************************* AM_CONDITIONAL(USE_OPENSSL, test "x$openssl" = "xyes") AM_CONDITIONAL(USE_LIBNOTIFY, test "x$libnotify" = "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_GTK, test "x$gtkfe" = "xyes") AM_CONDITIONAL(DO_PERL, test "x$perl" = "xyes") diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 99a43515..0b7dcc77 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -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 pythondir = python endif @@ -27,5 +22,4 @@ if DO_SYSINFO sysinfodir = sysinfo endif -#SUBDIRS = . $(pythondir) $(perldir) mailcheck xdcc -SUBDIRS = . $(pythondir) $(perldir) $(checksumdir) $(doatdir) $(fishlimdir) $(sysinfodir) +SUBDIRS = $(pythondir) $(perldir) $(checksumdir) $(doatdir) $(fishlimdir) $(sysinfodir) diff --git a/src/common/Makefile.am b/src/common/Makefile.am index ca1eaba3..9c2d443e 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -44,6 +44,10 @@ if USE_OPENSSL ssl_c = ssl.c endif +if USE_MSPROXY +msproxy_c = msproxy.c +endif + if USE_DBUS dbusdir = dbus libhexchatcommon_a_LIBADD = \ @@ -58,7 +62,7 @@ endif noinst_PROGRAMS = make-te 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 \ $(ssl_c) text.c tree.c url.c userlist.c util.c libhexchatcommon_a_CFLAGS = $(LIBPROXY_CFLAGS) diff --git a/src/fe-gtk/Makefile.am b/src/fe-gtk/Makefile.am index 2e95232e..5a622fa0 100644 --- a/src/fe-gtk/Makefile.am +++ b/src/fe-gtk/Makefile.am @@ -14,6 +14,10 @@ EXTRA_DIST = \ sexy-spell-entry.h sexy-marshal.h textgui.h urlgrab.h userlistgui.h xtext.h \ ../../data/hexchat.gresource.xml +BUILT_SOURCES = resources.c + +CLEANFILES = $(BUILT_SOURCES) + if DO_PLUGIN plugingui_c = plugingui.c endif |