Merge branch 'master' into imlib2

[monky] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 6410c0a..1e5bdca 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -35,7 +35,11 @@ endif
 conky_DEPENDENCIES = $(config_output)
 BUILT_SOURCES = $(config_output)
 CLEANFILES = $(config_output)
+if BUILD_X11
 $(config_output): ../data/conky.conf
+else
+$(config_output): ../data/conky_no_x11.conf
+endif
        sh ../text2c.sh $< $@ defconfig
 endif
 
@@ -115,6 +119,10 @@ if BUILD_IMLIB2
 imlib2 = imlib2.c imlib2.h
 endif
 
+if BUILD_APCUPSD
+apcupsd = apcupsd.c apcupsd.h
+endif
+
 conky_SOURCES = \
        $(config_output)        \
        $(config_cookie)        \
@@ -128,6 +136,7 @@ conky_SOURCES = \
        $(freebsd)              \
        fs.c                    \
        $(hddtemp)              \
+       $(apcupsd)              \
        $(linux)                \
        logging.h               \
        $(nvidia)               \
@@ -180,6 +189,8 @@ EXTRA_DIST = \
        fs.h                    \
        hddtemp.c               \
        hddtemp.h               \
+       apcupsd.c               \
+       apcupsd.h               \
        linux.c                 \
        linux.h                 \
        libmpdclient.c          \