From: Volker Lendecke <vl@samba.org>
Date: Mon, 4 Jan 2021 13:25:36 +0000 (+0100)
Subject: build: Move weird.c and charset_macosxfs.c to ICONV_WRAPPER
X-Git-Tag: samba-4.14.0rc1~116
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3d0e55b6d98d1178a00b0a68af576ca64d5f93cb;p=thirdparty%2Fsamba.git

build: Move weird.c and charset_macosxfs.c to ICONV_WRAPPER

iconv.c directly references them, it does not make sense to have it
without them.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/lib/util/charset/wscript_build b/lib/util/charset/wscript_build
index 8fed718e7dc..2b7152d0498 100644
--- a/lib/util/charset/wscript_build
+++ b/lib/util/charset/wscript_build
@@ -1,11 +1,22 @@
 #!/usr/bin/env python
 
 bld.SAMBA_SUBSYSTEM('ICONV_WRAPPER',
-                    source='iconv.c',
+                    source='''
+                    iconv.c
+                    weird.c
+                    charset_macosxfs.c
+                    ''',
                     public_deps='iconv replace talloc ' +  bld.env['icu-libs'])
 
 bld.SAMBA_SUBSYSTEM('charset',
                     public_headers='charset.h',
-                    source='codepoints.c convert_string.c util_str.c util_unistr_w.c pull_push.c util_unistr.c weird.c charset_macosxfs.c',
+                    source='''
+                    codepoints.c
+                    convert_string.c
+                    util_str.c
+                    util_unistr_w.c
+                    pull_push.c
+                    util_unistr.c
+                    ''',
                     deps='DYNCONFIG ICONV_WRAPPER',
                     public_deps='talloc')