enables images (via imlib2) -- thanks dbrodie!

[monky] / debian / rules

diff --git a/debian/rules b/debian/rules
index cd528af..bbc364d 100644 (file)
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 # -*- makefile -*-
 
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -12,7 +12,7 @@ DEB_HOST_ARCH_OS    ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 DEB_HOST_ARCH_CPU   ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 
 CFLAGS = -Wall -g
-LDFLAGS = -Wl,--as-needed
+LDFLAGS = -Wl,--as-needed -ldbus-1
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
        CFLAGS += -O0
@@ -44,14 +44,14 @@ configure: config-stamp
 
 config-stamp:
        dh_testdir
-
-       chmod +x ./autogen.sh
+#DML#  chmod +x ./autogen.sh
        AUTOMAKE=automake ./autogen.sh
 
-       ln -sf /usr/share/misc/config.sub .
-       ln -sf /usr/share/misc/config.guess .
+# copy these instead
+#      ln -sf /usr/share/misc/config.sub .
+#      ln -sf /usr/share/misc/config.guess .
 
-       mkdir build-std build-cli build-all
+       mkdir build-all
 
 #DML#          cd build-std && CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
 #DML#          ../configure $(COMMON_CONFIGURE_FLAGS) $(LINUX_CONF_ARGS_STD)
@@ -65,9 +65,9 @@ config-stamp:
 
        cd build-all && CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
        ../configure $(COMMON_CONFIGURE_FLAGS) \
-       --enable-imlib2=no --enable-rss --enable-weather-xoap \
-       --enable-eve --enable-lua=no --enable-lua-cairo=no --enable-lua-imlib2=no \
-       --disable-static --enable-argb \
+        --enable-rss --enable-weather-xoap \
+       --enable-eve --enable-lua=yes --enable-lua-cairo=no --enable-lua-imlib2=no \
+       --disable-static --enable-argb --enable-x11 --enable-imlib2 \
        $(LINUX_CONF_ARGS_ALL) $(ENABLE_NVIDIA)
 
        touch $@
@@ -108,20 +108,20 @@ install: build
 
 #DML#  cd build-std && $(MAKE) install DESTDIR=$(CURDIR)/debian/conky-std
 #DML#  cd build-cli && $(MAKE) install DESTDIR=$(CURDIR)/debian/conky-cli
-       cd build-all && $(MAKE) install DESTDIR=$(CURDIR)/debian/conky-all
-       mkdir -p debian/conky-all/usr/share/icons/hicolor/scalable/apps/
-       cp -p debian/conkylogo64.png debian/conky-all/usr/share/icons/hicolor/scalable/apps/conky.png
-       mkdir -p debian/conky-all/usr/share/icons/hicolor/48x48/apps/
-       cp -p debian/conkylogo48.png debian/conky-all/usr/share/icons/hicolor/48x48/apps/conky.png
-       mkdir -p debian/conky-all/usr/share/applications/hildon/
-       cp -p debian/conky.desktop debian/conky-all/usr/share/applications/hildon/conky.desktop
-       mkdir -p debian/conky-all/usr/bin/
-       cp -p debian/conky.sh debian/conky-all/usr/bin/
+       cd build-all && $(MAKE) install DESTDIR=$(CURDIR)/debian/conky-n900
+       mkdir -p debian/conky-n900/usr/share/icons/hicolor/scalable/apps/
+       cp -p debian/conkylogo64.png debian/conky-n900/usr/share/icons/hicolor/scalable/apps/conky.png
+       mkdir -p debian/conky-n900/usr/share/icons/hicolor/48x48/apps/
+       cp -p debian/conkylogo48.png debian/conky-n900/usr/share/icons/hicolor/48x48/apps/conky.png
+       mkdir -p debian/conky-n900/usr/share/applications/hildon/
+       cp -p debian/conky.desktop debian/conky-n900/usr/share/applications/hildon/conky.desktop
+       mkdir -p debian/conky-n900/usr/bin/
+       cp -p debian/conky.sh debian/conky-n900/usr/bin/
 
        # Clean up cruft left upstream
        rm -rf debian/conky-std/usr/lib debian/conky-cli/usr/lib \
-              debian/conky-all/usr/lib/conky/*.la \
-              debian/conky-all/usr/lib/conky/*.so.?
+              debian/conky-n900/usr/lib/conky/*.la \
+              debian/conky-n900/usr/lib/conky/*.so.?
 
 binary-indep: build install