Split core/include.am into per-subdirectory include.am files

Closes ticket 32137.

1 files changed, 2 insertions, 5 deletions

diff --git a/scripts/maint/add_c_file.py b/scripts/maint/add_c_file.py
index a9a6eb25bd..9ec182efcc 100755
--- a/scripts/maint/add_c_file.py
+++ b/scripts/maint/add_c_file.py
@@ -192,12 +192,9 @@ def get_include_am_location(fname):
        not (yet) consistent.
     """
     td = topdir_file(fname)
-    m = re.match(r'^lib/([a-z0-9_]*)/', td)
+    m = re.match(r'^(lib|core|feature|app)/([a-z0-9_]*)/', td)
     if m:
-        return "src/lib/{}/include.am".format(m.group(1))
-
-    if re.match(r'^(core|feature|app)/', td):
-        return "src/core/include.am"
+        return "src/{}/{}/include.am".format(m.group(1),m.group(2))
 
     if re.match(r'^test/', td):
         return "src/test/include.am"