On 22/04/2012 18:21, Chow Loong Jin wrote:
On 22/04/2012 20:09, Quentin Glidic wrote:
Hello,
I noticed a global misuse / misunderstanding of the Autotools (mostly about the dist mechanism) among the geany-plugins.
Could you elaborate, please?
I noticed that you have shifted all the ENABLE_$PLUGIN conditionals to the top-level Makefile.am instead, by modifying the SUBDIRS variable there. However, this is not desirable as disabled plugins will be excluded from the release tarball generated by `make dist'.
--enable/disable-$plugin should only toggle the building of the actual plugin.
That’s exactly the misunderstanding I was speaking about. From the Automake manual:
“If SUBDIRS is defined conditionally using Automake conditionals, Automake will define DIST_SUBDIRS automatically from the possible values of SUBDIRS in all conditions.”
And here’s the diff of the "tar tf" on the make dist tarball:
--- before-patch 2012-04-22 18:33:34.080440186 +0200 +++ after-patch 2012-04-22 18:33:48.168440399 +0200 @@ -127,0 +128 @@ +geany-plugins-1.22/debugger/wscript_configure @@ -201,0 +203 @@ +geany-plugins-1.22/debugger/wscript_build @@ -219,0 +222 @@ +geany-plugins-1.22/multiterm/wscript_configure @@ -243,0 +247 @@ +geany-plugins-1.22/multiterm/wscript_build @@ -310,0 +315 @@ +geany-plugins-1.22/devhelp/wscript_configure @@ -367,0 +373 @@ +geany-plugins-1.22/devhelp/wscript_build @@ -695,0 +702 @@ +geany-plugins-1.22/geanylua/wscript_configure @@ -749,0 +757 @@ +geany-plugins-1.22/geanylua/wscript_build @@ -914,0 +923 @@ +geany-plugins-1.22/webhelper/wscript_configure @@ -934,0 +944 @@ +geany-plugins-1.22/webhelper/wscript_build
Automake handles the conditionnal perfectly by itself, and just need some "dist_" prefixes here and there, while EXTRA_DIST should be reserved for files that are used outside of automake scope.