From 0792cb65f4e19984cea436b85bf079df88d40b59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Sun, 25 Aug 2019 18:35:39 +0200 Subject: [PATCH] [devel-docs] move version file to deduplicate code --- configure.ac | 12 ++---------- devel-docs/Makefile.am | 3 ++- devel-docs/app/Makefile.am | 3 +-- devel-docs/app/app-docs.sgml | 8 ++++---- devel-docs/libgimp/Makefile.am | 3 --- devel-docs/libgimp/libgimp3-docs.sgml | 4 ++-- devel-docs/libgimp/version.in | 1 - devel-docs/libgimpbase/Makefile.am | 3 --- devel-docs/libgimpbase/libgimpbase3-docs.sgml | 2 +- devel-docs/libgimpbase/version.in | 1 - devel-docs/libgimpcolor/Makefile.am | 3 --- devel-docs/libgimpcolor/libgimpcolor3-docs.sgml | 2 +- devel-docs/libgimpcolor/version.in | 1 - devel-docs/libgimpconfig/Makefile.am | 3 --- devel-docs/libgimpconfig/libgimpconfig3-docs.sgml | 4 ++-- devel-docs/libgimpconfig/version.in | 1 - devel-docs/libgimpmath/Makefile.am | 3 --- devel-docs/libgimpmath/libgimpmath3-docs.sgml | 2 +- devel-docs/libgimpmath/version.in | 1 - devel-docs/libgimpmodule/Makefile.am | 3 --- devel-docs/libgimpmodule/libgimpmodule3-docs.sgml | 2 +- devel-docs/libgimpmodule/version.in | 1 - devel-docs/libgimpthumb/Makefile.am | 3 --- devel-docs/libgimpthumb/libgimpthumb3-docs.sgml | 2 +- devel-docs/libgimpthumb/version.in | 1 - devel-docs/libgimpwidgets/Makefile.am | 3 --- devel-docs/libgimpwidgets/libgimpwidgets3-docs.sgml | 4 ++-- devel-docs/libgimpwidgets/version.in | 1 - devel-docs/{app => }/version.in | 0 29 files changed, 20 insertions(+), 60 deletions(-) delete mode 100644 devel-docs/libgimp/version.in delete mode 100644 devel-docs/libgimpbase/version.in delete mode 100644 devel-docs/libgimpcolor/version.in delete mode 100644 devel-docs/libgimpconfig/version.in delete mode 100644 devel-docs/libgimpmath/version.in delete mode 100644 devel-docs/libgimpmodule/version.in delete mode 100644 devel-docs/libgimpthumb/version.in delete mode 100644 devel-docs/libgimpwidgets/version.in rename devel-docs/{app => }/version.in (100%) diff --git a/configure.ac b/configure.ac index e5c0be0b96..a351bad3d5 100644 --- a/configure.ac +++ b/configure.ac @@ -1339,7 +1339,7 @@ AC_MSG_CHECKING([whether symbols are prefixed]) case "$host_os" in mingw*) - case "$host_cpu" in + case "$host_cpu" in x86_64) SYMPREFIX='' ;; *) SYMPREFIX='_' ;; esac @@ -2983,24 +2983,16 @@ plug-ins/common/Makefile plug-ins/goat-exercises/Makefile modules/Makefile devel-docs/Makefile +devel-docs/version devel-docs/app/Makefile -devel-docs/app/version devel-docs/libgimp/Makefile -devel-docs/libgimp/version devel-docs/libgimpbase/Makefile -devel-docs/libgimpbase/version devel-docs/libgimpconfig/Makefile -devel-docs/libgimpconfig/version devel-docs/libgimpcolor/Makefile -devel-docs/libgimpcolor/version devel-docs/libgimpmath/Makefile -devel-docs/libgimpmath/version devel-docs/libgimpmodule/Makefile -devel-docs/libgimpmodule/version devel-docs/libgimpthumb/Makefile -devel-docs/libgimpthumb/version devel-docs/libgimpwidgets/Makefile -devel-docs/libgimpwidgets/version devel-docs/performance-logs/Makefile devel-docs/tools/Makefile docs/Makefile diff --git a/devel-docs/Makefile.am b/devel-docs/Makefile.am index ad305d4973..8022e63796 100644 --- a/devel-docs/Makefile.am +++ b/devel-docs/Makefile.am @@ -41,7 +41,8 @@ EXTRA_DIST = \ ui-framework.txt \ undo.txt \ vbr.txt \ - xcf.txt + xcf.txt \ + version.in # require gtk-doc when making dist diff --git a/devel-docs/app/Makefile.am b/devel-docs/app/Makefile.am index 3f1824cdc1..58636bce7a 100644 --- a/devel-docs/app/Makefile.am +++ b/devel-docs/app/Makefile.am @@ -126,5 +126,4 @@ endif # Other files to distribute EXTRA_DIST += \ - $(DOC_MODULE).types \ - version.in + $(DOC_MODULE).types diff --git a/devel-docs/app/app-docs.sgml b/devel-docs/app/app-docs.sgml index dfe562c514..76e0bf788a 100644 --- a/devel-docs/app/app-docs.sgml +++ b/devel-docs/app/app-docs.sgml @@ -1,5 +1,5 @@ - @@ -7,10 +7,10 @@ GIMP Application Reference Manual - for GIMP + for GIMP - + Object Hierarchy @@ -56,7 +56,7 @@ Compositing - + Base diff --git a/devel-docs/libgimp/Makefile.am b/devel-docs/libgimp/Makefile.am index a05d055481..6c42c806d8 100644 --- a/devel-docs/libgimp/Makefile.am +++ b/devel-docs/libgimp/Makefile.am @@ -78,6 +78,3 @@ GTKDOC_LIBS = \ include $(top_srcdir)/gtk-doc.make - -# Other files to distribute -EXTRA_DIST += version.in diff --git a/devel-docs/libgimp/libgimp3-docs.sgml b/devel-docs/libgimp/libgimp3-docs.sgml index 631fe99520..8fb85f8de6 100644 --- a/devel-docs/libgimp/libgimp3-docs.sgml +++ b/devel-docs/libgimp/libgimp3-docs.sgml @@ -7,7 +7,7 @@ GIMP 3 Library Reference Manual - for GIMP + for GIMP @@ -114,7 +114,7 @@ Object Hierarchy - + diff --git a/devel-docs/libgimp/version.in b/devel-docs/libgimp/version.in deleted file mode 100644 index 9e02d6ea46..0000000000 --- a/devel-docs/libgimp/version.in +++ /dev/null @@ -1 +0,0 @@ -@GIMP_VERSION@ diff --git a/devel-docs/libgimpbase/Makefile.am b/devel-docs/libgimpbase/Makefile.am index 120f478c7b..77a8b115c5 100644 --- a/devel-docs/libgimpbase/Makefile.am +++ b/devel-docs/libgimpbase/Makefile.am @@ -59,6 +59,3 @@ GTKDOC_LIBS = \ include $(top_srcdir)/gtk-doc.make - -# Other files to distribute -EXTRA_DIST += version.in diff --git a/devel-docs/libgimpbase/libgimpbase3-docs.sgml b/devel-docs/libgimpbase/libgimpbase3-docs.sgml index 6ebe296323..c1fdd1cbf7 100644 --- a/devel-docs/libgimpbase/libgimpbase3-docs.sgml +++ b/devel-docs/libgimpbase/libgimpbase3-docs.sgml @@ -7,7 +7,7 @@ GIMP 3 Base Library Reference Manual - for GIMP + for GIMP diff --git a/devel-docs/libgimpbase/version.in b/devel-docs/libgimpbase/version.in deleted file mode 100644 index 9e02d6ea46..0000000000 --- a/devel-docs/libgimpbase/version.in +++ /dev/null @@ -1 +0,0 @@ -@GIMP_VERSION@ diff --git a/devel-docs/libgimpcolor/Makefile.am b/devel-docs/libgimpcolor/Makefile.am index 490f00964c..1f04353b8d 100644 --- a/devel-docs/libgimpcolor/Makefile.am +++ b/devel-docs/libgimpcolor/Makefile.am @@ -52,6 +52,3 @@ GTKDOC_LIBS = \ include $(top_srcdir)/gtk-doc.make - -# Other files to distribute -EXTRA_DIST += version.in diff --git a/devel-docs/libgimpcolor/libgimpcolor3-docs.sgml b/devel-docs/libgimpcolor/libgimpcolor3-docs.sgml index 5b4acd764d..9810c3c602 100644 --- a/devel-docs/libgimpcolor/libgimpcolor3-docs.sgml +++ b/devel-docs/libgimpcolor/libgimpcolor3-docs.sgml @@ -7,7 +7,7 @@ GIMP 3 Color Library Reference Manual - for GIMP + for GIMP diff --git a/devel-docs/libgimpcolor/version.in b/devel-docs/libgimpcolor/version.in deleted file mode 100644 index 9e02d6ea46..0000000000 --- a/devel-docs/libgimpcolor/version.in +++ /dev/null @@ -1 +0,0 @@ -@GIMP_VERSION@ diff --git a/devel-docs/libgimpconfig/Makefile.am b/devel-docs/libgimpconfig/Makefile.am index a4a4f90b06..bd4e5382c1 100644 --- a/devel-docs/libgimpconfig/Makefile.am +++ b/devel-docs/libgimpconfig/Makefile.am @@ -58,6 +58,3 @@ GTKDOC_LIBS = \ include $(top_srcdir)/gtk-doc.make - -# Other files to distribute -EXTRA_DIST += version.in diff --git a/devel-docs/libgimpconfig/libgimpconfig3-docs.sgml b/devel-docs/libgimpconfig/libgimpconfig3-docs.sgml index c3f8e21d9d..11a14dbe6c 100644 --- a/devel-docs/libgimpconfig/libgimpconfig3-docs.sgml +++ b/devel-docs/libgimpconfig/libgimpconfig3-docs.sgml @@ -7,7 +7,7 @@ GIMP 3 Config Library Reference Manual - for GIMP + for GIMP @@ -17,7 +17,7 @@ Object Hierarchy - + diff --git a/devel-docs/libgimpconfig/version.in b/devel-docs/libgimpconfig/version.in deleted file mode 100644 index 9e02d6ea46..0000000000 --- a/devel-docs/libgimpconfig/version.in +++ /dev/null @@ -1 +0,0 @@ -@GIMP_VERSION@ diff --git a/devel-docs/libgimpmath/Makefile.am b/devel-docs/libgimpmath/Makefile.am index 5e6da4aafc..e3f0c73ea8 100644 --- a/devel-docs/libgimpmath/Makefile.am +++ b/devel-docs/libgimpmath/Makefile.am @@ -44,6 +44,3 @@ GTKDOC_LIBS = include $(top_srcdir)/gtk-doc.make - -# Other files to distribute -EXTRA_DIST += version.in diff --git a/devel-docs/libgimpmath/libgimpmath3-docs.sgml b/devel-docs/libgimpmath/libgimpmath3-docs.sgml index b29697a3a9..2f755e720c 100644 --- a/devel-docs/libgimpmath/libgimpmath3-docs.sgml +++ b/devel-docs/libgimpmath/libgimpmath3-docs.sgml @@ -7,7 +7,7 @@ GIMP 3 Math Library Reference Manual - for GIMP + for GIMP diff --git a/devel-docs/libgimpmath/version.in b/devel-docs/libgimpmath/version.in deleted file mode 100644 index 9e02d6ea46..0000000000 --- a/devel-docs/libgimpmath/version.in +++ /dev/null @@ -1 +0,0 @@ -@GIMP_VERSION@ diff --git a/devel-docs/libgimpmodule/Makefile.am b/devel-docs/libgimpmodule/Makefile.am index f36069ea1c..ddb60afda9 100644 --- a/devel-docs/libgimpmodule/Makefile.am +++ b/devel-docs/libgimpmodule/Makefile.am @@ -53,6 +53,3 @@ GTKDOC_LIBS = \ include $(top_srcdir)/gtk-doc.make - -# Other files to distribute -EXTRA_DIST += version.in diff --git a/devel-docs/libgimpmodule/libgimpmodule3-docs.sgml b/devel-docs/libgimpmodule/libgimpmodule3-docs.sgml index 757bc247e0..be706b76d9 100644 --- a/devel-docs/libgimpmodule/libgimpmodule3-docs.sgml +++ b/devel-docs/libgimpmodule/libgimpmodule3-docs.sgml @@ -7,7 +7,7 @@ GIMP 3 Module Library Reference Manual - for GIMP + for GIMP diff --git a/devel-docs/libgimpmodule/version.in b/devel-docs/libgimpmodule/version.in deleted file mode 100644 index 9e02d6ea46..0000000000 --- a/devel-docs/libgimpmodule/version.in +++ /dev/null @@ -1 +0,0 @@ -@GIMP_VERSION@ diff --git a/devel-docs/libgimpthumb/Makefile.am b/devel-docs/libgimpthumb/Makefile.am index d6a161810a..bb370bab29 100644 --- a/devel-docs/libgimpthumb/Makefile.am +++ b/devel-docs/libgimpthumb/Makefile.am @@ -53,6 +53,3 @@ GTKDOC_LIBS = \ include $(top_srcdir)/gtk-doc.make - -# Other files to distribute -EXTRA_DIST += version.in diff --git a/devel-docs/libgimpthumb/libgimpthumb3-docs.sgml b/devel-docs/libgimpthumb/libgimpthumb3-docs.sgml index 4aefd55bb1..24929b7c67 100644 --- a/devel-docs/libgimpthumb/libgimpthumb3-docs.sgml +++ b/devel-docs/libgimpthumb/libgimpthumb3-docs.sgml @@ -7,7 +7,7 @@ GIMP 3 Thumbnail Library Reference Manual - for GIMP + for GIMP diff --git a/devel-docs/libgimpthumb/version.in b/devel-docs/libgimpthumb/version.in deleted file mode 100644 index 9e02d6ea46..0000000000 --- a/devel-docs/libgimpthumb/version.in +++ /dev/null @@ -1 +0,0 @@ -@GIMP_VERSION@ diff --git a/devel-docs/libgimpwidgets/Makefile.am b/devel-docs/libgimpwidgets/Makefile.am index 59f7eee527..5823abc0ab 100644 --- a/devel-docs/libgimpwidgets/Makefile.am +++ b/devel-docs/libgimpwidgets/Makefile.am @@ -83,6 +83,3 @@ GTKDOC_LIBS = \ include $(top_srcdir)/gtk-doc.make - -# Other files to distribute -EXTRA_DIST += version.in diff --git a/devel-docs/libgimpwidgets/libgimpwidgets3-docs.sgml b/devel-docs/libgimpwidgets/libgimpwidgets3-docs.sgml index dcfd2dcc49..1f9ea46579 100644 --- a/devel-docs/libgimpwidgets/libgimpwidgets3-docs.sgml +++ b/devel-docs/libgimpwidgets/libgimpwidgets3-docs.sgml @@ -7,7 +7,7 @@ GIMP 3 Widgets Library Reference Manual - for GIMP + for GIMP @@ -61,7 +61,7 @@ - + Cell Renderers for GtkTreeView diff --git a/devel-docs/libgimpwidgets/version.in b/devel-docs/libgimpwidgets/version.in deleted file mode 100644 index 9e02d6ea46..0000000000 --- a/devel-docs/libgimpwidgets/version.in +++ /dev/null @@ -1 +0,0 @@ -@GIMP_VERSION@ diff --git a/devel-docs/app/version.in b/devel-docs/version.in similarity index 100% rename from devel-docs/app/version.in rename to devel-docs/version.in