From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LwhnU-0003l3-19 for qemu-devel@nongnu.org; Wed, 22 Apr 2009 15:07:52 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LwhnP-0003jF-FZ for qemu-devel@nongnu.org; Wed, 22 Apr 2009 15:07:51 -0400 Received: from [199.232.76.173] (port=54880 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LwhnP-0003iy-6F for qemu-devel@nongnu.org; Wed, 22 Apr 2009 15:07:47 -0400 Received: from wa-out-1112.google.com ([209.85.146.182]:50388) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LwhnN-0003uD-Ko for qemu-devel@nongnu.org; Wed, 22 Apr 2009 15:07:45 -0400 Received: by wa-out-1112.google.com with SMTP id m33so52216wag.18 for ; Wed, 22 Apr 2009 12:07:41 -0700 (PDT) From: Steven Noonan Date: Wed, 22 Apr 2009 11:45:36 -0700 Message-Id: <1240425936-82453-1-git-send-email-steven@uplinklabs.net> Subject: [Qemu-devel] [PATCH] sasl, tls: fix compilation on systems with nonstandard install points List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Steven Noonan 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 --- 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