--- qsampler/trunk/Makefile.in	2009/11/04 18:59:57	2028
+++ qsampler/trunk/Makefile.in	2010/03/29 17:00:30	2074
@@ -5,7 +5,10 @@
 
 name    = qsampler
 
-headers = config.h \
+target  = src/$(name)
+
+headers = \
+	src/config.h \
 	src/qsamplerAbout.h \
 	src/qsamplerOptions.h \
 	src/qsamplerChannel.h \
@@ -26,7 +29,8 @@
 	src/qsamplerOptionsForm.h \
 	src/qsamplerMainForm.h
 
-sources = src/main.cpp \
+sources = \
+	src/qsampler.cpp \
 	src/qsamplerOptions.cpp \
 	src/qsamplerChannel.cpp \
 	src/qsamplerMessages.cpp \
@@ -56,50 +60,47 @@
 	src/qsamplerOptionsForm.ui \
 	src/qsamplerMainForm.ui
 
+resources = \
+	src/qsampler.qrc
+
 translations_sources = \
-	translations/qsampler_cs.ts \
-	translations/qsampler_ru.ts
+	src/translations/qsampler_cs.ts \
+	src/translations/qsampler_ru.ts
 
 translations_targets = \
-	translations/qsampler_cs.qm \
-	translations/qsampler_ru.qm
+	src/translations/qsampler_cs.qm \
+	src/translations/qsampler_ru.qm
 
-all:	$(name) $(translations_targets)
+all:	$(target) $(translations_targets)
+
+
+$(target):	$(name).mak $(resources) ${forms} $(sources) $(headers)
+	@make -f $(name).mak
 
 $(name).mak:	$(name).pro
 	@$(qmake) -o $(name).mak $(name).pro
 
-$(name):	$(name).mak $(sources) $(headers) $(forms)
-	@make -f $(name).mak
 
-%.ts:	$(name).pro $(sources) $(headers) $(forms)
+%.ts:	$(name).pro $(resources) ${forms} $(sources) $(headers)
 	@$(lupdate) -verbose $(name).pro
 
 %.qm:	%.ts
 	@$(lrelease) -verbose $< -qm $@
 
-# NOTE: DO NOT DELETE $(DESTDIR) in install and uninstall rules !!!
-#       It is mandatory for Debian packaging.
 
-install:	$(name) icons/$(name).png
-	@install -d -v -m 0755 $(DESTDIR)$(prefix)/bin
-	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/pixmaps
-	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/applications
+install:	$(target) $(translations_targets)
+	@make -f $(name).mak install
 	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/locale
-	@install -v -m 0755 $(name) $(DESTDIR)$(prefix)/bin/$(name)
-	@install -v -m 0644 icons/$(name).png $(DESTDIR)$(prefix)/share/pixmaps/$(name).png
-	@install -v -m 0644 $(name).desktop $(DESTDIR)$(prefix)/share/applications/$(name).desktop
 	@install -v -m 0644 $(translations_targets) $(DESTDIR)$(prefix)/share/locale
 
 uninstall:	$(DESTDIR)$(prefix)/bin/$(name)
-	@rm -vf $(DESTDIR)$(prefix)/bin/$(name)
-	@rm -vf $(DESTDIR)$(prefix)/share/pixmaps/$(name).png
-	@rm -vf $(DESTDIR)$(prefix)/share/applications/$(name).desktop
+	@make -f $(name).mak uninstall
 	@rm -vf $(DESTDIR)$(prefix)/share/locale/$(translations_targets)
 	@for x in $(translations_targets); do \
 		rm -vf $(DESTDIR)$(prefix)/share/locale/`basename $$x`; done
 
+
 clean:	$(name).mak
 	@make -f $(name).mak clean
-	@rm -f $(name) $(name).mak
+	@rm -f $(target) $(target).mak $(name).mak
 	@rm -rf *.cache *.log *.status $(translations_targets)