mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-26 01:59:57 +00:00
Convert servers to using _DEPENDENCIES to ensure proper rebuilds.
This cleans up server Makefile.ams a little bit, but also means that people messing with configure.ac need to be careful with whether they put libraries in the _LIBS or _SYS_LIBS targets. Hopefully the comment in configure.ac will clarify the issues.
This commit is contained in:
parent
3f42af8c0e
commit
a02db0d500
9 changed files with 186 additions and 170 deletions
|
|
@ -70,12 +70,14 @@ Xgl_SOURCES = \
|
|||
$(top_srcdir)/Xext/dpmsstubs.c \
|
||||
$(top_srcdir)/Xi/stubs.c \
|
||||
$(top_srcdir)/fb/fbcmap.c
|
||||
Xgl_LDADD = \
|
||||
|
||||
XGL_LIBS = \
|
||||
libxgl.a \
|
||||
$(XORG_CORE_LIBS) \
|
||||
$(XGL_LIBS) \
|
||||
$(XSERVER_LIBS) \
|
||||
$(EXTENSION_LIBS) -lglitz -ldl
|
||||
@XGL_LIBS@ \
|
||||
$(XSERVER_LIBS)
|
||||
|
||||
Xgl_DEPENDENCIES = $(XGL_LIBS)
|
||||
Xgl_LDADD = $(XGL_LIBS) $(XSERVER_SYS_LIBS) $(XGL_SYS_LIBS)
|
||||
Xgl_programs = Xgl
|
||||
|
||||
bin_PROGRAMS = $(Xgl_programs)
|
||||
|
|
|
|||
|
|
@ -24,7 +24,12 @@ libxegl_la_SOURCES = \
|
|||
kinput.c \
|
||||
evdev.c
|
||||
|
||||
Xegl_DEPENDENCIES = @XEGL_LIBS@
|
||||
XEGL_LIBS = \
|
||||
@XEGL_LIBS@ \
|
||||
libxegl.la \
|
||||
../libxgl.a \
|
||||
$XSERVER_LIBS
|
||||
|
||||
Xegl_LDFLAGS = -export-dynamic
|
||||
Xegl_SOURCES = \
|
||||
xeglinit.c \
|
||||
|
|
@ -32,14 +37,8 @@ Xegl_SOURCES = \
|
|||
$(top_srcdir)/Xext/dpmsstubs.c \
|
||||
$(top_srcdir)/Xi/stubs.c \
|
||||
$(top_srcdir)/fb/fbcmap.c
|
||||
Xegl_LDADD = \
|
||||
libxegl.la \
|
||||
../libxgl.a \
|
||||
$(XORG_CORE_LIBS) \
|
||||
$(XEGL_LIBS) \
|
||||
$(XSERVER_LIBS) \
|
||||
$(EXTENSION_LIBS) \
|
||||
$(XGLXMODULES_LIBS)
|
||||
Xegl_programs = Xegl
|
||||
|
||||
bin_PROGRAMS = $(Xegl_programs)
|
||||
Xegl_DEPENDENCIES = $(XEGL_LIBS)
|
||||
Xegl_LDADD = $(XEGL_LIBS) $(XSERVER_SYS_LIBS) $(XEGL_SYS_LIBS)
|
||||
|
||||
bin_PROGRAMS = Xegl
|
||||
|
|
|
|||
Loading…
Reference in a new issue