Users of MacPorts will experience this problem if they install
gnutls through 'port install'. The object files vnc-tls.o and
vnc-auth-vencrypt.o aren't compiled with the right flags and
end up causing compiler errors about missing headers, etc. This
patch corrects this by adding the flags to the objects which
complain without them.
Signed-off-by: Steven Noonan <
address@hidden>
---
Makefile | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index ed887de..fb4cb4f 100644
--- a/Makefile
+++ b/Makefile
@@ -194,14 +194,20 @@ vnc.h: vnc-tls.h vnc-auth-vencrypt.h vnc-auth-sasl.h keymaps.h
vnc.o: vnc.c vnc.h vnc_keysym.h vnchextile.h d3des.c d3des.h acl.h
-vnc.o: CFLAGS += $(CONFIG_VNC_TLS_CFLAGS)
+vnc.o: CFLAGS += $(CONFIG_VNC_TLS_CFLAGS) $(CONFIG_VNC_SASL_CFLAGS)
vnc-tls.o: vnc-tls.c vnc.h
+vnc-tls.o: CFLAGS += $(CONFIG_VNC_TLS_CFLAGS) $(CONFIG_VNC_SASL_CFLAGS)
+
vnc-auth-vencrypt.o: vnc-auth-vencrypt.c vnc.h
+vnc-auth-vencrypt.o: CFLAGS += $(CONFIG_VNC_TLS_CFLAGS) $(CONFIG_VNC_SASL_CFLAGS)
+
vnc-auth-sasl.o: vnc-auth-sasl.c vnc.h
+vnc-auth-sasl.o: CFLAGS += $(CONFIG_VNC_TLS_CFLAGS) $(CONFIG_VNC_SASL_CFLAGS)
+
curses.o: curses.c keymaps.h curses_keys.h
bt-host.o: CFLAGS += $(CONFIG_BLUEZ_CFLAGS)
--
1.6.2.1