Reformatted all code

[monky] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index c13e4e5..2597978 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,32 @@
+# 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$
+
+INCLUDES =                     \
+       -DSYSTEM_CONFIG_FILE=\"$(sysconfdir)/conky/conky.conf\"
+
 bin_PROGRAMS = conky
 
 if BUILD_AUDACIOUS
@@ -17,7 +46,7 @@ xmms2 = xmms2.c
 endif
 
 if BUILD_LINUX
-linux = linux.c top.c
+linux = linux.c top.c diskio.c
 PTHREAD_LIBS =  -lpthread
 endif
 
@@ -26,7 +55,7 @@ endif
 #endif
 
 if BUILD_FREEBSD
-freebsd = freebsd.c
+freebsd = freebsd.c diskio.c
 PTHREAD_LIBS =  -pthread
 endif
 
@@ -52,7 +81,7 @@ hddtemp = hddtemp.c
 endif
 
 if BUILD_RSS
-rss = rss.c
+rss = rss.c prss.c prss.h
 endif
 
 conky_SOURCES =                \
@@ -78,7 +107,7 @@ conky_SOURCES =              \
        mboxscan.c              \
        mboxscan.h              \
        $(x11)                  \
-       $(xmms2) 
+       $(xmms2)
 
 AM_LDFLAGS = $(PTHREAD_LIBS) -lm
 
@@ -98,6 +127,7 @@ EXTRA_DIST =                         \
        openbsd.c               \
        solaris.c               \
        top.h                   \
+       diskio.h                \
        x11.c                   \
        xmms2.c