]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
build: Move weird.c and charset_macosxfs.c to ICONV_WRAPPER
authorVolker Lendecke <vl@samba.org>
Mon, 4 Jan 2021 13:25:36 +0000 (14:25 +0100)
committerJeremy Allison <jra@samba.org>
Tue, 12 Jan 2021 00:10:30 +0000 (00:10 +0000)
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>
lib/util/charset/wscript_build

index 8fed718e7dc0afaf7072276f87bae47ee658ab52..2b7152d0498c536a806e3104619c40981398b629 100644 (file)
@@ -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')