update icons paths

diff --git a/Makefile b/Makefile
index 1315396..b8ad2ae 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,104 +1,77 @@
 #############################################################################
 # Makefile for building: bootscreen
-# Generated by qmake (2.01a) (Qt 4.6.2) on: Sun Feb 28 16:52:17 2010
+# Generated by qmake (2.01a) (Qt 4.6.2) on: Thu Mar 11 01:21:47 2010
 # Project:  bootscreen.pro
-# Template: app
-# Command: /opt/qt4-maemo5/bin/qmake-qt4 -unix -o Makefile bootscreen.pro
+# Template: subdirs
+# Command: /usr/bin/qmake -unix -o Makefile bootscreen.pro
 #############################################################################
 
-####### Compiler, tools and options
-
-CC            = gcc
-CXX           = g++
-DEFINES       = -DQT_GL_NO_SCISSOR_TEST -DQT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH=1024 -DQT_NO_DEBUG -DQT_MAEMO5_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
-CFLAGS        = -pipe -O3 -fno-omit-frame-pointer -fno-optimize-sibling-calls -Wall -W -D_REENTRANT $(DEFINES)
-CXXFLAGS      = -pipe -O3 -fno-omit-frame-pointer -fno-optimize-sibling-calls -Wall -W -D_REENTRANT $(DEFINES)
-INCPATH       = -I/targets/FREMANTLE_ARMEL/opt/qt4-maemo5/mkspecs/linux-g++-maemo5 -I. -I/targets/FREMANTLE_ARMEL/opt/qt4-maemo5/include/QtCore -I/targets/FREMANTLE_ARMEL/opt/qt4-maemo5/include/QtGui -I/targets/FREMANTLE_ARMEL/opt/qt4-maemo5/include/QtMaemo5 -I/targets/FREMANTLE_ARMEL/opt/qt4-maemo5/include -I.
-LINK          = g++
-LFLAGS        = -Wl,-rpath-link,/usr/lib -Wl,-O1 -Wl,--hash-style=gnu -Wl,-rpath,/opt/qt4-maemo5/lib
-LIBS          = $(SUBLIBS)  -L/opt/qt4-maemo5/lib -lQtMaemo5 -L/opt/qt4-maemo5/lib -L/usr/X11R6/lib -lQtDBus -lQtXml -lQtGui -lQtCore -lpthread 
-AR            = ar cqs
-RANLIB        = 
-QMAKE         = /opt/qt4-maemo5/bin/qmake-qt4
-TAR           = tar -cf
-COMPRESS      = gzip -9f
+first: make_default
+MAKEFILE      = Makefile
+QMAKE         = /usr/bin/qmake
+DEL_FILE      = rm -f
+CHK_DIR_EXISTS= test -d
+MKDIR         = mkdir -p
 COPY          = cp -f
-SED           = sed
 COPY_FILE     = $(COPY)
 COPY_DIR      = $(COPY) -r
-STRIP         = strip
 INSTALL_FILE  = install -m 644 -p
-INSTALL_DIR   = $(COPY_DIR)
 INSTALL_PROGRAM = install -m 755 -p
+INSTALL_DIR   = $(COPY_DIR)
 DEL_FILE      = rm -f
 SYMLINK       = ln -f -s
 DEL_DIR       = rmdir
 MOVE          = mv -f
 CHK_DIR_EXISTS= test -d
 MKDIR         = mkdir -p
-
-####### Output directory
-
-OBJECTS_DIR   = ./
-
-####### Files
-
-SOURCES       = bootscreen.cpp \
-               main.cpp \
-               bootscreenR.cpp moc_bootscreen.cpp
-OBJECTS       = bootscreen.o \
-               main.o \
-               bootscreenR.o \
-               moc_bootscreen.o
-DIST          = /targets/FREMANTLE_ARMEL/opt/qt4-maemo5/mkspecs/common/unix.conf \
-               /targets/FREMANTLE_ARMEL/opt/qt4-maemo5/mkspecs/common/linux.conf \
-               /targets/FREMANTLE_ARMEL/opt/qt4-maemo5/mkspecs/qconfig.pri \
-               /targets/FREMANTLE_ARMEL/opt/qt4-maemo5/mkspecs/features/qt_functions.prf \
-               /targets/FREMANTLE_ARMEL/opt/qt4-maemo5/mkspecs/features/qt_config.prf \
-               /targets/FREMANTLE_ARMEL/opt/qt4-maemo5/mkspecs/features/exclusive_builds.prf \
-               /targets/FREMANTLE_ARMEL/opt/qt4-maemo5/mkspecs/features/default_pre.prf \
-               /targets/FREMANTLE_ARMEL/opt/qt4-maemo5/mkspecs/features/release.prf \
-               /targets/FREMANTLE_ARMEL/opt/qt4-maemo5/mkspecs/features/default_post.prf \
-               /targets/FREMANTLE_ARMEL/opt/qt4-maemo5/mkspecs/features/warn_on.prf \
-               /targets/FREMANTLE_ARMEL/opt/qt4-maemo5/mkspecs/features/qt.prf \
-               /targets/FREMANTLE_ARMEL/opt/qt4-maemo5/mkspecs/features/unix/thread.prf \
-               /targets/FREMANTLE_ARMEL/opt/qt4-maemo5/mkspecs/features/moc.prf \
-               /targets/FREMANTLE_ARMEL/opt/qt4-maemo5/mkspecs/features/resources.prf \
-               /targets/FREMANTLE_ARMEL/opt/qt4-maemo5/mkspecs/features/uic.prf \
-               /targets/FREMANTLE_ARMEL/opt/qt4-maemo5/mkspecs/features/yacc.prf \
-               /targets/FREMANTLE_ARMEL/opt/qt4-maemo5/mkspecs/features/lex.prf \
-               /targets/FREMANTLE_ARMEL/opt/qt4-maemo5/mkspecs/features/include_source_dir.prf \
-               bootscreen.pro
-QMAKE_TARGET  = bootscreen
-DESTDIR       = 
-TARGET        = bootscreen
-
-first: all
-####### Implicit rules
-
-.SUFFIXES: .o .c .cpp .cc .cxx .C
-
-.cpp.o:
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
-
-.cc.o:
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
-
-.cxx.o:
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
-
-.C.o:
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
-
-.c.o:
-       $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<"
-
-####### Build rules
-
-all: Makefile $(TARGET)
-
-$(TARGET):  $(OBJECTS)  
-       $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
+SUBTARGETS    =  \
+               sub-src \
+               sub-plugin
+
+src/$(MAKEFILE): 
+       @$(CHK_DIR_EXISTS) src/ || $(MKDIR) src/ 
+       cd src/ && $(QMAKE) /home/valerio/bootcreen/src/src.pro -unix -o $(MAKEFILE)
+sub-src-qmake_all:  FORCE
+       @$(CHK_DIR_EXISTS) src/ || $(MKDIR) src/ 
+       cd src/ && $(QMAKE) /home/valerio/bootcreen/src/src.pro -unix -o $(MAKEFILE)
+sub-src: src/$(MAKEFILE) FORCE
+       cd src/ && $(MAKE) -f $(MAKEFILE)
+sub-src-make_default: src/$(MAKEFILE) FORCE
+       cd src/ && $(MAKE) -f $(MAKEFILE) 
+sub-src-make_first: src/$(MAKEFILE) FORCE
+       cd src/ && $(MAKE) -f $(MAKEFILE) first
+sub-src-all: src/$(MAKEFILE) FORCE
+       cd src/ && $(MAKE) -f $(MAKEFILE) all
+sub-src-clean: src/$(MAKEFILE) FORCE
+       cd src/ && $(MAKE) -f $(MAKEFILE) clean
+sub-src-distclean: src/$(MAKEFILE) FORCE
+       cd src/ && $(MAKE) -f $(MAKEFILE) distclean
+sub-src-install_subtargets: src/$(MAKEFILE) FORCE
+       cd src/ && $(MAKE) -f $(MAKEFILE) install
+sub-src-uninstall_subtargets: src/$(MAKEFILE) FORCE
+       cd src/ && $(MAKE) -f $(MAKEFILE) uninstall
+plugin/$(MAKEFILE): 
+       @$(CHK_DIR_EXISTS) plugin/ || $(MKDIR) plugin/ 
+       cd plugin/ && $(QMAKE) /home/valerio/bootcreen/plugin/plugin.pro -unix -o $(MAKEFILE)
+sub-plugin-qmake_all:  FORCE
+       @$(CHK_DIR_EXISTS) plugin/ || $(MKDIR) plugin/ 
+       cd plugin/ && $(QMAKE) /home/valerio/bootcreen/plugin/plugin.pro -unix -o $(MAKEFILE)
+sub-plugin: plugin/$(MAKEFILE) FORCE
+       cd plugin/ && $(MAKE) -f $(MAKEFILE)
+sub-plugin-make_default: plugin/$(MAKEFILE) FORCE
+       cd plugin/ && $(MAKE) -f $(MAKEFILE) 
+sub-plugin-make_first: plugin/$(MAKEFILE) FORCE
+       cd plugin/ && $(MAKE) -f $(MAKEFILE) first
+sub-plugin-all: plugin/$(MAKEFILE) FORCE
+       cd plugin/ && $(MAKE) -f $(MAKEFILE) all
+sub-plugin-clean: plugin/$(MAKEFILE) FORCE
+       cd plugin/ && $(MAKE) -f $(MAKEFILE) clean
+sub-plugin-distclean: plugin/$(MAKEFILE) FORCE
+       cd plugin/ && $(MAKE) -f $(MAKEFILE) distclean
+sub-plugin-install_subtargets: plugin/$(MAKEFILE) FORCE
+       cd plugin/ && $(MAKE) -f $(MAKEFILE) install
+sub-plugin-uninstall_subtargets: plugin/$(MAKEFILE) FORCE
+       cd plugin/ && $(MAKE) -f $(MAKEFILE) uninstall
 
 Makefile: bootscreen.pro  /targets/FREMANTLE_ARMEL/opt/qt4-maemo5/mkspecs/linux-g++-maemo5/qmake.conf /targets/FREMANTLE_ARMEL/opt/qt4-maemo5/mkspecs/common/unix.conf \
                /targets/FREMANTLE_ARMEL/opt/qt4-maemo5/mkspecs/common/linux.conf \
@@ -117,12 +90,7 @@ Makefile: bootscreen.pro  /targets/FREMANTLE_ARMEL/opt/qt4-maemo5/mkspecs/linux-
                /targets/FREMANTLE_ARMEL/opt/qt4-maemo5/mkspecs/features/uic.prf \
                /targets/FREMANTLE_ARMEL/opt/qt4-maemo5/mkspecs/features/yacc.prf \
                /targets/FREMANTLE_ARMEL/opt/qt4-maemo5/mkspecs/features/lex.prf \
-               /targets/FREMANTLE_ARMEL/opt/qt4-maemo5/mkspecs/features/include_source_dir.prf \
-               /opt/qt4-maemo5/lib/libQtMaemo5.prl \
-               /opt/qt4-maemo5/lib/libQtDBus.prl \
-               /opt/qt4-maemo5/lib/libQtXml.prl \
-               /opt/qt4-maemo5/lib/libQtCore.prl \
-               /opt/qt4-maemo5/lib/libQtGui.prl
+               /targets/FREMANTLE_ARMEL/opt/qt4-maemo5/mkspecs/features/include_source_dir.prf
        $(QMAKE) -unix -o Makefile bootscreen.pro
 /targets/FREMANTLE_ARMEL/opt/qt4-maemo5/mkspecs/common/unix.conf:
 /targets/FREMANTLE_ARMEL/opt/qt4-maemo5/mkspecs/common/linux.conf:
@@ -142,95 +110,26 @@ Makefile: bootscreen.pro  /targets/FREMANTLE_ARMEL/opt/qt4-maemo5/mkspecs/linux-
 /targets/FREMANTLE_ARMEL/opt/qt4-maemo5/mkspecs/features/yacc.prf:
 /targets/FREMANTLE_ARMEL/opt/qt4-maemo5/mkspecs/features/lex.prf:
 /targets/FREMANTLE_ARMEL/opt/qt4-maemo5/mkspecs/features/include_source_dir.prf:
-/opt/qt4-maemo5/lib/libQtMaemo5.prl:
-/opt/qt4-maemo5/lib/libQtDBus.prl:
-/opt/qt4-maemo5/lib/libQtXml.prl:
-/opt/qt4-maemo5/lib/libQtCore.prl:
-/opt/qt4-maemo5/lib/libQtGui.prl:
-qmake:  FORCE
+qmake: qmake_all FORCE
        @$(QMAKE) -unix -o Makefile bootscreen.pro
 
-dist: 
-       @$(CHK_DIR_EXISTS) .tmp/bootscreen1.0.0 || $(MKDIR) .tmp/bootscreen1.0.0 
-       $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/bootscreen1.0.0/ && $(COPY_FILE) --parents bootscreen.h bootscreenR.h .tmp/bootscreen1.0.0/ && $(COPY_FILE) --parents bootscreen.cpp main.cpp bootscreenR.cpp .tmp/bootscreen1.0.0/ && (cd `dirname .tmp/bootscreen1.0.0` && $(TAR) bootscreen1.0.0.tar bootscreen1.0.0 && $(COMPRESS) bootscreen1.0.0.tar) && $(MOVE) `dirname .tmp/bootscreen1.0.0`/bootscreen1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/bootscreen1.0.0
-
-
-clean:compiler_clean 
-       -$(DEL_FILE) $(OBJECTS)
-       -$(DEL_FILE) *~ core *.core
-
+qmake_all: sub-src-qmake_all sub-plugin-qmake_all FORCE
 
-####### Sub-libraries
-
-distclean: clean
-       -$(DEL_FILE) $(TARGET) 
+make_default: sub-src-make_default sub-plugin-make_default FORCE
+make_first: sub-src-make_first sub-plugin-make_first FORCE
+all: sub-src-all sub-plugin-all FORCE
+clean: sub-src-clean sub-plugin-clean FORCE
+distclean: sub-src-distclean sub-plugin-distclean FORCE
        -$(DEL_FILE) Makefile
-
-
-install: $(TARGET) install_app install_dsk install_sd install_evd install_scr
-
-install_app:
-       $(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)/opt/bootscreen/$(QMAKE_TARGET)
-
-install_dsk:
-       $(INSTALL_FILE) data/$(QMAKE_TARGET).desktop $(DESTDIR)/usr/share/applications/hildon/$(QMAKE_TARGET).desktop
-
-install_sd:
-       $(INSTALL_FILE) data/$(QMAKE_TARGET).sudoers $(DESTDIR)/etc/sudoers.d/$(QMAKE_TARGET).sudoers
-
-install_evd:
-       $(INSTALL_FILE) data/$(QMAKE_TARGET) $(DESTDIR)/etc/event.d/$(QMAKE_TARGET)
-
-install_scr:
-       $(INSTALL_FILE) script/$(QMAKE_TARGET) $(DESTDIR)/usr/bin/$(QMAKE_TARGET)
+install_subtargets: sub-src-install_subtargets sub-plugin-install_subtargets FORCE
+uninstall_subtargets: sub-src-uninstall_subtargets sub-plugin-uninstall_subtargets FORCE
 
 mocclean: compiler_moc_header_clean compiler_moc_source_clean
 
 mocables: compiler_moc_header_make_all compiler_moc_source_make_all
+install: install_subtargets  FORCE
 
-compiler_moc_header_make_all: moc_bootscreen.cpp
-compiler_moc_header_clean:
-       -$(DEL_FILE) moc_bootscreen.cpp
-moc_bootscreen.cpp: bootscreen.h
-       /opt/qt4-maemo5/bin/moc $(DEFINES) $(INCPATH) bootscreen.h -o moc_bootscreen.cpp
-
-compiler_rcc_make_all:
-compiler_rcc_clean:
-compiler_image_collection_make_all: qmake_image_collection.cpp
-compiler_image_collection_clean:
-       -$(DEL_FILE) qmake_image_collection.cpp
-compiler_moc_source_make_all:
-compiler_moc_source_clean:
-compiler_uic_make_all:
-compiler_uic_clean:
-compiler_yacc_decl_make_all:
-compiler_yacc_decl_clean:
-compiler_yacc_impl_make_all:
-compiler_yacc_impl_clean:
-compiler_lex_make_all:
-compiler_lex_clean:
-compiler_clean: compiler_moc_header_clean 
-
-####### Compile
-
-bootscreen.o: bootscreen.cpp bootscreen.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o bootscreen.o bootscreen.cpp
-
-main.o: main.cpp bootscreen.h \
-               bootscreenR.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
-
-bootscreenR.o: bootscreenR.cpp bootscreenR.h
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o bootscreenR.o bootscreenR.cpp
-
-moc_bootscreen.o: moc_bootscreen.cpp 
-       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_bootscreen.o moc_bootscreen.cpp
-
-####### Install
-
-install:   FORCE
-
-uninstall:   FORCE
+uninstall:  uninstall_subtargets FORCE
 
 FORCE:
 

diff --git a/data/bootscreen.desktop b/data/bootscreen.desktop
index 5ca28be..708ac38 100644 (file)
--- a/data/bootscreen.desktop
+++ b/data/bootscreen.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
 Encoding=UTF-8
-Version=0.1
-Type=Application
-Name=BootScreen
-Exec= sudo /usr/bin/bootscreen
-Icon=
-MimeType=application/x-example;
+Version=0.2
+Name=Bootscreen manager
+Comment= Bootscreen control panel applet
+X-control-panel-plugin=libbooscreentpanelplugin.so
+Icon=bootscreen
+Categories=personalisation
 

diff --git a/data/bootscreen_48.png b/data/bootscreen_48.png
deleted file mode 100644 (file)
index 26756ec..0000000
Binary files a/data/bootscreen_48.png and /dev/null differ

diff --git a/data/bootscreen_64.png b/data/bootscreen_64.png
deleted file mode 100644 (file)
index 68a2dd0..0000000
Binary files a/data/bootscreen_64.png and /dev/null differ

diff --git a/debian/dirs b/debian/dirs
index c9a50f7..286fd99 100644 (file)
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,9 +1,4 @@
-usr/bin/
-etc/sudoers.d/
-etc/event.d/
 opt/bootscreen/
 opt/bootscreen/media/
 opt/bootscreen/data/
-usr/share/applications/hildon/
-usr/share/icons/hicolor/48x48/apps/
-usr/share/icons/hicolor/64x64/apps/
+

diff --git a/debian/rules b/debian/rules
old mode 100755 (executable)
new mode 100644 (file)
index 3261823..f3559e9
--- a/debian/rules
+++ b/debian/rules
@@ -1,73 +1,72 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
-
-APPNAME := bootscreen
-
-configure: configure-stamp
-configure-stamp:
-       dh_testdir
-       -qmake
-       -/opt/qt4-maemo5/bin/qmake-qt4
-       touch configure-stamp
-
-build: build-stamp
-build-stamp: configure-stamp  
-       dh_testdir
-       $(MAKE)
-       touch build-stamp 
-
-clean: 
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp configure-stamp
-       -$(MAKE) clean
-       dh_clean 
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k 
-       dh_installdirs
-       $(MAKE) DESTDIR=$(CURDIR)/debian/$(APPNAME) install
-
-binary-indep: build install
-binary-arch: build install
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs
-       dh_installdocs
-       dh_installexamples
-       dh_install
-       dh_installmenu
-       dh_installdebconf       
-       dh_installlogrotate
-       dh_installemacsen
-       dh_installpam
-       dh_installmime
-#      dh_python
-       dh_installinit
-       dh_installcron
-       dh_installinfo
-       dh_installman
-       dh_link
-       dh_strip
-       dh_compress
-       dh_fixperms
-#      dh_perl
-       dh_makeshlibs
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+#!/usr/bin/make -f\r
+# -*- makefile -*-\r
+# Sample debian/rules that uses debhelper.\r
+# This file was originally written by Joey Hess and Craig Small.\r
+# As a special exception, when this file is copied by dh-make into a\r
+# dh-make output file, you may use that output file without restriction.\r
+# This special exception was added by Craig Small in version 0.37 of dh-make.\r
+\r
+# Uncomment this to turn on verbose mode.\r
+#export DH_VERBOSE=1\r
+\r
+APPNAME := bootscreen\r
+builddir:\r
+       mkdir -p builddir\r
+\r
+builddir/Makefile: builddir\r
+       cd builddir && qmake PREFIX=/usr ../$(APPNAME).pro\r
+\r
+build: build-stamp\r
+\r
+build-stamp: builddir/Makefile\r
+       dh_testdir\r
+\r
+       # Add here commands to compile the package.\r
+       cd builddir && $(MAKE)\r
+       #docbook-to-man debian/$(APPNAME).sgml > $(APPNAME).1\r
+\r
+       touch $@\r
+\r
+clean:\r
+       dh_testdir\r
+       dh_testroot\r
+       rm -f build-stamp\r
+\r
+       # Add here commands to clean up after the build process.\r
+       rm -rf builddir\r
+\r
+       dh_clean \r
+\r
+install: build\r
+       dh_testdir\r
+       dh_testroot\r
+       dh_clean -k \r
+       dh_installdirs\r
+\r
+       # Add here commands to install the package into debian/arora.\r
+       cd builddir && $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/$(APPNAME) install\r
+\r
+\r
+# Build architecture-independent files here.\r
+binary-indep: build install\r
+# We have nothing to do by default.\r
+\r
+# Build architecture-dependent files here.\r
+binary-arch: build install\r
+       dh_testdir\r
+       dh_testroot\r
+       dh_installdocs\r
+       dh_installexamples\r
+       dh_installman\r
+       dh_link\r
+       dh_strip\r
+       dh_compress\r
+       dh_fixperms\r
+       dh_installdeb\r
+       dh_shlibdeps\r
+       dh_gencontrol\r
+       dh_md5sums\r
+       dh_builddeb\r
+\r
+binary: binary-indep binary-arch\r
+.PHONY: build clean binary-indep binary-arch binary install configure\r

diff --git a/src/src.pro b/src/src.pro
index 5d5de4a..69ff7a6 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,3 +1,4 @@
+TEMPLATE = app
 TARGET = bootscreen
 
 HEADERS += bootscreen.h \
@@ -8,13 +9,24 @@ SOURCES += bootscreen.cpp \
 QT += maemo5
 
 
-install_app.commands = $(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)/opt/bootscreen/$(QMAKE_TARGET)
-install_cfg.commands = $(INSTALL_FILE) data/$(QMAKE_TARGET).conf $(DESTDIR)/opt/bootscreen/$(QMAKE_TARGET).conf
-install_dsk.commands = $(INSTALL_FILE) data/$(QMAKE_TARGET).desktop $(DESTDIR)/usr/share/applications/hildon/$(QMAKE_TARGET).desktop
-install_sd.commands = $(INSTALL_FILE) data/$(QMAKE_TARGET).sudoers $(DESTDIR)/etc/sudoers.d/$(QMAKE_TARGET).sudoers
-install_evd.commands = $(INSTALL_FILE) data/$(QMAKE_TARGET) $(DESTDIR)/etc/event.d/$(QMAKE_TARGET)
-install_scr.commands = $(INSTALL_FILE) script/$(QMAKE_TARGET) $(DESTDIR)/usr/bin/$(QMAKE_TARGET)
-install_i48.commands = $(INSTALL_FILE) data/$(QMAKE_TARGET)_48.png $(DESTDIR)/usr/share/icons/hicolor/48x48/apps/$(QMAKE_TARGET).png
-install_i64.commands = $(INSTALL_FILE) data/$(QMAKE_TARGET)_64.png $(DESTDIR)/usr/share/icons/hicolor/64x64/apps/$(QMAKE_TARGET).png
-install.depends = $(TARGET) install_app install_dsk install_sd install_evd install_scr install_i48 install_i64
-QMAKE_EXTRA_TARGETS += install install_app install_dsk install_sd install_evd install_scr install_i48 install_i64
+target.path = $$(DESTDIR)/opt/bootscreen
+plugin.path = $$system(pkg-config hildon-control-panel --variable=pluginlibdir)
+plugin.files = ../plugin/libbooscreentpanelplugin.so
+desktop.path = $$system(pkg-config hildon-control-panel --variable=plugindesktopentrydir)
+desktop.files = ../data/$${TARGET}.desktop
+config.path = $$(DESTDIR)/opt/bootscreen
+config.files = ../data/$${TARGET}.conf
+sudoers.path = $$(DESTDIR)/etc/sudoers.d
+sudoers.files = ../data/$${TARGET}.sudoers
+upstart.path = $$(DESTDIR)/etc/event.d
+upstart.files = ../data/$${TARGET}
+script.path = $$(DESTDIR)/usr/bin
+script.files = ../script/$${TARGET}
+icon48.path = $$(DESTDIR)/usr/share/icons/hicolor/48x48/apps
+icon48.files = ../data/icons/48x48/$${TARGET}_48.png
+icon64.path = $$(DESTDIR)/usr/share/icons/hicolor/64x64/apps
+icon64.files = ../data/icons/64x64/$${TARGET}_64.png
+
+INSTALLS += target plugin desktop config sudoers upstart script icon48 icon64
+
+