From 33dc71afe3454077869d2fe7b1440779e938ebf4 Mon Sep 17 00:00:00 2001 From: Michal Suchanek Date: Sat, 25 Feb 2023 13:14:05 +0100 Subject: [PATCH 1/6] Fix copypasta in README.sdl2 Signed-off-by: Michal Suchanek --- doc/en/README.sdl2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/en/README.sdl2 b/doc/en/README.sdl2 index 2d1d2638..dadad49f 100644 --- a/doc/en/README.sdl2 +++ b/doc/en/README.sdl2 @@ -18,7 +18,7 @@ SDL2 support instead of installing all files by 'make install'.) * Configuration - Configuration of wayland version is the same as that of X11 version + Configuration of sdl2 version is the same as that of X11 version except font settings as follows. Be sure to configure fonts before starting mlterm. From 79fe78a43e8555b393c526478d6dca66ea9ef1f2 Mon Sep 17 00:00:00 2001 From: Michal Suchanek Date: Sun, 26 Feb 2023 15:35:21 +0100 Subject: [PATCH 2/6] configure: XIM is only available with xlib UI configure.in unconditionally prints XIM as input method but it is only available with xlib UI. Skip it for other UIs. Also regenerate configure. Signed-off-by: Michal Suchanek --- configure | 4 ++++ configure.in | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/configure b/configure index 6fe98348..b34a7ab0 100755 --- a/configure +++ b/configure @@ -28218,7 +28218,11 @@ elif test "$gui" = "xlib"; then echo "Type engines :$type_engines_result" fi echo "DnD : $dnd" +if test "$gui" = "xlib"; then echo "Input Methods : XIM$input_methods_result" +else +echo "Input Methods :$input_methods_result" +fi echo "Scrollbars : simple${scrollbars_result}" echo "libssh2 : $ssh2" echo "mosh directory : $MOSH_DIR" diff --git a/configure.in b/configure.in index 61d50462..6a5781a7 100644 --- a/configure.in +++ b/configure.in @@ -2412,7 +2412,11 @@ elif test "$gui" = "xlib"; then echo "Type engines :$type_engines_result" fi echo "DnD : $dnd" +if test "$gui" = "xlib"; then echo "Input Methods : XIM$input_methods_result" +else +echo "Input Methods :$input_methods_result" +fi echo "Scrollbars : simple${scrollbars_result}" echo "libssh2 : $ssh2" echo "mosh directory : $MOSH_DIR" From d472b5cd010ea85389b591bef18452c407d3ec0b Mon Sep 17 00:00:00 2001 From: Michal Suchanek Date: Sun, 26 Feb 2023 15:58:15 +0100 Subject: [PATCH 3/6] fb: simplify opening framebuffer device Signed-off-by: Michal Suchanek --- uitoolkit/fb/ui_display_linux.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/uitoolkit/fb/ui_display_linux.c b/uitoolkit/fb/ui_display_linux.c index 8db347e5..7c336783 100644 --- a/uitoolkit/fb/ui_display_linux.c +++ b/uitoolkit/fb/ui_display_linux.c @@ -367,13 +367,15 @@ static int open_display(u_int depth) { bl_priv_restore_euid(); bl_priv_restore_egid(); - _display.fb_fd = open((dev = getenv("FRAMEBUFFER")) ? dev : "/dev/fb0", O_RDWR); + dev = getenv("FRAMEBUFFER"); + dev = dev ? dev : "/dev/fb0"; + _display.fb_fd = open(dev, O_RDWR); bl_priv_change_euid(bl_getuid()); bl_priv_change_egid(bl_getgid()); if (_display.fb_fd < 0) { - bl_error_printf("Couldn't open %s.\n", dev ? dev : "/dev/fb0"); + bl_error_printf("Couldn't open %s.\n", dev); return 0; } From 30cc3d45dffe70f1f49fd7b41fe34eb5289907ff Mon Sep 17 00:00:00 2001 From: Michal Suchanek Date: Sun, 26 Feb 2023 19:07:33 +0100 Subject: [PATCH 4/6] SDL2 UI also needs math libs Signed-off-by: Michal Suchanek --- main/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/Makefile.in b/main/Makefile.in index e44d24a7..6144de1f 100644 --- a/main/Makefile.in +++ b/main/Makefile.in @@ -68,7 +68,7 @@ LIBS2_wayland = @FT_LIBS@ @MATH_LIBS@ @DL_LIBS_IM@ @DL_LIBS_SB@ @SOCK_LIBS@ \ LIBS2_sdl2_win32 = ../uitoolkit/winrs.o -LIBS2_sdl2 = @SDL2_LIBS@ @DL_LIBS_IM@ @DL_LIBS_SB@ @FT_LIBS@ @SOCK_LIBS@ $(LIBS2_@GUI@_@SDL2GUI@) +LIBS2_sdl2 = @SDL2_LIBS@ @MATH_LIBS@ @DL_LIBS_IM@ @DL_LIBS_SB@ @FT_LIBS@ @SOCK_LIBS@ $(LIBS2_@GUI@_@SDL2GUI@) LIBS = $(LIBS1) $(LIBS2_@GUI@) From 98ceb4a92fa10adf97705e23bc931d0b2542fb02 Mon Sep 17 00:00:00 2001 From: Michal Suchanek Date: Sun, 26 Feb 2023 19:36:16 +0100 Subject: [PATCH 5/6] wayland: Detect compiler flags Use pkgconfig to detect include path required for building wayland backend. Do not hardcode wayland libraries, use pkgconfig to detect them. Signed-off-by: Michal Suchanek --- configure | 103 +++++++++++++++++++++++++++++++- configure.in | 5 +- inputmethod/canna/Makefile.in | 1 + inputmethod/fcitx/Makefile.in | 1 + inputmethod/ibus/Makefile.in | 1 + inputmethod/iiimf/Makefile.in | 1 + inputmethod/kbd/Makefile.in | 1 + inputmethod/m17nlib/Makefile.in | 1 + inputmethod/scim/Makefile.in | 1 + inputmethod/skk/Makefile.in | 1 + inputmethod/uim/Makefile.in | 1 + inputmethod/wnn/Makefile.in | 1 + main/Makefile.in | 5 +- uitoolkit/Makefile.in | 2 +- 14 files changed, 119 insertions(+), 6 deletions(-) diff --git a/configure b/configure index b34a7ab0..1a5a92ea 100755 --- a/configure +++ b/configure @@ -807,6 +807,8 @@ SDL2GUI sdl2_config SDL2_LIBS SDL2_CFLAGS +WAYLAND_LIBS +WAYLAND_CFLAGS SIXEL_LIBS SIXEL_CFLAGS VT_NORM_CFLAGS @@ -1033,6 +1035,8 @@ GIO_CFLAGS GIO_LIBS FT_CFLAGS FT_LIBS +WAYLAND_CFLAGS +WAYLAND_LIBS SDL2_CFLAGS SDL2_LIBS FRIBIDI_CFLAGS @@ -1796,6 +1800,10 @@ Some influential environment variables: GIO_LIBS linker flags for GIO, overriding pkg-config FT_CFLAGS C compiler flags for FT, overriding pkg-config FT_LIBS linker flags for FT, overriding pkg-config + WAYLAND_CFLAGS + C compiler flags for WAYLAND, overriding pkg-config + WAYLAND_LIBS + linker flags for WAYLAND, overriding pkg-config SDL2_CFLAGS C compiler flags for SDL2, overriding pkg-config SDL2_LIBS linker flags for SDL2, overriding pkg-config FRIBIDI_CFLAGS @@ -18268,8 +18276,101 @@ elif test "$gui" = "beos" ; then GUI="beos" GUI_CFLAGS="-DUSE_BEOS" elif test "$gui" = "wayland" ; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WAYLAND" >&5 +$as_echo_n "checking for WAYLAND... " >&6; } + +if test -n "$WAYLAND_CFLAGS"; then + pkg_cv_WAYLAND_CFLAGS="$WAYLAND_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-client wayland-cursor xkbcommon\""; } >&5 + ($PKG_CONFIG --exists --print-errors "wayland-client wayland-cursor xkbcommon") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_WAYLAND_CFLAGS=`$PKG_CONFIG --cflags "wayland-client wayland-cursor xkbcommon" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$WAYLAND_LIBS"; then + pkg_cv_WAYLAND_LIBS="$WAYLAND_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wayland-client wayland-cursor xkbcommon\""; } >&5 + ($PKG_CONFIG --exists --print-errors "wayland-client wayland-cursor xkbcommon") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_WAYLAND_LIBS=`$PKG_CONFIG --libs "wayland-client wayland-cursor xkbcommon" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + WAYLAND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "wayland-client wayland-cursor xkbcommon" 2>&1` + else + WAYLAND_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "wayland-client wayland-cursor xkbcommon" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$WAYLAND_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (wayland-client wayland-cursor xkbcommon) were not met: + +$WAYLAND_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables WAYLAND_CFLAGS +and WAYLAND_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables WAYLAND_CFLAGS +and WAYLAND_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see . +See \`config.log' for more details" "$LINENO" 5; } +else + WAYLAND_CFLAGS=$pkg_cv_WAYLAND_CFLAGS + WAYLAND_LIBS=$pkg_cv_WAYLAND_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +fi GUI="wayland" GUI_CFLAGS="-DUSE_WAYLAND" + + elif test "$gui" = "sdl2" ; then pkg_failed=no @@ -18342,7 +18443,7 @@ else $as_echo "yes" >&6; } have_sdl2=yes fi - if test "$have_sdl2" != "yes" ; then + if test "$have_sdl2" != "yes" ; then # Extract the first word of "sdl2-config", so it can be a program name with args. set dummy sdl2-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 diff --git a/configure.in b/configure.in index 6a5781a7..43cee48c 100644 --- a/configure.in +++ b/configure.in @@ -546,11 +546,14 @@ elif test "$gui" = "beos" ; then GUI="beos" GUI_CFLAGS="-DUSE_BEOS" elif test "$gui" = "wayland" ; then + PKG_CHECK_MODULES(WAYLAND, [wayland-client wayland-cursor xkbcommon]) GUI="wayland" GUI_CFLAGS="-DUSE_WAYLAND" + AC_SUBST(WAYLAND_CFLAGS) + AC_SUBST(WAYLAND_LIBS) elif test "$gui" = "sdl2" ; then PKG_CHECK_MODULES(SDL2, sdl2, have_sdl2=yes, have_sdl2=no) - if test "$have_sdl2" != "yes" ; then + if test "$have_sdl2" != "yes" ; then AC_CHECK_PROG(sdl2_config, sdl2-config, yes) if test "$sdl2_config" = "yes"; then SDL2_CFLAGS="`sdl2-config --cflags`" diff --git a/inputmethod/canna/Makefile.in b/inputmethod/canna/Makefile.in index a8466b4c..4c808cf5 100644 --- a/inputmethod/canna/Makefile.in +++ b/inputmethod/canna/Makefile.in @@ -16,6 +16,7 @@ CFLAGS = $(CFLAGS_LOCAL) \ @DEB_CFLAGS@ \ @X_CFLAGS@ \ @GUI_CFLAGS@ \ + @WAYLAND_CFLAGS@ \ @SDL2_CFLAGS@ \ @TRUECOLOR_CFLAGS@ \ @CFLAGS@ \ diff --git a/inputmethod/fcitx/Makefile.in b/inputmethod/fcitx/Makefile.in index 93b58b0a..219a8fc3 100644 --- a/inputmethod/fcitx/Makefile.in +++ b/inputmethod/fcitx/Makefile.in @@ -16,6 +16,7 @@ CFLAGS = $(CFLAGS_LOCAL) \ @DEB_CFLAGS@ \ @X_CFLAGS@ \ @GUI_CFLAGS@ \ + @WAYLAND_CFLAGS@ \ @SDL2_CFLAGS@ \ @TRUECOLOR_CFLAGS@ \ @CFLAGS@ \ diff --git a/inputmethod/ibus/Makefile.in b/inputmethod/ibus/Makefile.in index b65b8b76..cae381cf 100644 --- a/inputmethod/ibus/Makefile.in +++ b/inputmethod/ibus/Makefile.in @@ -16,6 +16,7 @@ CFLAGS = $(CFLAGS_LOCAL) \ @DEB_CFLAGS@ \ @X_CFLAGS@ \ @GUI_CFLAGS@ \ + @WAYLAND_CFLAGS@ \ @SDL2_CFLAGS@ \ @TRUECOLOR_CFLAGS@ \ @CFLAGS@ \ diff --git a/inputmethod/iiimf/Makefile.in b/inputmethod/iiimf/Makefile.in index f892bc3f..a4607939 100644 --- a/inputmethod/iiimf/Makefile.in +++ b/inputmethod/iiimf/Makefile.in @@ -18,6 +18,7 @@ CFLAGS = $(CFLAGS_LOCAL) \ @DEB_CFLAGS@ \ @X_CFLAGS@ \ @GUI_CFLAGS@ \ + @WAYLAND_CFLAGS@ \ @SDL2_CFLAGS@ \ @TRUECOLOR_CFLAGS@ \ @TYPE_CFLAGS@ \ diff --git a/inputmethod/kbd/Makefile.in b/inputmethod/kbd/Makefile.in index ff6242b3..43e21cbc 100644 --- a/inputmethod/kbd/Makefile.in +++ b/inputmethod/kbd/Makefile.in @@ -16,6 +16,7 @@ CFLAGS = $(CFLAGS_LOCAL) \ @DEB_CFLAGS@ \ @X_CFLAGS@ \ @GUI_CFLAGS@ \ + @WAYLAND_CFLAGS@ \ @SDL2_CFLAGS@ \ @TRUECOLOR_CFLAGS@ \ @CFLAGS@ \ diff --git a/inputmethod/m17nlib/Makefile.in b/inputmethod/m17nlib/Makefile.in index a1e012bb..ddef0a84 100644 --- a/inputmethod/m17nlib/Makefile.in +++ b/inputmethod/m17nlib/Makefile.in @@ -16,6 +16,7 @@ CFLAGS = $(CFLAGS_LOCAL) \ @DEB_CFLAGS@ \ @X_CFLAGS@ \ @GUI_CFLAGS@ \ + @WAYLAND_CFLAGS@ \ @SDL2_CFLAGS@ \ @TRUECOLOR_CFLAGS@ \ @CFLAGS@ \ diff --git a/inputmethod/scim/Makefile.in b/inputmethod/scim/Makefile.in index 5c835f8e..ee203ae2 100644 --- a/inputmethod/scim/Makefile.in +++ b/inputmethod/scim/Makefile.in @@ -16,6 +16,7 @@ CFLAGS = $(CFLAGS_LOCAL) \ @MEF_CFLAGS@ \ @X_CFLAGS@ \ @GUI_CFLAGS@ \ + @WAYLAND_CFLAGS@ \ @SDL2_CFLAGS@ \ @TRUECOLOR_CFLAGS@ \ @CFLAGS@ \ diff --git a/inputmethod/skk/Makefile.in b/inputmethod/skk/Makefile.in index 4e37c9fa..a86cbb20 100644 --- a/inputmethod/skk/Makefile.in +++ b/inputmethod/skk/Makefile.in @@ -16,6 +16,7 @@ CFLAGS = $(CFLAGS_LOCAL) \ @DEB_CFLAGS@ \ @X_CFLAGS@ \ @GUI_CFLAGS@ \ + @WAYLAND_CFLAGS@ \ @SDL2_CFLAGS@ \ @TRUECOLOR_CFLAGS@ \ @CFLAGS@ \ diff --git a/inputmethod/uim/Makefile.in b/inputmethod/uim/Makefile.in index 766c621b..a20d03a9 100644 --- a/inputmethod/uim/Makefile.in +++ b/inputmethod/uim/Makefile.in @@ -16,6 +16,7 @@ CFLAGS = $(CFLAGS_LOCAL) \ @DEB_CFLAGS@ \ @X_CFLAGS@ \ @GUI_CFLAGS@ \ + @WAYLAND_CFLAGS@ \ @SDL2_CFLAGS@ \ @TRUECOLOR_CFLAGS@ \ @CFLAGS@ \ diff --git a/inputmethod/wnn/Makefile.in b/inputmethod/wnn/Makefile.in index f74334a1..e57849d8 100644 --- a/inputmethod/wnn/Makefile.in +++ b/inputmethod/wnn/Makefile.in @@ -16,6 +16,7 @@ CFLAGS = $(CFLAGS_LOCAL) \ @DEB_CFLAGS@ \ @X_CFLAGS@ \ @GUI_CFLAGS@ \ + @WAYLAND_CFLAGS@ \ @SDL2_CFLAGS@ \ @TRUECOLOR_CFLAGS@ \ @CFLAGS@ \ diff --git a/main/Makefile.in b/main/Makefile.in index 6144de1f..83e810c1 100644 --- a/main/Makefile.in +++ b/main/Makefile.in @@ -38,7 +38,7 @@ LMEF_DEB = -lmef_deb # XDATADIR is to avoid conflicting with DATADIR structure in w32api/objidl.h. CFLAGS = $(CFLAGS_LOCAL) @POBL_CFLAGS@ @MEF_CFLAGS@ @DEB_CFLAGS@ @BRLAPI_CFLAGS@ \ - @X_CFLAGS@ @GUI_CFLAGS@ @SSH2_CFLAGS@ @TYPE_CFLAGS@ @FT_CFLAGS@ @SDL2_CFLAGS@ \ + @X_CFLAGS@ @GUI_CFLAGS@ @SSH2_CFLAGS@ @TYPE_CFLAGS@ @FT_CFLAGS@ @WAYLAND_CFLAGS@ @SDL2_CFLAGS@ \ @DAEMON_CFLAGS@ @SPLIT_CFLAGS@ @DND_CFLAGS@ @TRANSFER_CFLAGS@ @IMAGE_CFLAGS@ \ @TRUECOLOR_CFLAGS@ @CFLAGS@ @CPPFLAGS@ -DSYSCONFDIR=\"$(sysconfdir)\" \ -I$(top_srcdir)/vtemu \ @@ -63,8 +63,7 @@ LIBS2_beos = -lbe -ltranslation -lsocket LIBS2_console = @SIXEL_LIBS@ @MATH_LIBS@ @DL_LIBS_IM@ @DL_LIBS_SB@ @SOCK_LIBS@ -LIBS2_wayland = @FT_LIBS@ @MATH_LIBS@ @DL_LIBS_IM@ @DL_LIBS_SB@ @SOCK_LIBS@ \ - -lwayland-client -lwayland-cursor -lxkbcommon +LIBS2_wayland = @WAYLAND_LIBS@ @FT_LIBS@ @MATH_LIBS@ @DL_LIBS_IM@ @DL_LIBS_SB@ @SOCK_LIBS@ LIBS2_sdl2_win32 = ../uitoolkit/winrs.o diff --git a/uitoolkit/Makefile.in b/uitoolkit/Makefile.in index 0d0a1bb0..12e35328 100644 --- a/uitoolkit/Makefile.in +++ b/uitoolkit/Makefile.in @@ -60,7 +60,7 @@ CFLAGS = $(CFLAGS_LOCAL) @POBL_CFLAGS@ @MEF_CFLAGS@ @DEB_CFLAGS@ @MATH_CFLAGS@ \ @IMAGELIB_CFLAGS@ @X_CFLAGS@ @GUI_CFLAGS@ @SSH2_CFLAGS@ @XUTF8_CFLAGS@ @DND_CFLAGS@ \ @IM_CFLAGS@ @SB_CFLAGS@ @REGEX_CFLAGS@ @CTL_CFLAGS@ @TYPE_CFLAGS@ @FT_CFLAGS@ \ @IMAGE_CFLAGS@ @TOOLS_CFLAGS@ @OT_LAYOUT_CFLAGS@ @SIXEL_CFLAGS@ @BRLAPI_CFLAGS@ \ - @SDL2_CFLAGS@ @SPLIT_CFLAGS@ @TRUECOLOR_CFLAGS@ @CFLAGS@ @CPPFLAGS@ \ + @WAYLAND_CFLAGS@ @SDL2_CFLAGS@ @SPLIT_CFLAGS@ @TRUECOLOR_CFLAGS@ @CFLAGS@ @CPPFLAGS@ \ -DBINDIR=\"$(bindir)\" -DLIBDIR=\"$(libdir)\" -DLIBEXECDIR=\"$(libexecdir)\" \ -DXDATADIR=\"$(datadir)\" \ -I$(top_srcdir)/vtemu -I$(top_srcdir)/uitoolkit/libotl -I/usr/local/include From ccf5b22123dc0dee99ac6af3b70a1adf547bb29a Mon Sep 17 00:00:00 2001 From: Michal Suchanek Date: Sat, 4 Mar 2023 12:35:07 +0100 Subject: [PATCH 6/6] Move static makefiles conflicting with generated mlcc and mlclient have a static makefile shipped under the same filename as the generated makefile. Running configure overwrites these static makefiles with generated ones. That causes git to detect a file change in these makefiles, prevent most operations, and suggesting to include these changes in new commits. Move the makefiles away to prevent issues. Signed-off-by: Michal Suchanek --- contrib/tool/mlcc/{Makefile => Makefile.static} | 0 tool/mlclient/{Makefile => Makefile.static} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename contrib/tool/mlcc/{Makefile => Makefile.static} (100%) rename tool/mlclient/{Makefile => Makefile.static} (100%) diff --git a/contrib/tool/mlcc/Makefile b/contrib/tool/mlcc/Makefile.static similarity index 100% rename from contrib/tool/mlcc/Makefile rename to contrib/tool/mlcc/Makefile.static diff --git a/tool/mlclient/Makefile b/tool/mlclient/Makefile.static similarity index 100% rename from tool/mlclient/Makefile rename to tool/mlclient/Makefile.static