Fix for buffer overflow with $execi (thanks Cesare)

[monky] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7dfcc3a..52df82e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,61 +1,51 @@
-bin_PROGRAMS = conky
-
-if BUILD_SETI
-seti = seti.c
-endif
-
-if BUILD_MPD
-mpd = mpd.c libmpdclient.c
-endif
-
-if BUILD_LINUX
-linux = linux.c
-endif
-
-if BUILD_SOLARIS
-solaris = solaris.c
-endif
-
-if BUILD_FREEBSD
-freebsd = freebsd.c
-endif
-
-if BUILD_NETBSD
-netbsd = netbsd.c
-endif
-
-if BUILD_CAIRO
-cairo = cairo.c
-endif
-
-if BUILD_METAR
-metar = ftp.c metarinfo.c
-METAR_LIBS = -lmetar
-endif
-
-if BUILD_MLDONKEY
-mldonkey = mldonkey.c
-endif
-
-if BUILD_X11
-x11 = x11.c
-endif
-
-conky_SOURCES = common.c fs.c top.c $(linux) mail.c mixer.c $(seti) $(mpd) \
-       $(solaris) $(freebsd) $(netbsd) $(cairo) conky.c conky.h $(x11) $(metar) \
-       $(mldonkey) remoted.c remoted.h remotec.c remotec.h
-
-conky_LDFLAGS = $(X11_LIBS) $(XFT_LIBS) $(CAIRO_LIBS)
-
-conky_LDADD = $(METAR_LIBS)
-
-man_MANS = conky.1
-
-LIBS = -lm -lpthread
-
-# conky.1 is in EXTRA_DIST in case that someone doesn't have help2man
-EXTRA_DIST = conkyrc.sample conky.1 conky.x \
-             app-admin/conky/conky-1.2.ebuild
-
-EXTRA_conky_SOURCES = seti.c linux.c solaris.c freebsd.c netbsd.c mpd.c libmpdclient.c \
-cairo.c libmpdclient.h top.h mldonkey.c ftp.c metarinfo.c ftp.h metarinfo.h x11.c
\ No newline at end of file
+# Conky, a system monitor, based on torsmo
+#
+# Any original torsmo code is licensed under the BSD license
+#
+# All code written since the fork of torsmo is licensed under the GPL
+#
+# Please see COPYING for details
+#
+# Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
+# Copyright (c) 2005-2007 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS)
+# All rights reserved.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# $Id$
+
+SUBDIRS =                                      \
+       src                                     \
+       doc                                     \
+       data
+
+AUTOMAKE_OPTIONS =                             \
+       1.8                                     \
+       dist-bzip2
+
+EXTRA_DIST =                                   \
+       autogen.sh                              \
+       configure.ac.in                         \
+       config.rpath                            \
+       extras/nano/README                      \
+       extras/nano/conky.nanorc                \
+       extras/vim/README                       \
+       extras/vim/ftdetect/conkyrc.vim         \
+       extras/vim/syntax/conkyrc.vim
+
+ACLOCAL_AMFLAGS = -I m4
+
+distclean-local:
+       /bin/rm -rf *.cache *~
+
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake: