Make cstyle.pl(1) happy.

[monky] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 474e7db..828422b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,25 @@
 bin_PROGRAMS = conky
 
+if BUILD_XMMS
+xmms = xmms.c xmms.h
+endif
+
+if BUILD_BMP
+xmms = xmms.c xmms.h
+endif
+
+if BUILD_AUDACIOUS
+xmms = xmms.c xmms.h
+endif
+
+if BUILD_INFOPIPE
+xmms = xmms.c xmms.h
+endif
+
+if BUILD_BMPX
+bmpx = bmpx.c
+endif
+
 if BUILD_SETI
 seti = seti.c
 endif
@@ -9,7 +29,8 @@ mpd = mpd.c libmpdclient.c
 endif
 
 if BUILD_LINUX
-linux = linux.c
+linux = linux.c top.c
+PTHREAD_LIBS =  -lpthread
 endif
 
 if BUILD_SOLARIS
@@ -18,14 +39,15 @@ endif
 
 if BUILD_FREEBSD
 freebsd = freebsd.c
+PTHREAD_LIBS =  -pthread
 endif
 
 if BUILD_NETBSD
 netbsd = netbsd.c
 endif
 
-if BUILD_CAIRO
-cairo = cairo.c
+if BUILD_PORT_MONITORS
+port_monitors = libtcp-portmon.h libtcp-portmon.c hash.h hash.c
 endif
 
 if BUILD_MLDONKEY
@@ -36,13 +58,9 @@ 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) $(mldonkey) remoted.c remoted.h remotec.c remotec.h
-
-AM_LDFLAGS = $(X11_LIBS) $(XFT_LIBS) $(CAIRO_LIBS)
-
-LDADD = $(METAR_LIBS)
+conky_SOURCES = common.c fs.c $(linux) mail.c mixer.c $(seti) $(mpd) $(solaris) $(freebsd) $(netbsd) $(port_monitors) conky.c conky.h $(x11) $(mldonkey) remoted.c remoted.h remotec.c remotec.h $(xmms) $(bmpx)
 
-LIBS = -lm -lpthread
+AM_LDFLAGS = $(X11_LIBS) $(XFT_LIBS) $(CAIRO_LIBS) $(PTHREAD_LIBS) -lm
 
 EXTRA_DIST = seti.c linux.c solaris.c freebsd.c netbsd.c mpd.c libmpdclient.c \
-cairo.c libmpdclient.h top.h mldonkey.c ftp.c ftp.h x11.c
+libmpdclient.h top.h mldonkey.c ftp.c ftp.h x11.c