From 1a1d2e078682968b5a0a98ecbe2388b93fa2aa44 Mon Sep 17 00:00:00 2001
From: Graham Percival <graham@percival-music.ca>
Date: Tue, 4 Aug 2009 00:48:58 -0700
Subject: [PATCH] Docs: rename Documentation/pictures/ to Documentation/logo/

---
 Documentation/GNUmakefile                     |  2 +-
 Documentation/logo/GNUmakefile                | 27 +++++++++++++++++++
 .../{pictures => logo}/lelie-logo.xpm         |  0
 Documentation/{pictures => logo}/lilypond.xpm |  0
 Documentation/{pictures => logo}/ly.xpm       |  0
 Documentation/pictures/GNUmakefile            | 21 ---------------
 lily/GNUmakefile                              | 12 ++++-----
 make/generic-vars.make                        |  2 +-
 stepmake/stepmake/toplevel-targets.make       |  2 +-
 9 files changed, 36 insertions(+), 30 deletions(-)
 create mode 100644 Documentation/logo/GNUmakefile
 rename Documentation/{pictures => logo}/lelie-logo.xpm (100%)
 rename Documentation/{pictures => logo}/lilypond.xpm (100%)
 rename Documentation/{pictures => logo}/ly.xpm (100%)

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 65ecd60a29..07a93c3bcb 100644
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -10,7 +10,7 @@ depth = ..
 NAME = documentation
 LANGS = $(shell $(PYTHON) $(top-src-dir)/python/langdefs.py)
 MANUALS_SUBDIRS = application contributor essay learning notation
-SUBDIRS = $(MANUALS_SUBDIRS) snippets bibliography pictures misc po $(LANGS)
+SUBDIRS = $(MANUALS_SUBDIRS) snippets bibliography logo pictures misc po $(LANGS)
 STEPMAKE_TEMPLATES = documentation texinfo tex omf
 LOCALSTEPMAKE_TEMPLATES = lilypond ly
 
diff --git a/Documentation/logo/GNUmakefile b/Documentation/logo/GNUmakefile
new file mode 100644
index 0000000000..4a8f2eb72f
--- /dev/null
+++ b/Documentation/logo/GNUmakefile
@@ -0,0 +1,27 @@
+depth = ../..
+
+STEPMAKE_TEMPLATES=documentation
+XPM_FILES=$(call src-wildcard,*.xpm)
+EXTRA_DIST_FILES= $(XPM_FILES)
+
+lilypond-icon = $(outdir)/lilypond.ico
+ly-icon = $(outdir)/ly.ico
+
+include $(depth)/make/stepmake.make
+
+ifeq ($(PLATFORM_WINDOWS),yes)
+
+$(outdir)/%.ico: %.xpm
+	$(buildscript-dir)/genicon $< $@
+
+default: $(lilypond-icon) $(ly-icon)
+
+endif # PLATFORM_WINDOWS
+
+local-dist: $(icon) 
+xgifs: $(OUTGIF_FILES)
+pngs: $(OUTPNG_FILES)
+
+ifeq ($(out),www)
+local-WWW-1: $(OUTPNG_FILES)
+endif
diff --git a/Documentation/pictures/lelie-logo.xpm b/Documentation/logo/lelie-logo.xpm
similarity index 100%
rename from Documentation/pictures/lelie-logo.xpm
rename to Documentation/logo/lelie-logo.xpm
diff --git a/Documentation/pictures/lilypond.xpm b/Documentation/logo/lilypond.xpm
similarity index 100%
rename from Documentation/pictures/lilypond.xpm
rename to Documentation/logo/lilypond.xpm
diff --git a/Documentation/pictures/ly.xpm b/Documentation/logo/ly.xpm
similarity index 100%
rename from Documentation/pictures/ly.xpm
rename to Documentation/logo/ly.xpm
diff --git a/Documentation/pictures/GNUmakefile b/Documentation/pictures/GNUmakefile
index 4a8f2eb72f..385043d561 100644
--- a/Documentation/pictures/GNUmakefile
+++ b/Documentation/pictures/GNUmakefile
@@ -1,27 +1,6 @@
 depth = ../..
 
 STEPMAKE_TEMPLATES=documentation
-XPM_FILES=$(call src-wildcard,*.xpm)
-EXTRA_DIST_FILES= $(XPM_FILES)
-
-lilypond-icon = $(outdir)/lilypond.ico
-ly-icon = $(outdir)/ly.ico
 
 include $(depth)/make/stepmake.make
 
-ifeq ($(PLATFORM_WINDOWS),yes)
-
-$(outdir)/%.ico: %.xpm
-	$(buildscript-dir)/genicon $< $@
-
-default: $(lilypond-icon) $(ly-icon)
-
-endif # PLATFORM_WINDOWS
-
-local-dist: $(icon) 
-xgifs: $(OUTGIF_FILES)
-pngs: $(OUTPNG_FILES)
-
-ifeq ($(out),www)
-local-WWW-1: $(OUTPNG_FILES)
-endif
diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index 508020c039..f3fb922b53 100644
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -37,15 +37,15 @@ O_FILES += $(outdir)/lilypond.rc.o
 $(outdir)/lilypond: $(outdir)/lilypond.rc.o
 
 $(outdir)/lilypond.rc.o: $(outdir)/lilypond.ico $(outdir)/ly.ico
-$(top-build-dir)/Documentation/pictures/$(outbase)/lilypond.ico:
-	$(MAKE) -C $(top-build-dir)/Documentation/pictures
+$(top-build-dir)/Documentation/logo/$(outbase)/lilypond.ico:
+	$(MAKE) -C $(top-build-dir)/Documentation/logo
 
-$(outdir)/lilypond.ico: $(top-build-dir)/Documentation/pictures/$(outbase)/lilypond.ico
+$(outdir)/lilypond.ico: $(top-build-dir)/Documentation/logo/$(outbase)/lilypond.ico
 	cp $< $@
-$(top-build-dir)/Documentation/pictures/$(outbase)/ly.ico:
-	$(MAKE) -C $(top-build-dir)/Documentation/pictures
+$(top-build-dir)/Documentation/logo/$(outbase)/ly.ico:
+	$(MAKE) -C $(top-build-dir)/Documentation/logo
 
-$(outdir)/ly.ico: $(top-build-dir)/Documentation/pictures/$(outbase)/ly.ico
+$(outdir)/ly.ico: $(top-build-dir)/Documentation/logo/$(outbase)/ly.ico
 	cp $< $@
 endif
 
diff --git a/make/generic-vars.make b/make/generic-vars.make
index 44cb80ccaa..c5831d7ec5 100644
--- a/make/generic-vars.make
+++ b/make/generic-vars.make
@@ -33,7 +33,7 @@ EXTRA_DOC_FILES = \
   Documentation/out/*.txt\
   Documentation/tex/*.doc\
   Documentation/tex/*.bib\
-  Documentation/pictures/out/lelie_logo.gif\
+  Documentation/logo/out/lelie_logo.gif\
   input\
 
 INSTALLED_EXTRA_DOC_FILES = $(addprefix $(prefix:/%=%)/doc/lilypond/, $(EXTRA_DOC_FILES))
diff --git a/stepmake/stepmake/toplevel-targets.make b/stepmake/stepmake/toplevel-targets.make
index 94f9e234f3..17f0c59245 100644
--- a/stepmake/stepmake/toplevel-targets.make
+++ b/stepmake/stepmake/toplevel-targets.make
@@ -27,7 +27,7 @@ endif
 
 
 $(package-icon):
-	$(MAKE) -C Documentation/pictures icon
+	$(MAKE) -C Documentation/logo icon
 
 
 top-doc:
-- 
2.39.2