diff options
Diffstat (limited to 'xserver/hw/xwin/Makefile.am')
| -rw-r--r-- | xserver/hw/xwin/Makefile.am | 34 |
1 files changed, 5 insertions, 29 deletions
diff --git a/xserver/hw/xwin/Makefile.am b/xserver/hw/xwin/Makefile.am index 0846230b0..5f67a6eca 100644 --- a/xserver/hw/xwin/Makefile.am +++ b/xserver/hw/xwin/Makefile.am @@ -1,12 +1,9 @@ bin_PROGRAMS = XWin -if XWIN_CLIPBOARD SRCS_CLIPBOARD = \ winclipboardinit.c \ winclipboardwrappers.c -DEFS_CLIPBOARD = -DXWIN_CLIPBOARD CLIPBOARD_LIBS = $(top_builddir)/hw/xwin/winclipboard/libXWinclipboard.la -endif if XWIN_GLX_WINDOWS GLX_DIR = @@ -23,7 +20,6 @@ XWIN_GLX_LIBS += $(top_builddir)/hw/xwin/glx/libXwinGLX.la XWIN_GLX_SYS_LIBS = -lopengl32 endif -if XWIN_MULTIWINDOW SRCS_MULTIWINDOW = \ winmultiwindowshape.c \ winmultiwindowwindow.c \ @@ -31,9 +27,7 @@ SRCS_MULTIWINDOW = \ winmultiwindowwndproc.c \ propertystore.h \ winSetAppUserModelID.c -DEFS_MULTIWINDOW = -DXWIN_MULTIWINDOW MULTIWINDOW_SYS_LIBS = -lshlwapi -lole32 -endif if XWIN_MULTIWINDOWEXTWM SRCS_MULTIWINDOWEXTWM = \ @@ -43,19 +37,11 @@ SRCS_MULTIWINDOWEXTWM = \ winwindowswm.c DEFS_MULTIWINDOWEXTWM = -DXWIN_MULTIWINDOWEXTWM MULTIWINDOWEXTWM_LIBS = $(top_builddir)/miext/rootless/librootless.la +MULTIWINDOWEXTWM_CFLAGS = -I$(top_srcdir)/miext/rootless endif -if XWIN_RANDR SRCS_RANDR = \ winrandr.c -DEFS_RANDR = -DXWIN_RANDR -endif - -if XWIN_XV -SRCS_XV = \ - winvideo.c -DEFS_XV = -DXWIN_XV -endif SRCS = InitInput.c \ InitOutput.c \ @@ -116,29 +102,18 @@ SRCS = InitInput.c \ $(SRCS_CLIPBOARD) \ $(SRCS_MULTIWINDOW) \ $(SRCS_MULTIWINDOWEXTWM) \ - $(SRCS_NATIVEGDI) \ - $(SRCS_PRIMARYFB) \ - $(SRCS_RANDR) \ - $(SRCS_XV) + $(SRCS_RANDR) - DEFS = $(DEFS_CLIPBOARD) \ +DEFS = \ $(DEFS_GLX_WINDOWS) \ - $(DEFS_MULTIWINDOW) \ - $(DEFS_MULTIWINDOWEXTWM) \ - $(DEFS_NATIVEGDI) \ - $(DEFS_PRIMARYFB) \ - $(DEFS_RANDR) \ - $(DEFS_XV) + $(DEFS_MULTIWINDOWEXTWM) XWin_SOURCES = $(SRCS) -AM_CPPFLAGS = -I$(top_srcdir)/miext/rootless - XWIN_SYS_LIBS += -ldxguid XWIN_LIBS += \ $(top_builddir)/pseudoramiX/libPseudoramiX.la \ - $(top_builddir)/Xext/libXextdpmsstubs.la \ $(top_builddir)/Xi/libXistubs.la XWin_DEPENDENCIES = \ @@ -179,6 +154,7 @@ AM_LFLAGS = -i AM_CFLAGS = -DHAVE_XWIN_CONFIG_H $(DIX_CFLAGS) \ $(XWINMODULES_CFLAGS) \ -I$(top_srcdir) \ + $(MULTIWINDOWEXTWM_CFLAGS) \ -Wno-bad-function-cast xwinconfigdir = $(sysconfdir)/X11 |