@@ -106,8 +106,8 @@ ui-obj-y += keymaps.o
ui-obj-$(CONFIG_SDL) += sdl.o sdl_zoom.o x_keymap.o
ui-obj-$(CONFIG_CURSES) += curses.o
ui-obj-y += vnc.o d3des.o
-ui-obj-y += vnc-encoding-zlib.o vnc-encoding-hextile.o
-ui-obj-y += vnc-encoding-tight.o
+ui-obj-y += vnc-enc-zlib.o vnc-enc-hextile.o
+ui-obj-y += vnc-enc-tight.o
ui-obj-$(CONFIG_VNC_TLS) += vnc-tls.o vnc-auth-vencrypt.o
ui-obj-$(CONFIG_VNC_SASL) += vnc-auth-sasl.o
ui-obj-$(CONFIG_COCOA) += cocoa.o
similarity index 100%
rename from ui/vnchextile.h
rename to ui/vnc-enc-hextile-template.h
similarity index 93%
rename from ui/vnc-encoding-hextile.c
rename to ui/vnc-enc-hextile.c
@@ -33,32 +33,32 @@ static void hextile_enc_cord(uint8_t *ptr, int x, int y, int w, int h)
}
#define BPP 8
-#include "vnchextile.h"
+#include "vnc-enc-hextile-template.h"
#undef BPP
#define BPP 16
-#include "vnchextile.h"
+#include "vnc-enc-hextile-template.h"
#undef BPP
#define BPP 32
-#include "vnchextile.h"
+#include "vnc-enc-hextile-template.h"
#undef BPP
#define GENERIC
#define BPP 8
-#include "vnchextile.h"
+#include "vnc-enc-hextile-template.h"
#undef BPP
#undef GENERIC
#define GENERIC
#define BPP 16
-#include "vnchextile.h"
+#include "vnc-enc-hextile-template.h"
#undef BPP
#undef GENERIC
#define GENERIC
#define BPP 32
-#include "vnchextile.h"
+#include "vnc-enc-hextile-template.h"
#undef BPP
#undef GENERIC
similarity index 99%
rename from ui/vnc-encoding-tight.c
rename to ui/vnc-enc-tight.c
@@ -37,7 +37,7 @@
#include "qdict.h"
#include "qint.h"
#include "vnc.h"
-#include "vnc-encoding-tight.h"
+#include "vnc-enc-tight.h"
/* Compression level stuff. The following array contains various
encoder parameters for each of 10 compression levels (0..9).
For the same reason that we don't use vnc-authentication-sasl.c but vnc-auth-sals.c. Because it's tooooo long. Signed-off-by: Corentin Chary <corentincj@iksaif.net> --- Makefile.objs | 4 ++-- ui/{vnchextile.h => vnc-enc-hextile-template.h} | 0 ui/{vnc-encoding-hextile.c => vnc-enc-hextile.c} | 12 ++++++------ ui/{vnc-encoding-tight.c => vnc-enc-tight.c} | 2 +- ui/{vnc-encoding-tight.h => vnc-enc-tight.h} | 0 ui/{vnc-encoding-zlib.c => vnc-enc-zlib.c} | 0 6 files changed, 9 insertions(+), 9 deletions(-) rename ui/{vnchextile.h => vnc-enc-hextile-template.h} (100%) rename ui/{vnc-encoding-hextile.c => vnc-enc-hextile.c} (93%) rename ui/{vnc-encoding-tight.c => vnc-enc-tight.c} (99%) rename ui/{vnc-encoding-tight.h => vnc-enc-tight.h} (100%) rename ui/{vnc-encoding-zlib.c => vnc-enc-zlib.c} (100%) diff --git a/ui/vnc-encoding-tight.h b/ui/vnc-enc-tight.h similarity index 100% rename from ui/vnc-encoding-tight.h rename to ui/vnc-enc-tight.h diff --git a/ui/vnc-encoding-zlib.c b/ui/vnc-enc-zlib.c similarity index 100% rename from ui/vnc-encoding-zlib.c rename to ui/vnc-enc-zlib.c