Merge branch 'master' into imlib2

[monky] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 4957766..1e5bdca 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,7 @@
 # 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)
+# Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS)
 # All rights reserved.
 #
 # This program is free software: you can redistribute it and/or modify
@@ -35,7 +35,11 @@ endif
 conky_DEPENDENCIES = $(config_output)
 BUILT_SOURCES = $(config_output)
 CLEANFILES = $(config_output)
-$(config_output): ../doc/conky.conf
+if BUILD_X11
+$(config_output): ../data/conky.conf
+else
+$(config_output): ../data/conky_no_x11.conf
+endif
        sh ../text2c.sh $< $@ defconfig
 endif
 
@@ -64,7 +68,7 @@ xmms2 = xmms2.c
 endif
 
 if BUILD_LINUX
-linux = linux.c top.c diskio.c users.c
+linux = linux.c top.c diskio.c users.c sony.c
 PTHREAD_LIBS =  -lpthread
 endif
 
@@ -111,38 +115,47 @@ if BUILD_NVIDIA
 nvidia = nvidia.c nvidia.h
 endif
 
-conky_SOURCES =                \
+if BUILD_IMLIB2
+imlib2 = imlib2.c imlib2.h
+endif
+
+if BUILD_APCUPSD
+apcupsd = apcupsd.c apcupsd.h
+endif
+
+conky_SOURCES = \
        $(config_output)        \
        $(config_cookie)        \
        $(audacious)            \
        $(bmpx)                 \
        colours.c               \
        colours.h               \
-       common.c                \
+       common.c                \
        conky.c                 \
        conky.h                 \
        $(freebsd)              \
-       fs.c                    \
-       $(hddtemp)              \
-       $(linux)                \
+       fs.c                    \
+       $(hddtemp)              \
+       $(apcupsd)              \
+       $(linux)                \
        logging.h               \
-       $(nvidia)               \
-       mail.c                  \
-       mixer.c                 \
+       $(nvidia)               \
+       mail.c                  \
+       mixer.c                 \
        $(mpd)                  \
-  $(moc) \
+       $(moc)                  \
        $(netbsd)               \
        $(openbsd)              \
        $(port_monitors)        \
-       $(eve)                  \
-       $(rss)                  \
-       $(solaris)              \
-       timed_thread.c          \
-       timed_thread.h          \
-       mboxscan.c              \
-       mboxscan.h              \
+       $(eve)                  \
+       $(rss)                  \
+       $(solaris)              \
+       timed_thread.c          \
+       timed_thread.h          \
+       mboxscan.c              \
+       mboxscan.h              \
        $(x11)                  \
-       $(xmms2)                \
+       $(xmms2)                \
        $(ibm)                  \
        specials.c              \
        specials.h              \
@@ -153,62 +166,68 @@ conky_SOURCES =           \
        text_object.h           \
        text_object.c           \
        algebra.h               \
-       algebra.c
+       algebra.c               \
+       $(imlib2)
 
-conky_LDFLAGS =                                \
-       $(PTHREAD_LIBS)                         \
+conky_LDFLAGS = \
+       $(PTHREAD_LIBS) \
        -lm
 
-EXTRA_DIST =                   \
+EXTRA_DIST = \
        $(config_output)        \
        $(config_cookie)        \
-       audacious.c             \
-       audacious.h             \
-       bmpx.c                  \
+       audacious.c             \
+       audacious.h             \
+       bmpx.c                  \
        colours.c               \
        colours.h               \
-       common.h                \
+       common.h                \
        fonts.c                 \
        fonts.h                 \
-       freebsd.c               \
-       freebsd.h               \
-       fs.h                    \
-       hddtemp.c               \
-       hddtemp.h               \
-       linux.c                 \
-       linux.h                 \
+       freebsd.c               \
+       freebsd.h               \
+       fs.h                    \
+       hddtemp.c               \
+       hddtemp.h               \
+       apcupsd.c               \
+       apcupsd.h               \
+       linux.c                 \
+       linux.h                 \
        libmpdclient.c          \
        libmpdclient.h          \
-       libtcp-portmon.c        \
-       libtcp-portmon.h        \
-       rss.h                   \
-       mail.h                  \
-       mixer.h                 \
-       moc.h                   \
-       moc.c                   \
-       mpd.c                   \
-       mpd.h                   \
-       netbsd.c                \
-       nvidia.c                \
-       nvidia.h                \
-       openbsd.c               \
-       openbsd.h               \
-       solaris.c               \
+       libtcp-portmon.c        \
+       libtcp-portmon.h        \
+       rss.h                   \
+       mail.h                  \
+       mixer.h                 \
+       moc.h                   \
+       moc.c                   \
+       mpd.c                   \
+       mpd.h                   \
+       netbsd.c                \
+       nvidia.c                \
+       nvidia.h                \
+       openbsd.c               \
+       openbsd.h               \
+       solaris.c               \
        specials.c              \
        specials.h              \
        tailhead.c              \
        tailhead.h              \
        top.h                   \
        diskio.h                \
-       x11.c                   \
-       x11.h                   \
+       x11.c                   \
+       x11.h                   \
        xmms2.c                 \
        xmms2.h                 \
-       smapi.c                 \
+       smapi.c                 \
        smapi.h                 \
        ibm.c                   \
        ibm.h                   \
-       users.c
+       sony.h                  \
+       users.c                 \
+       imlib2.c                \
+       imlib2.h
 
 
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake: