Signed-off-by: Jon TURNEY <jon.tur...@dronecode.org.uk> --- Xi/Makefile.am | 5 +++-- hw/vfb/Makefile.am | 4 ++-- hw/xnest/Makefile.am | 4 ++-- hw/xwin/Makefile.am | 4 ++-- test/Makefile.am | 4 ++-- 5 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/Xi/Makefile.am b/Xi/Makefile.am index 69c7886..026824b 100644 --- a/Xi/Makefile.am +++ b/Xi/Makefile.am @@ -1,4 +1,4 @@ -noinst_LTLIBRARIES = libXi.la +noinst_LTLIBRARIES = libXi.la libXistubs.la AM_CFLAGS = $(DIX_CFLAGS) @@ -105,4 +105,5 @@ libXi_la_SOURCES = \ xiwarppointer.c \ xiwarppointer.h -EXTRA_DIST = stubs.c +libXistubs_la_SOURCES = \ + stubs.c diff --git a/hw/vfb/Makefile.am b/hw/vfb/Makefile.am index c9f6957..a02a438 100644 --- a/hw/vfb/Makefile.am +++ b/hw/vfb/Makefile.am @@ -9,7 +9,6 @@ AM_CFLAGS = -DHAVE_DIX_CONFIG_H \ SRCS = InitInput.c \ InitOutput.c \ - $(top_srcdir)/Xi/stubs.c \ $(top_srcdir)/mi/miinitext.c libfbcmap_a_CFLAGS = $(AM_CFLAGS) @@ -22,7 +21,8 @@ XVFB_LIBS = \ libfbcmap.a \ $(MAIN_LIB) \ $(XSERVER_LIBS) \ - $(top_builddir)/Xext/libXextdpmsstubs.la + $(top_builddir)/Xext/libXextdpmsstubs.la \ + $(top_builddir)/Xi/libXistubs.la Xvfb_LDADD = $(XVFB_LIBS) $(XVFB_SYS_LIBS) $(XSERVER_SYS_LIBS) Xvfb_DEPENDENCIES = $(XVFB_LIBS) diff --git a/hw/xnest/Makefile.am b/hw/xnest/Makefile.am index c5560fd..bb8d3d8 100644 --- a/hw/xnest/Makefile.am +++ b/hw/xnest/Makefile.am @@ -42,7 +42,6 @@ SRCS = Args.c \ XNPixmap.h \ XNWindow.h \ xnest-config.h \ - $(top_srcdir)/Xi/stubs.c \ $(top_srcdir)/mi/miinitext.c libfbcmap_a_SOURCES = $(top_srcdir)/fb/fbcmap_mi.c @@ -51,7 +50,8 @@ libfbcmap_a_CFLAGS = $(AM_CFLAGS) XNEST_LIBS = \ @XNEST_LIBS@ \ libfbcmap.a \ - $(top_builddir)/Xext/libXextdpmsstubs.la + $(top_builddir)/Xext/libXextdpmsstubs.la \ + $(top_builddir)/Xi/libXistubs.la Xnest_SOURCES = $(SRCS) diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am index a5f2348..2e45c57 100644 --- a/hw/xwin/Makefile.am +++ b/hw/xwin/Makefile.am @@ -122,7 +122,6 @@ SRCS = InitInput.c \ winresource.h \ winwindow.h \ XWin.rc \ - $(top_srcdir)/Xi/stubs.c \ $(top_srcdir)/mi/miinitext.c \ $(top_srcdir)/fb/fbcmap_mi.c \ $(SRCS_CLIPBOARD) \ @@ -148,7 +147,8 @@ INCLUDES = -I$(top_srcdir)/miext/rootless XWIN_SYS_LIBS += -ldxguid XWIN_LIBS += $(top_builddir)/pseudoramiX/libPseudoramiX.la \ - $(top_builddir)/Xext/libXextdpmsstubs.la + $(top_builddir)/Xext/libXextdpmsstubs.la \ + $(top_builddir)/Xi/libXistubs.la XWin_DEPENDENCIES = $(MULTIWINDOWEXTWM_LIBS) $(XWIN_GLX_LIBS) $(XWIN_LIBS) $(XSERVER_LIBS) XWin_LDADD = $(MULTIWINDOWEXTWM_LIBS) $(XWIN_GLX_LIBS) $(XWIN_GLX_LINK_FLAGS) $(XWIN_LIBS) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XWIN_SYS_LIBS) diff --git a/test/Makefile.am b/test/Makefile.am index 0c1e595..06e5538 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -67,8 +67,7 @@ endif else nodist_libxservertest_la_SOURCES = \ ddxstubs.c \ - $(top_srcdir)/mi/miinitext.c \ - $(top_srcdir)/Xi/stubs.c + $(top_srcdir)/mi/miinitext.c libxservertest_la_LIBADD += \ $(top_builddir)/damageext/libdamageext.la \ @@ -81,6 +80,7 @@ libxservertest_la_LIBADD += \ $(top_builddir)/Xext/libXext.la \ $(top_builddir)/Xext/libXextdpmsstubs.la \ $(top_builddir)/Xi/libXi.la \ + $(top_builddir)/Xi/libXistubs.la \ $(top_builddir)/xfixes/libxfixes.la \ $(top_builddir)/xkb/libxkb.la \ $(top_builddir)/xkb/libxkbstubs.la -- 1.7.9 _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel