Undo some automake brain damage.

[monky] / lua / Makefile.am

diff --git a/lua/Makefile.am b/lua/Makefile.am
index e0eec9c..583249c 100644 (file)
--- a/lua/Makefile.am
+++ b/lua/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
 #
 # Please see COPYING for details
@@ -18,24 +20,27 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-libimlib2_la_SOURCES = imlib2.c
-libcairo_la_SOURCES = cairo.c
+libcairo_la_SOURCES = libcairo.c
+libimlib2_la_SOURCES = libimlib2.c
+
+EXTRA_DIST = \
+                        cairo.pkg \
+                        imlib2.pkg
 
 clean-am: clean-generic mostlyclean-am
-       rm -f $(libimlib2_la_SOURCES)
-       rm -f $(libcairo_la_SOURCES)
-       rm -f *.la *.so
+       rm -f *.la *.so *.c
 
-if BUILD_LUA 
+if BUILD_LUA
 
 if BUILD_LUA_CAIRO
+
 libcairo = libcairo.la
 
-libcairo_la_CFLAGS = $(cairo_CFLAGS) $(cairo_xlib_CFLAGS)
-libcairo_la_LIBADD = $(cairo_LIBS) $(cairo_xlib_LIBS) -ltolua++
+libcairo_la_CFLAGS = $(cairo_CFLAGS) $(cairo_xlib_CFLAGS) $(tolua_CFLAGS)
+libcairo_la_LIBADD = $(cairo_LIBS) $(cairo_xlib_LIBS) $(tolua_LIBS)
 
-cairo.c: cairo.pkg
-       ${toluapp} -n cairo -o cairo.c $(srcdir)/cairo.pkg
+libcairo.c: cairo.pkg
+       ${toluapp} -n cairo -o $@ $(srcdir)/cairo.pkg
 
 endif # BUILD_LUA_CAIRO
 
@@ -43,14 +48,16 @@ if BUILD_LUA_IMLIB2
 
 libimlib2 = libimlib2.la
 
-libimlib2_la_CFLAGS = $(Imlib2_CFLAGS)
-libimlib2_la_LIBADD = $(Imlib2_LIBS) -ltolua++
+libimlib2_la_CFLAGS = $(Imlib2_CFLAGS) $(tolua_LIBS)
+libimlib2_la_LIBADD = $(Imlib2_LIBS) $(tolua_LIBS)
 
-imlib2.c: imlib2.pkg
-       ${toluapp} -n imlib2 -o imlib2.c $(srcdir)/imlib2.pkg
+libimlib2.c: imlib2.pkg
+       ${toluapp} -n imlib2 -o $@ $(srcdir)/imlib2.pkg
 
 endif # BUILD_LUA_IMLIB2
+
 pkglib_LTLIBRARIES = $(libcairo) $(libimlib2)
 
 endif # BUILD_LUA
 
+# vi:set ts=4 sw=4 noet ai nocindent syntax=automake: