harmattan version.

[monky] / debian / rules

diff --git a/debian/rules b/debian/rules
index bbc364d..b12ba3a 100644 (file)
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,8 @@ DEB_HOST_ARCH_CPU   ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 
 CFLAGS = -Wall -g
 LDFLAGS = -Wl,--as-needed -ldbus-1
+# CFLAGS += `pkg-config --cflags gtk+-2.0`
+# LDFLAGS += `pkg-config --libs gtk+-2.0`
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
        CFLAGS += -O0
@@ -53,20 +55,10 @@ config-stamp:
 
        mkdir build-all
 
-#DML#          cd build-std && CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
-#DML#          ../configure $(COMMON_CONFIGURE_FLAGS) $(LINUX_CONF_ARGS_STD)
-
-#DML#  cd build-cli && CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
-#DML#  ../configure $(COMMON_CONFIGURE_FLAGS) \
-#DML#  --disable-lua --disable-double-buffer --disable-x11 \
-#DML#  --disable-xdamage --disable-own-window --disable-xft \
-#DML#  --disable-hddtemp --disable-alsa --disable-portmon \
-#DML#  --enable-ncurses
-
        cd build-all && CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
        ../configure $(COMMON_CONFIGURE_FLAGS) \
-        --enable-rss --enable-weather-xoap \
-       --enable-eve --enable-lua=yes --enable-lua-cairo=no --enable-lua-imlib2=no \
+        --enable-rss --enable-weather-xoap LUA51_LIBS='-llua5.1 -lm' \
+       --enable-eve --enable-lua=yes --enable-lua-cairo --enable-lua-imlib2 \
        --disable-static --enable-argb --enable-x11 --enable-imlib2 \
        $(LINUX_CONF_ARGS_ALL) $(ENABLE_NVIDIA)
 
@@ -77,8 +69,6 @@ build: build-stamp
 build-stamp: config-stamp
        dh_testdir
 
-#DML#  cd build-std && $(MAKE)
-#DML#  cd build-cli && $(MAKE)
        cd build-all && $(MAKE)
 
        touch $@
@@ -91,7 +81,7 @@ clean:
 
        rm  -f configure.ac configure config.h.in src/config.h.in \
               src/defconfig.h compile install-sh missing ltmain.sh depcomp \
-              Makefile.in doc/Makefile.in src/Makefile.in \
+              Makefile.in doc/Makefile.in src/Makefile.in  src/dbus/Makefile.in \
               data/Makefile.in lua/Makefile.in \
               aclocal.m4 m4/libtool.m4 m4/ltversion.m4 \
               m4/lt~obsolete.m4 m4/ltoptions.m4 m4/ltsugar.m4
@@ -106,22 +96,20 @@ install: build
        dh_testroot
        dh_clean -k 
 
-#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-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/
+       cd build-all && $(MAKE) install DESTDIR=$(CURDIR)/debian/conky-n950
+       mkdir -p debian/conky-n950/usr/share/icons/hicolor/scalable/apps/
+       cp -p debian/conkylogo64.png debian/conky-n950/usr/share/icons/hicolor/scalable/apps/conky.png
+       mkdir -p debian/conky-n950/usr/share/icons/hicolor/48x48/apps/
+       cp -p debian/conkylogo48.png debian/conky-n950/usr/share/icons/hicolor/48x48/apps/conky.png
+       mkdir -p debian/conky-n950/usr/share/applications/
+       cp -p debian/conky.desktop debian/conky-n950/usr/share/applications/conky.desktop
+       mkdir -p debian/conky-n950/usr/bin/
+       cp -p debian/conky.sh debian/conky-n950/usr/bin/
 
        # Clean up cruft left upstream
        rm -rf debian/conky-std/usr/lib debian/conky-cli/usr/lib \
-              debian/conky-n900/usr/lib/conky/*.la \
-              debian/conky-n900/usr/lib/conky/*.so.?
+              debian/conky-n950/usr/lib/conky/*.la \
+              debian/conky-n950/usr/lib/conky/*.so.?
 
 binary-indep: build install
 
@@ -140,7 +128,6 @@ binary-arch: build install
        dh_installdeb
        dh_shlibdeps
        dh_gencontrol
-       maemo-optify
        dh_md5sums
        dh_builddeb