From fb653b7d4b2c9098223b41ac96034059790f00cd Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Mon, 20 May 2013 11:25:04 +0200 Subject: automake: cosmetic changes in indentation and line breaks * bin/automake.in (handle_LIBOBJS_or_ALLOCA): Here. Signed-off-by: Stefano Lattarini --- bin/automake.in | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'bin') diff --git a/bin/automake.in b/bin/automake.in index 933f9b910..31d78f993 100644 --- a/bin/automake.in +++ b/bin/automake.in @@ -2110,24 +2110,22 @@ sub handle_lib_objects sub handle_LIBOBJS_or_ALLOCA { my ($var) = @_; - my $dir = ''; # If LIBOBJS files must be built in another directory we have # to define LIBOBJDIR and ensure the files get cleaned. # Otherwise LIBOBJDIR can be left undefined, and the cleaning # is achieved by 'rm -f *.$(OBJEXT)' in compile.am. - if ($config_libobj_dir - && $relative_dir ne $config_libobj_dir) + if ($config_libobj_dir && $relative_dir ne $config_libobj_dir) { # In the top-level Makefile we do not use $(top_builddir), because # we are already there, and since the targets are built without # a $(top_builddir), it helps BSD Make to match them with # dependencies. $dir = "$config_libobj_dir/" - if $config_libobj_dir ne '.'; + if $config_libobj_dir ne '.'; $dir = backname ($relative_dir) . "/$dir" - if $relative_dir ne '.'; + if $relative_dir ne '.'; define_variable ('LIBOBJDIR', "$dir", INTERNAL); $clean_files{"\$($var)"} = MOSTLY_CLEAN; # If LTLIBOBJS is used, we must also clear LIBOBJS (which might -- cgit v1.2.1 From f7e618990e705d2525bb548175f1541cd106bd37 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Mon, 20 May 2013 11:40:36 +0200 Subject: automake: remove one extra trailing whitespace * bin/automake.in (lang_vala_ignore): Here. Signed-off-by: Stefano Lattarini --- bin/automake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/automake.in b/bin/automake.in index 31d78f993..735dc832a 100644 --- a/bin/automake.in +++ b/bin/automake.in @@ -5363,7 +5363,7 @@ sub lang_header_ignore { 1; } # Vala '.vapi' are a kind of header files as well, and should # not be processed into compilation rules. - sub lang_vala_ignore +sub lang_vala_ignore { my ($directory, $base, $ext) = @_; return ($ext =~ m/\.vapi$/ ? 1 : 0); -- cgit v1.2.1