diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2020-12-12 09:31:01 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2020-12-12 09:31:01 +0000 |
| commit | de1becf4e6fef4f4af7ddcce36b218eb8b97e953 (patch) | |
| tree | 6c9ca26361bcdb5ff8552163eef21caa9a15c4f7 /xserver/glx | |
| parent | 547f94c1bd5f859fdb141297f602245d127f205b (diff) | |
Update X server to version 1.20.10. Tested by jsg@ and naddy@
Diffstat (limited to 'xserver/glx')
| -rw-r--r-- | xserver/glx/Makefile.am | 4 | ||||
| -rw-r--r-- | xserver/glx/Makefile.in | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/xserver/glx/Makefile.am b/xserver/glx/Makefile.am index 0f652356d..8f19e9dc7 100644 --- a/xserver/glx/Makefile.am +++ b/xserver/glx/Makefile.am @@ -81,7 +81,7 @@ libglx_la_SOURCES = \ unpack.h \ xfont.c -libglx_la_LIBADD = $(DLOPEN_LIBS) +libglx_la_LIBADD = $(DLOPEN_LIBS) $(top_builddir)/Xext/libhashtable.la libglxvnd_la_SOURCES = \ vndcmds.c \ @@ -90,4 +90,6 @@ libglxvnd_la_SOURCES = \ vndservervendor.h \ vndservervendor.c +libglxvnd_la_LIBADD = $(top_builddir)/Xext/libhashtable.la + EXTRA_DIST = vnd_dispatch_stubs.c diff --git a/xserver/glx/Makefile.in b/xserver/glx/Makefile.in index f055567fb..f007cdeca 100644 --- a/xserver/glx/Makefile.in +++ b/xserver/glx/Makefile.in @@ -76,7 +76,8 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) am__DEPENDENCIES_1 = -libglx_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +libglx_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(top_builddir)/Xext/libhashtable.la am__objects_1 = indirect_dispatch.lo indirect_dispatch_swap.lo \ indirect_reqsize.lo indirect_size_get.lo indirect_table.lo am_libglx_la_OBJECTS = $(am__objects_1) clientinfo.lo createcontext.lo \ @@ -97,7 +98,7 @@ am__libglxdri_la_SOURCES_DIST = glxdri2.c am_libglxdri_la_OBJECTS = $(am__objects_2) libglxdri_la_OBJECTS = $(am_libglxdri_la_OBJECTS) @DRI2_TRUE@am_libglxdri_la_rpath = -libglxvnd_la_LIBADD = +libglxvnd_la_DEPENDENCIES = $(top_builddir)/Xext/libhashtable.la am_libglxvnd_la_OBJECTS = vndcmds.lo vndext.lo vndservermapping.lo \ vndservervendor.lo libglxvnd_la_OBJECTS = $(am_libglxvnd_la_OBJECTS) @@ -523,6 +524,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sdkdir = @sdkdir@ sharedstatedir = @sharedstatedir@ @@ -607,7 +609,7 @@ libglx_la_SOURCES = \ unpack.h \ xfont.c -libglx_la_LIBADD = $(DLOPEN_LIBS) +libglx_la_LIBADD = $(DLOPEN_LIBS) $(top_builddir)/Xext/libhashtable.la libglxvnd_la_SOURCES = \ vndcmds.c \ vndext.c \ @@ -615,6 +617,7 @@ libglxvnd_la_SOURCES = \ vndservervendor.h \ vndservervendor.c +libglxvnd_la_LIBADD = $(top_builddir)/Xext/libhashtable.la EXTRA_DIST = vnd_dispatch_stubs.c all: all-am |