XQuartz: Fix Makefile dependencies
automake generates _DEPENDENCIES from _LIBADD, but it strips out variables. This resulted in not relinking if some components were rebuilt (like libdix, libos, etc). Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
This commit is contained in:
parent
c8b80a82d9
commit
bea57392c7
|
@ -1889,8 +1889,8 @@ if test "x$XQUARTZ" = xyes; then
|
|||
AC_DEFINE(XQUARTZ,1,[Have Quartz])
|
||||
AC_DEFINE(ROOTLESS,1,[Build Rootless code])
|
||||
|
||||
DARWIN_LIBS="$MI_LIB $OS_LIB $DIX_LIB $MAIN_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB"
|
||||
AC_SUBST([DARWIN_LIBS])
|
||||
XQUARTZ_LIBS="$MAIN_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB"
|
||||
AC_SUBST([XQUARTZ_LIBS])
|
||||
|
||||
AC_CHECK_LIB([Xplugin],[xp_init],[:])
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@ X11_bin_LDADD = \
|
|||
$(top_builddir)/dix/dixfonts.lo \
|
||||
$(top_builddir)/miext/rootless/librootless.la \
|
||||
$(top_builddir)/hw/xquartz/pbproxy/libxpbproxy.la \
|
||||
$(DARWIN_LIBS) $(MAIN_LIB) $(XSERVER_LIBS)
|
||||
$(XQUARTZ_LIBS) $(XSERVER_LIBS)
|
||||
|
||||
X11_bin_LDFLAGS = \
|
||||
$(XSERVER_SYS_LIBS) -lXplugin \
|
||||
|
@ -52,6 +52,8 @@ X11_bin_LDADD += \
|
|||
$(top_builddir)/record/librecord.la
|
||||
endif
|
||||
|
||||
X11_bin_DEPENDENCIES = $(X11_bin_LDADD)
|
||||
|
||||
bin_PROGRAMS = Xquartz
|
||||
|
||||
dist_Xquartz_SOURCES = \
|
||||
|
|
Loading…
Reference in New Issue
Block a user