Project

General

Profile

Actions
Copy link

Bug #245

closed

merge will try to rewrite AM_INIT_AUTOMAKE

Added by Martin Jacquet about 4 years ago. Updated about 4 years ago.

Status:
Closed
Priority:
Low
Assignee:
-

Description

I added subdir-objects option to AM_INIT_AUTOMAKE in order to properly include the subdirectories in the codels folder.

The genom merge tool will try to rewrite this line each time that I call it, applying this patch:


merging ./configure.ac
--- ./configure.ac    Fri Mar 13 22:13:03 CET 2020
+++ ./configure.ac    Fri Mar 27 13:21:39 CET 2020
@@ -32,8 +32,8 @@
 AC_CONFIG_MACRO_DIR([autoconf])
 AC_CONFIG_AUX_DIR([autoconf])
 AC_CONFIG_HEADERS([autoconf/acmpc.h])
-AM_INIT_AUTOMAKE([foreign no-define subdir-objects])
-
+AM_INIT_AUTOMAKE([foreign no-define])
+
 dnl Compilers
 dnl
 LT_INIT([disable-static])
Apply this patch [y,n,c,a,q,?]?

The other lines manually added to the configure.ac are not being rewritten while merging.

Actions
Copy link
 #1

Updated by Anthony Mallet about 4 years ago

This is the expected behaviour: manually added lines are kept, but
changed lines are merged. The latter is necessary so that codels
signatures can be updated by the merge.

In your case, you can either:
  • Not apply the patch (answer n in interactive mode)
  • Add the option to AUTOMAKE_OPTIONS in the Makefile.am of
    interest. This will appear as a manual addition and should not be
    cancelled.
Actions
Copy link
 #2

Updated by Anthony Mallet about 4 years ago

  • Project changed from genom3-ros to genom3
Actions
Copy link
 #3

Updated by Martin Jacquet about 4 years ago

  • Status changed from New to Closed

(sorry for the wrong project, my mistake)

Thanks, adding AUTOMAKE_OPTIONS = subdir-objects to codels/Makefile.am properly solves the warning during bootstrap.
From what I read it is also cleaner to apply such options on a per-makefile basis, in general (even though there is only one in this module)

Closing the issue.

Actions
Copy link

Also available in: Atom PDF