fix to detect n900 battery; add support to built in battery variables to work with...

[monky] / lua / Makefile.am

diff --git a/lua/Makefile.am b/lua/Makefile.am
index dbf9ae3..45aeac5 100644 (file)
--- a/lua/Makefile.am
+++ b/lua/Makefile.am
@@ -1,8 +1,10 @@
+# -*- mode: Makefile; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*-
+#
 # Conky, a system monitor, based on torsmo
 #
 # Please see COPYING for details
 #
-# Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS)
+# Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS)
 # All rights reserved.
 #
 # This program is free software: you can redistribute it and/or modify
@@ -18,44 +20,44 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-libimlib2_la_SOURCES = imlib2.c
-libcairo_la_SOURCES = cairo.c
 
-EXTRA_DIST = \
-                        cairo.pkg \
-                        imlib2.pkg
+if BUILD_LUA
 
-clean-am: clean-generic mostlyclean-am
-       rm -f $(libimlib2_la_SOURCES)
-       rm -f $(libcairo_la_SOURCES)
-       rm -f *.la *.so
+if BUILD_LUA_CAIRO
 
-if BUILD_LUA 
+libcairo_built_sources = libcairo.c
 
-if BUILD_LUA_CAIRO
 libcairo = libcairo.la
 
-libcairo_la_CFLAGS = $(cairo_CFLAGS) $(cairo_xlib_CFLAGS) -I$(prefix)/include/lua5.1
-libcairo_la_LIBADD = $(cairo_LIBS) $(cairo_xlib_LIBS) $(tolua_LIBS)
+libcairo.c: cairo.pkg
+       ${toluapp} -n cairo -o $@ $(srcdir)/cairo.pkg
 
-cairo.c: cairo.pkg
-       ${toluapp} -n cairo -o cairo.c $(srcdir)/cairo.pkg
+libcairo_la_CFLAGS = $(cairo_CFLAGS) $(cairo_xlib_CFLAGS) $(tolua_CFLAGS)
+libcairo_la_LIBADD = $(cairo_LIBS) $(cairo_xlib_LIBS) $(tolua_LIBS)
+libcairo_la_SOURCES = cairo.pkg libcairo-helper.h libcairo.c
 
 endif # BUILD_LUA_CAIRO
 
 if BUILD_LUA_IMLIB2
 
+libimlib2_built_sources = libimlib2.c
+
 libimlib2 = libimlib2.la
 
-libimlib2_la_CFLAGS = $(Imlib2_CFLAGS) -I$(prefix)/include/lua5.1
-libimlib2_la_LIBADD = $(Imlib2_LIBS) $(tolua_LIBS)
+libimlib2.c: imlib2.pkg
+       ${toluapp} -n imlib2 -o $@ $(srcdir)/imlib2.pkg
 
-imlib2.c: imlib2.pkg
-       ${toluapp} -n imlib2 -o imlib2.c $(srcdir)/imlib2.pkg
+libimlib2_la_CFLAGS = $(Imlib2_CFLAGS) $(tolua_CFLAGS)
+libimlib2_la_LIBADD = $(Imlib2_LIBS) $(tolua_LIBS)
+libimlib2_la_SOURCES = imlib2.pkg libimlib2.c
 
 endif # BUILD_LUA_IMLIB2
+
 pkglib_LTLIBRARIES = $(libcairo) $(libimlib2)
 
 endif # BUILD_LUA
 
+EXTRA_DIST = libcairo-helper.h
+BUILT_SOURCES = $(cairo_built_sources) $(imlib2_built_sources)
+
 # vi:set ts=4 sw=4 noet ai nocindent syntax=automake: