From: Pierre Ossman <ossman@cendio.se>
Date: Tue, 5 Jul 2022 07:19:07 +0000 (+0200)
Subject: Fix Xvnc dependency list (again)
X-Git-Tag: v1.12.90~28
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2481f42c09dbe3870fd9e30f26d73e1d4778eea2;p=tigervnc.git

Fix Xvnc dependency list (again)

The previous commit was incorrect in that it overrides automake's
dependency list, rather than adding to it. So we need to make sure
things are duplicated between Xvnc_DEPENDENCIES and Xvnc_LDADD as
appropriate.

Use the same approach as the Xorg binary to keep things familiar.
---

diff --git a/unix/xserver/hw/vnc/Makefile.am b/unix/xserver/hw/vnc/Makefile.am
index f7ab0586..143f9b0a 100644
--- a/unix/xserver/hw/vnc/Makefile.am
+++ b/unix/xserver/hw/vnc/Makefile.am
@@ -44,9 +44,14 @@ Xvnc_CPPFLAGS = $(XVNC_CPPFLAGS) -DTIGERVNC -DNO_MODULE_EXTS \
 	-DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common -I$(TIGERVNC_SRCDIR)/unix/common \
 	-I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS}
 
-Xvnc_DEPENDENCIES = $(XVNC_LIBS) $(XSERVER_LIBS)
-Xvnc_LDADD = $(XVNC_LIBS) libvnccommon.la $(COMMON_LIBS) \
-	$(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XVNC_SYS_LIBS) -lX11
+LOCAL_LIBS = \
+	$(XVNC_LIBS) \ \
+	$(XSERVER_LIBS) \
+	libvnccommon.la \
+	$(COMMON_LIBS)
+
+Xvnc_DEPENDENCIES = $(LOCAL_LIBS)
+Xvnc_LDADD = $(LOCAL_LIBS) $(XSERVER_SYS_LIBS) $(XVNC_SYS_LIBS) -lX11
 
 Xvnc_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)