diff options
| author | Keith Packard <keithp@keithp.com> | 2014-03-31 23:24:56 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-03-31 23:24:56 -0700 |
| commit | 9d20d18fb9dcc74bfa5392a2da40fd41b3e640d3 (patch) | |
| tree | 135063a0eb5dec386a3534434dcc4022c0a37f64 /hw/xwin/Makefile.am | |
| parent | 8468e24430988058b150dc1daef3aad6ba9fa698 (diff) | |
| parent | bc348bd2c42f3f18786085ccef2f010eff5bf3d2 (diff) | |
Merge remote-tracking branch 'jturney/master'
Diffstat (limited to 'hw/xwin/Makefile.am')
| -rw-r--r-- | hw/xwin/Makefile.am | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am index 7f0eaf097..cf42cfd2d 100644 --- a/hw/xwin/Makefile.am +++ b/hw/xwin/Makefile.am @@ -127,10 +127,7 @@ 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 \ $(SRCS_CLIPBOARD) \ $(SRCS_MULTIWINDOW) \ $(SRCS_MULTIWINDOWEXTWM) \ @@ -153,12 +150,14 @@ 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 \ + $(top_builddir)/Xi/libXistubs.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 |