[gimp-help-2] [make] Move some tools to proper directory 'make.d/'

From: Ulf-D. Ehlert <ulfehlert src gnome org>
To: commits-list gnome org
Cc:
Subject: [gimp-help-2] [make] Move some tools to proper directory 'make.d/'
Date: Wed, 24 Feb 2010 19:10:21 +0000 (UTC)
commit c0ced1a2a47b5d07769a608e216036cedba78462
Author: Ulf-D. Ehlert <ulfehlert svn gnome org>
Date:   Tue Feb 23 20:57:45 2010 +0100

    [make] Move some tools to proper directory 'make.d/'
    
    These files are definitely no "tools":
    * tools/make_image_links.pl: this is a special script which should be used
      by 'make' only;
    * tools/Makefile.html-package: this is a template for an html package;
    * tools/build-system.dot: this is a dot config file.
    Also, use 'make' variables for calling the image linking script.

 Makefile.GNU                            |   22 +++++++++++++---------
 Makefile.am                             |   30 ++++++++++++++----------------
 {tools => make.d}/Makefile.html-package |    0
 {tools => make.d}/build-system.dot      |    0
 {tools => make.d}/make_image_links.pl   |    0
 tools/README                            |    7 -------
 6 files changed, 27 insertions(+), 32 deletions(-)
---
diff --git a/Makefile.GNU b/Makefile.GNU
index 2d61499..d8f347e 100644
--- a/Makefile.GNU
+++ b/Makefile.GNU
@@ -67,6 +67,13 @@ find_l  = find -L
 # Calling make recursively
 RMAKE = $(MAKE) -f Makefile.GNU --no-print-directory
 
+# Local (gimp-help-specific) tools
+MAKE_IMAGE_LINKS = make.d/make_image_links.pl
+MAKE_IMAGE_LINKS_FLAGS = -v
+ifeq ($(CYGWIN),1)
+    MAKE_IMAGE_LINKS_FLAGS += --mode=hardlink,copy
+endif
+
 # FIXME/TODO:
 #     make it work with srcdir != builddir
 # Directories
@@ -529,13 +536,10 @@ else
 IMAGE_PREREQ = $(shell cd $(srcdir) && $(find_l) images/common images/C)
 endif
 
-ifeq ($(CYGWIN),1)
-    MAKE_IMAGE_LINKS_FLAGS = --mode=hardlink,copy
-endif
 xml/%/images: $(IMAGE_PREREQ)
 	$(cmd) test -d $@ && rm -rf $@/* || $(mkdir_p) $@
 	$(cmd) $(echo_n) "Copying images ($*) ..."
-	$(cmd) perl tools/make_image_links.pl -v $(MAKE_IMAGE_LINKS_FLAGS) \
+	$(cmd) perl $(MAKE_IMAGE_LINKS) $(MAKE_IMAGE_LINKS_FLAGS) \
 	                images/common images/C xml/$*
 	$(cmd) touch $@
 
@@ -643,7 +647,7 @@ html/%/images: $(IMAGE_PREREQ)
 	$(cmd) if test -h $@; then rm -f $@; fi
 	$(cmd) test -d $@ && rm -rf $@/* || $(mkdir_p) $@
 	$(cmd) $(echo_n) "Copying HTML images ($*) ..."
-	$(cmd) perl tools/make_image_links.pl -v --mode=hardlink,copy \
+	$(cmd) perl $(MAKE_IMAGE_LINKS) $(MAKE_IMAGE_LINKS_FLAGS) \
 	                images/common images/C $@
 	$(cmd) touch $@
 endif
@@ -778,14 +782,14 @@ tarball_dir    = gimp-help-2
 HTMLMETAFILES  = README AUTHORS COPYING MAINTAINERS
 
 $(tarball_prefix)-%.tar: html/%/index.html html/%/gimp-help.xml \
-		$(HTMLMETAFILES) tools/Makefile.html-package
+		$(HTMLMETAFILES) make.d/Makefile.html-package
 	$(msg) "Making $@ ..."
 	$(cmd) test ! -d $(tarball_dir)
 	$(cmd) $(mkdir_p) $(tarball_dir)/html
 	$(cmd) cd $(tarball_dir)/html && $(ln_s) ../../html/$* .
 	$(cmd) cp $(HTMLMETAFILES) $(tarball_dir)/
 	$(cmd) $(SED) -e '/LANGUAGE *=/s/en/$*/' \
-		tools/Makefile.html-package > $(tarball_dir)/Makefile
+		make.d/Makefile.html-package > $(tarball_dir)/Makefile
 	$(cmd) tar -chf $@ $(tarball_dir)/
 	$(cmd) rm -rf $(tarball_dir)
 
@@ -820,7 +824,7 @@ clean:
 		echo "Removing  $${dir} ..."; \
 		rm -rf $${dir}; \
 	done
-	$(cmd) for f in AUTHORS $(AUTHORS_DOCBOOK_XML) build-system.png; do \
+	$(cmd) for f in AUTHORS $(AUTHORS_DOCBOOK_XML) build-system.*; do \
 		test -f $${f} || continue; \
 		echo "Removing  $${f} ..."; \
 		rm -f $${f}; \
@@ -868,7 +872,7 @@ check-image-resolutions-en: check-image-resolutions-C ;
 ####            Build system development & debugging                ####
 ########################################################################
 
-build-system.svg: tools/build-system.dot
+build-system.svg: make.d/build-system.dot
 	$(cmd) if type dot >/dev/null; then \
 		dot -Tsvg -o $@ $<; \
 	fi
diff --git a/Makefile.am b/Makefile.am
index 6574ee2..5ece2fd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -69,6 +69,13 @@ echo_n = echo $(ECHO_N)
 # Calling make recursively
 RMAKE = $(MAKE) --no-print-directory
 
+# Local (gimp-help-specific) tools
+MAKE_IMAGE_LINKS = $(srcdir)/make.d/make_image_links.pl
+MAKE_IMAGE_LINKS_FLAGS = -v
+if CYGWIN
+    MAKE_IMAGE_LINKS_FLAGS += --mode=hardlink,copy
+endif
+
 
 ########################################################################
 ####            Files and directories                               ####
@@ -150,8 +157,7 @@ XSL_FILES = \
 DIST_TOOLS = \
 	make.d \
 	tools/xml2po.py \
-	tools/xml2po \
-	tools/make_image_links.pl
+	tools/xml2po
 
 # additional files to be distributed (automake)
 EXTRA_DIST = \
@@ -591,15 +597,8 @@ xml/%/images: $(IMAGE_PREREQ)
 	$(cmd) if test -d $@; then rm -rf $@/*; fi
 	$(cmd) test -d $@ || $(MKDIR_P) $@
 	$(cmd) $(echo_n) "Copying images ($*) ..."
-if CYGWIN
-# Cygwin
-	$(cmd) perl $(srcdir)/tools/make_image_links.pl -v \
-	           --mode=hardlink,copy \
-	           $(srcdir)/images/common $(srcdir)/images/C $@
-else
-	$(cmd) perl $(srcdir)/tools/make_image_links.pl -v \
+	$(cmd) perl $(MAKE_IMAGE_LINKS) $(MAKE_IMAGE_LINKS_FLAGS) \
 	           $(srcdir)/images/common $(srcdir)/images/C $@
-endif
 	$(cmd) touch $@
 
 # Remove left over xml files
@@ -706,8 +705,7 @@ html/%/images: $(IMAGE_PREREQ)
 	$(cmd) if test -h $@; then rm -f $@; fi
 	$(cmd) test -d $@ && rm -rf $@/* || $(MKDIR_P) $@
 	$(cmd) $(echo_n) "Copying HTML images ($*) ..."
-	$(cmd) perl $(srcdir)/tools/make_image_links.pl -v \
-	           --mode=hardlink,copy \
+	$(cmd) perl $(MAKE_IMAGE_LINKS) $(MAKE_IMAGE_LINKS_FLAGS) \
 	           $(srcdir)/images/common $(srcdir)/images/C $@
 	$(cmd) touch $@
 else
@@ -842,14 +840,14 @@ tarball_dir    = gimp-help-2
 HTMLMETAFILES  = README AUTHORS COPYING MAINTAINERS HACKING INSTALL
 
 $(tarball_prefix)-%.tar: html/%/index.html html/%/gimp-help.xml \
-		$(HTMLMETAFILES) tools/Makefile.html-package
+		$(HTMLMETAFILES) make.d/Makefile.html-package
 	$(msg) "Making $@ ..."
 	$(cmd) test ! -d $(tarball_dir)
 	$(cmd) $(MKDIR_P) $(tarball_dir)/html
 	$(cmd) cd $(tarball_dir)/html && $(LN_S) ../../html/$* .
 	$(cmd) cp $(HTMLMETAFILES) $(tarball_dir)/
 	$(cmd) $(SED) -e '/LANGUAGE *=/s/en/$*/' \
-		tools/Makefile.html-package > $(tarball_dir)/Makefile
+		make.d/Makefile.html-package > $(tarball_dir)/Makefile
 	$(cmd) tar -chf $@ $(tarball_dir)/
 	$(cmd) rm -rf $(tarball_dir)
 
@@ -943,7 +941,7 @@ if HAVE_DOT
 ####            Build system development & debugging                ####
 ########################################################################
 
-build-system.svg: tools/build-system.dot
+build-system.svg: make.d/build-system.dot
 	$(cmd) $(DOT) -Tsvg -o $@ $< && \
 	echo "$@ created."
 
@@ -996,7 +994,7 @@ mostlyclean-local:
 	$(cmd) rm -f $(AUTHORS_DOCBOOK_XML)
 # HIDE FROM AUTOMAKE #endif
 	$(cmd) rm -f $(tarball_prefix)-*
-	$(cmd) rm -f build-system.png
+	$(cmd) rm -f build-system.*
 	$(cmd) rm -f .xml2po.mo messages.mo
 
 clean-local: mostlyclean-local
diff --git a/tools/Makefile.html-package b/make.d/Makefile.html-package
similarity index 100%
rename from tools/Makefile.html-package
rename to make.d/Makefile.html-package
diff --git a/tools/build-system.dot b/make.d/build-system.dot
similarity index 100%
rename from tools/build-system.dot
rename to make.d/build-system.dot
diff --git a/tools/make_image_links.pl b/make.d/make_image_links.pl
similarity index 100%
rename from tools/make_image_links.pl
rename to make.d/make_image_links.pl
diff --git a/tools/README b/tools/README
index c1938db..234f63b 100644
--- a/tools/README
+++ b/tools/README
@@ -241,10 +241,3 @@ check_keywords_property.pl
 
 Removed, we do not need "svn:keywords" any more
 (and "git" won't support them).
-
-
-make_image_links.pl
-===================
-
-Do not use this script directly, it's meant to be run by 'make'.
-
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]