Build dpmsstubs.c once as a convenience library, rather than once for each DDX which wants to use it
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
This commit is contained in:
parent
7b2a517ba9
commit
45b223e1c2
|
@ -1,4 +1,4 @@
|
|||
noinst_LTLIBRARIES = libXext.la
|
||||
noinst_LTLIBRARIES = libXext.la libXextdpmsstubs.la
|
||||
|
||||
AM_CFLAGS = $(DIX_CFLAGS)
|
||||
|
||||
|
@ -96,6 +96,8 @@ endif
|
|||
libXext_la_SOURCES = $(BUILTIN_SRCS)
|
||||
libXext_la_LIBADD = $(BUILTIN_LIBS)
|
||||
|
||||
libXextdpmsstubs_la_SOURCES = dpmsstubs.c
|
||||
|
||||
EXTRA_DIST = \
|
||||
$(MITSHM_SRCS) \
|
||||
$(XV_SRCS) \
|
||||
|
|
|
@ -9,7 +9,6 @@ AM_CFLAGS = -DHAVE_DIX_CONFIG_H \
|
|||
|
||||
SRCS = InitInput.c \
|
||||
InitOutput.c \
|
||||
$(top_srcdir)/Xext/dpmsstubs.c \
|
||||
$(top_srcdir)/Xi/stubs.c \
|
||||
$(top_srcdir)/mi/miinitext.c
|
||||
|
||||
|
@ -22,7 +21,8 @@ XVFB_LIBS = \
|
|||
@XVFB_LIBS@ \
|
||||
libfbcmap.a \
|
||||
$(MAIN_LIB) \
|
||||
$(XSERVER_LIBS)
|
||||
$(XSERVER_LIBS) \
|
||||
$(top_builddir)/Xext/libXextdpmsstubs.la
|
||||
|
||||
Xvfb_LDADD = $(XVFB_LIBS) $(XVFB_SYS_LIBS) $(XSERVER_SYS_LIBS)
|
||||
Xvfb_DEPENDENCIES = $(XVFB_LIBS)
|
||||
|
|
|
@ -42,7 +42,6 @@ SRCS = Args.c \
|
|||
XNPixmap.h \
|
||||
XNWindow.h \
|
||||
xnest-config.h \
|
||||
$(top_srcdir)/Xext/dpmsstubs.c \
|
||||
$(top_srcdir)/Xi/stubs.c \
|
||||
$(top_srcdir)/mi/miinitext.c
|
||||
|
||||
|
@ -51,7 +50,8 @@ libfbcmap_a_CFLAGS = $(AM_CFLAGS)
|
|||
|
||||
XNEST_LIBS = \
|
||||
@XNEST_LIBS@ \
|
||||
libfbcmap.a
|
||||
libfbcmap.a \
|
||||
$(top_builddir)/Xext/libXextdpmsstubs.la
|
||||
|
||||
Xnest_SOURCES = $(SRCS)
|
||||
|
||||
|
|
|
@ -127,7 +127,6 @@ SRCS = InitInput.c \
|
|||
winresource.h \
|
||||
winwindow.h \
|
||||
XWin.rc \
|
||||
$(top_srcdir)/Xext/dpmsstubs.c \
|
||||
$(top_srcdir)/Xi/stubs.c \
|
||||
$(top_srcdir)/mi/miinitext.c \
|
||||
$(top_srcdir)/fb/fbcmap_mi.c \
|
||||
|
@ -153,12 +152,13 @@ XWin_SOURCES = $(SRCS)
|
|||
AM_CPPFLAGS = -I$(top_srcdir)/miext/rootless
|
||||
|
||||
XWIN_SYS_LIBS += -ldxguid
|
||||
XWIN_LIBS += $(top_builddir)/pseudoramiX/libPseudoramiX.la
|
||||
|
||||
XWIN_LIBS += $(top_builddir)/pseudoramiX/libPseudoramiX.la \
|
||||
$(top_builddir)/Xext/libXextdpmsstubs.la
|
||||
XWin_DEPENDENCIES = $(MULTIWINDOWEXTWM_LIBS) $(XWIN_GLX_LIBS) $(XWIN_LIBS) $(XSERVER_LIBS)
|
||||
XWin_LDADD = $(MULTIWINDOW_LIBS) $(MULTIWINDOWEXTWM_LIBS) $(XWIN_GLX_LIBS) $(XWIN_GLX_LINK_FLAGS) $(XWIN_LIBS) $(MAIN_LIB) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XWIN_SYS_LIBS)
|
||||
XWin_LDFLAGS = -mwindows -static -Wl,--disable-stdcall-fixup
|
||||
|
||||
|
||||
.rc.o:
|
||||
$(AM_V_GEN)$(WINDRES) --use-temp-file -i $< --input-format=rc -o $@ -O coff -I $(top_builddir)/include
|
||||
|
||||
|
|
|
@ -71,7 +71,6 @@ else
|
|||
nodist_libxservertest_la_SOURCES = \
|
||||
ddxstubs.c \
|
||||
$(top_srcdir)/mi/miinitext.c \
|
||||
$(top_srcdir)/Xext/dpmsstubs.c \
|
||||
$(top_srcdir)/Xi/stubs.c
|
||||
|
||||
libxservertest_la_LIBADD += \
|
||||
|
@ -83,6 +82,7 @@ libxservertest_la_LIBADD += \
|
|||
$(top_builddir)/randr/librandr.la \
|
||||
$(top_builddir)/render/librender.la \
|
||||
$(top_builddir)/Xext/libXext.la \
|
||||
$(top_builddir)/Xext/libXextdpmsstubs.la \
|
||||
$(top_builddir)/Xi/libXi.la \
|
||||
$(top_builddir)/xfixes/libxfixes.la \
|
||||
$(top_builddir)/xkb/libxkb.la \
|
||||
|
|
Loading…
Reference in New Issue