[SCM] calf/master: Add pixmap_path to the gtkrc. Move install actions from src/ to gui/

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f88adabb3e5ea1b031a4bb231c13f55273df3113
Author: Krzysztof Foltman <wdev at foltman.com>
Date:   Sat Apr 3 13:59:18 2010 +0100

    Add pixmap_path to the gtkrc. Move install actions from src/ to gui/
    
    The pixmap_path is needed for some engines - they print a warning even though
    they eventually find the right pixmaps. This clutters the output and is generally
    a poor practice. Plus there's a possibility of incorrect pixmaps being loaded.
    
    The install/uninstall actions related to the GUI are now moved to gui/
    directory's Makefile.am - it's cleaner and may marginally reduce install time
    when only execuables are being built.
    
    The gui/ install action needs the calfmakerdf program to be present, so there
    may be some problems with multithreaded build - I'll check it later.

diff --git a/gui/Makefile.am b/gui/Makefile.am
index 66ba84e..ee75a25 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -1,2 +1,15 @@
-EXTRA_DIST = $(wildcard gui-*.xml) $(wildcard *.png) calf.rc
+EXTRA_DIST = $(wildcard gui-*.xml) $(wildcard *.png) calf.rc.in
 
+install-data-hook:
+	install -c -m 644 $(srcdir)/*.png $(DESTDIR)$(pkgdatadir)
+	$(top_builddir)/src/calfmakerdf -m gui -p $(DESTDIR)$(pkgdatadir)
+	install -c -m 644 $(srcdir)/gui-*.xml $(DESTDIR)$(pkgdatadir)
+	sed 's#@pkgdatadir@#$(pkgdatadir)#g' $(srcdir)/calf.rc.in >$(top_builddir)/calf.rc
+	install -c -m 644 $(top_builddir)/calf.rc $(DESTDIR)$(pkgdatadir)
+	rm -f $(top_builddir)/calf.rc
+
+uninstall-hook:
+	rm -f $(DESTDIR)$(pkgdatadir)/calf.rc
+	rm -f $(DESTDIR)$(pkgdatadir)/*.png
+	rm -f $(DESTDIR)$(pkgdatadir)/gui-*.xml
+	rmdir $(DESTDIR)$(pkgdatadir) || true
diff --git a/gui/calf.rc b/gui/calf.rc.in
similarity index 97%
rename from gui/calf.rc
rename to gui/calf.rc.in
index f11e6f2..ed2c789 100644
--- a/gui/calf.rc
+++ b/gui/calf.rc.in
@@ -8,6 +8,8 @@
 
 gtk_color_scheme = "fg_color:#101010\nbg_color:#EFEBE7\nbase_color:#FFF\ntext_color:#1A1A1A\nselected_bg_color:#FFA443\nselected_fg_color:#1A1A1A\ntooltip_bg_color:#F5F5B5\ntooltip_fg_color:#000"
 
+pixmap_path "@pkgdatadir@"
+
 style "calf-default"
 {
 	########
@@ -87,7 +89,7 @@ style "calf-default"
 	bg_pixmap[NORMAL]		= "background_dark.png"
 	bg_pixmap[SELECTED]		= "background_black.png"
 	bg_pixmap[ACTIVE]		= "background_black.png"
-	bg_pixmap[INSENSITIVE]	= "background_dark.png"
+	bg_pixmap[INSENSITIVE]	        = "background_dark.png"
 	
 	engine "pixmap"
 	{
diff --git a/src/Makefile.am b/src/Makefile.am
index cccb4fc..b19e3ec 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -82,10 +82,6 @@ clean-local:
 install-data-hook:
 	install -d -m 755 $(DESTDIR)$(pkgdatadir)    
 	install -c -m 644 $(top_srcdir)/presets.xml $(DESTDIR)$(pkgdatadir)
-	install -c -m 644 $(top_srcdir)/gui/*.png $(DESTDIR)$(pkgdatadir)
-	$(top_builddir)/src/calfmakerdf -m gui -p $(DESTDIR)$(pkgdatadir)
-	install -c -m 644 $(top_srcdir)/gui/gui-*.xml $(DESTDIR)$(pkgdatadir)
-	install -c -m 644 $(top_srcdir)/gui/calf.rc $(DESTDIR)$(pkgdatadir)
 if USE_JACK
 	install -c -m 644 $(top_srcdir)/calf.glade $(DESTDIR)$(pkgdatadir)
 endif
@@ -123,15 +119,7 @@ endif
 if USE_JACK
 	rm -f $(DESTDIR)$(pkgdatadir)/calf.glade 
 endif
-	rm -f $(DESTDIR)$(pkgdatadir)/gui-*.xml
 	rm -f $(DESTDIR)$(pkgdatadir)/presets.xml
-	rm -f $(DESTDIR)$(pkgdatadir)/calf.rc
-	rm -f $(DESTDIR)$(pkgdatadir)/knob1.png
-	rm -f $(DESTDIR)$(pkgdatadir)/knob2.png
-	rm -f $(DESTDIR)$(pkgdatadir)/knob3.png
-	rm -f $(DESTDIR)$(pkgdatadir)/knob4.png
-	rm -f $(DESTDIR)$(pkgdatadir)/toggle1.png
-	rm -f $(DESTDIR)$(pkgdatadir)/toggle2.png
 	rmdir $(DESTDIR)$(pkgdatadir) || true
 if USE_LADSPA
 	$(RM) -f $(DESTDIR)$(with_ladspa_dir)/calf.so

-- 
calf audio plugins packaging