--- qsampler/trunk/Makefile.in	2005/06/12 09:40:24	631
+++ qsampler/trunk/Makefile.in	2007/11/21 11:46:40	1504
@@ -8,18 +8,37 @@
 	src/qsamplerOptions.h \
 	src/qsamplerChannel.h \
 	src/qsamplerMessages.h \
+	src/qsamplerInstrument.h \
+	src/qsamplerInstrumentList.h \
 	src/qsamplerDevice.h \
-	src/qsamplerDeviceForm.ui.h \
-	src/qsamplerChannelStrip.ui.h \
-	src/qsamplerChannelForm.ui.h \
-	src/qsamplerOptionsForm.ui.h \
-	src/qsamplerMainForm.ui.h
+	src/qsamplerUtilities.h \
+	src/qsamplerInstrumentForm.h \
+	src/qsamplerInstrumentListForm.h \
+	src/qsamplerDeviceForm.h \
+	src/qsamplerChannelStrip.h \
+	src/qsamplerChannelForm.h \
+	src/qsamplerOptionsForm.h \
+	src/qsamplerMainForm.h
 
 sources = src/main.cpp \
 	src/qsamplerOptions.cpp \
 	src/qsamplerChannel.cpp \
 	src/qsamplerMessages.cpp \
+	src/qsamplerInstrument.cpp \
+	src/qsamplerInstrumentList.cpp \
 	src/qsamplerDevice.cpp \
+	src/qsamplerUtilities.cpp \
+	src/qsamplerInstrumentForm.cpp \
+	src/qsamplerInstrumentListForm.cpp \
+	src/qsamplerDeviceForm.cpp \
+	src/qsamplerChannelStrip.cpp \
+	src/qsamplerChannelForm.cpp \
+	src/qsamplerOptionsForm.cpp \
+	src/qsamplerMainForm.cpp
+
+forms = \
+	src/qsamplerInstrumentForm.ui \
+	src/qsamplerInstrumentListForm.ui \
 	src/qsamplerDeviceForm.ui \
 	src/qsamplerChannelStrip.ui \
 	src/qsamplerChannelForm.ui \
@@ -31,7 +50,7 @@
 $(name).mak:	$(name).pro
 	@$(qmake) -o $(name).mak $(name).pro
 
-$(name):	$(name).mak $(sources) $(headers)
+$(name):	$(name).mak $(sources) $(headers) $(forms)
 	@make -f $(name).mak
 
 
@@ -40,13 +59,16 @@
 
 install:	$(name) icons/$(name).png
 	@install -d -v -m 0755 $(DESTDIR)$(prefix)/bin
-	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/icons
+	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/pixmaps
+	@install -d -v -m 0755 $(DESTDIR)$(prefix)/share/applications
 	@install -v -m 0755 $(name) $(DESTDIR)$(prefix)/bin/$(name)
-	@install -v -m 0644 icons/$(name).png $(DESTDIR)$(prefix)/share/icons/$(name).png
+	@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
 
 uninstall:	$(DESTDIR)$(prefix)/bin/$(name)
 	@rm -vf $(DESTDIR)$(prefix)/bin/$(name)
-	@rm -vf $(DESTDIR)$(prefix)/share/icons/$(name).png
+	@rm -vf $(DESTDIR)$(prefix)/share/pixmaps/$(name).png
+	@rm -vf $(DESTDIR)$(prefix)/share/applications/$(name).desktop
 
 clean:	$(name).mak
 	@make -f $(name).mak clean