Merge branch 'master' into imlib2

[monky] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 7066e9f..1e5bdca 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -115,6 +115,10 @@ if BUILD_NVIDIA
 nvidia = nvidia.c nvidia.h
 endif
 
+if BUILD_IMLIB2
+imlib2 = imlib2.c imlib2.h
+endif
+
 if BUILD_APCUPSD
 apcupsd = apcupsd.c apcupsd.h
 endif
@@ -162,7 +166,8 @@ conky_SOURCES = \
        text_object.h           \
        text_object.c           \
        algebra.h               \
-       algebra.c
+       algebra.c               \
+       $(imlib2)
 
 conky_LDFLAGS = \
        $(PTHREAD_LIBS) \
@@ -220,7 +225,9 @@ EXTRA_DIST = \
        ibm.c                   \
        ibm.h                   \
        sony.h                  \
-       users.c
+       users.c                 \
+       imlib2.c                \
+       imlib2.h
 
 
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake: