Merge branch 'master' into imlib2

[monky] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 1e5bdca..794b351 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -111,6 +111,10 @@ if BUILD_RSS
 rss = rss.c prss.c prss.h
 endif
 
+if BUILD_LUA
+lua = llua.c llua.h
+endif
+
 if BUILD_NVIDIA
 nvidia = nvidia.c nvidia.h
 endif
@@ -149,6 +153,7 @@ conky_SOURCES = \
        $(port_monitors)        \
        $(eve)                  \
        $(rss)                  \
+       $(lua)                  \
        $(solaris)              \
        timed_thread.c          \
        timed_thread.h          \
@@ -198,6 +203,7 @@ EXTRA_DIST = \
        libtcp-portmon.c        \
        libtcp-portmon.h        \
        rss.h                   \
+       llua.h                  \
        mail.h                  \
        mixer.h                 \
        moc.h                   \