outsource the whole template object machinery

[monky] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 380a724..36ab8f5 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,5 @@
+# -*- mode: Makefile; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*-
+#
 # Conky, a system monitor, based on torsmo
 #
 # Any original torsmo code is licensed under the BSD license
@@ -23,21 +25,28 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-INCLUDES = -DSYSTEM_CONFIG_FILE=\"$(sysconfdir)/conky/conky.conf\"
+INCLUDES = -DSYSTEM_CONFIG_FILE=\"$(sysconfdir)/conky/conky.conf\" -DPACKAGE_LIBDIR=\"$(pkglibdir)\"
 
 bin_PROGRAMS = conky
 
+LIBS = ${conky_LIBS}
+
 if BUILD_CONFIG_OUTPUT
 config_output = defconfig.h
-if BUILD_FOR_FOPENCOOKIE
 config_cookie = conf_cookie.c conf_cookie.h
+if BUILD_X11
+config_input = $(srcdir)/../data/conky.conf
+else
+config_input = $(srcdir)/../data/conky_no_x11.conf
 endif
+
 conky_DEPENDENCIES = $(config_output)
 BUILT_SOURCES = $(config_output)
 CLEANFILES = $(config_output)
-$(config_output): ../data/conky.conf
-       sh ../text2c.sh $< $@ defconfig
-endif
+
+$(config_output): ${config_input}
+       sh $(srcdir)/../text2c.sh ${config_input} $@ defconfig
+endif # BUILD_CONFIG_OUTPUT
 
 if BUILD_AUDACIOUS
 audacious = audacious.c audacious.h
@@ -73,7 +82,7 @@ endif
 #endif
 
 if BUILD_FREEBSD
-freebsd = freebsd.c
+freebsd = freebsd.c diskio.c
 PTHREAD_LIBS =  -pthread
 endif
 
@@ -103,10 +112,22 @@ if BUILD_EVE
 eve = eve.c eve.h
 endif
 
+if BUILD_CURL
+ccurl_thread = ccurl_thread.c ccurl_thread.h
+endif
+
 if BUILD_RSS
 rss = rss.c prss.c prss.h
 endif
 
+if BUILD_WEATHER
+weather = weather.c weather.h
+endif
+
+if BUILD_LUA
+lua = llua.c llua.h
+endif
+
 if BUILD_NVIDIA
 nvidia = nvidia.c nvidia.h
 endif
@@ -129,6 +150,8 @@ conky_SOURCES = \
        common.c                \
        conky.c                 \
        conky.h                 \
+       core.c                  \
+       core.h                  \
        $(freebsd)              \
        fs.c                    \
        $(hddtemp)              \
@@ -145,7 +168,11 @@ conky_SOURCES = \
        $(port_monitors)        \
        $(eve)                  \
        $(rss)                  \
+       $(weather)              \
+       $(lua)                  \
        $(solaris)              \
+       template.c              \
+       template.h              \
        timed_thread.c          \
        timed_thread.h          \
        mboxscan.c              \
@@ -162,8 +189,9 @@ conky_SOURCES = \
        text_object.h           \
        text_object.c           \
        algebra.h               \
-       algebra.c               \
-       $(imlib2)
+       algebra.c               \
+       $(imlib2)               \
+       $(ccurl_thread)
 
 conky_LDFLAGS = \
        $(PTHREAD_LIBS) \
@@ -194,6 +222,9 @@ EXTRA_DIST = \
        libtcp-portmon.c        \
        libtcp-portmon.h        \
        rss.h                   \
+       prss.h                  \
+       weather.h               \
+       llua.h                  \
        mail.h                  \
        mixer.h                 \
        moc.h                   \
@@ -210,6 +241,8 @@ EXTRA_DIST = \
        specials.h              \
        tailhead.c              \
        tailhead.h              \
+       template.c              \
+       template.h              \
        top.h                   \
        diskio.h                \
        x11.c                   \
@@ -221,9 +254,10 @@ EXTRA_DIST = \
        ibm.c                   \
        ibm.h                   \
        sony.h                  \
-       users.c                 \
-       imlib2.c                \
-       imlib2.h
+       users.c                 \
+       imlib2.c                \
+       imlib2.h                \
+       ccurl_thread.h
 
 
-# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
+# vi:set ts=4 sw=4 noet ai nocindent syntax=automake: