Add $(DIX_CFLAGS) to remaining Makefile.am files
This commit is contained in:
parent
1dcda4f3c5
commit
20e9144c07
|
@ -27,7 +27,7 @@ endif
|
||||||
|
|
||||||
AM_YFLAGS = -d
|
AM_YFLAGS = -d
|
||||||
AM_CFLAGS = \
|
AM_CFLAGS = \
|
||||||
\
|
$(DIX_CFLAGS) \
|
||||||
-I$(top_srcdir)/hw/dmx \
|
-I$(top_srcdir)/hw/dmx \
|
||||||
$(GLX_INCS) \
|
$(GLX_INCS) \
|
||||||
-DHAVE_DMX_CONFIG_H \
|
-DHAVE_DMX_CONFIG_H \
|
||||||
|
|
|
@ -32,7 +32,7 @@ libglxproxy_a_SOURCES = compsize.c \
|
||||||
unpack.h
|
unpack.h
|
||||||
|
|
||||||
AM_CFLAGS = \
|
AM_CFLAGS = \
|
||||||
\
|
$(DIX_CFLAGS) \
|
||||||
-I$(top_srcdir)/hw/dmx \
|
-I$(top_srcdir)/hw/dmx \
|
||||||
-I$(top_srcdir)/include \
|
-I$(top_srcdir)/include \
|
||||||
-I$(top_srcdir)/GL/include \
|
-I$(top_srcdir)/GL/include \
|
||||||
|
|
|
@ -60,7 +60,7 @@ GLX_DEFS = @GL_CFLAGS@
|
||||||
GLX_INCS = -I@MESA_SOURCE@/include
|
GLX_INCS = -I@MESA_SOURCE@/include
|
||||||
endif
|
endif
|
||||||
|
|
||||||
AM_CFLAGS = \
|
AM_CFLAGS = $(DIX_CFLAGS) \
|
||||||
-I$(top_srcdir)/hw/dmx \
|
-I$(top_srcdir)/hw/dmx \
|
||||||
-I$(top_srcdir)/hw/xfree86/common \
|
-I$(top_srcdir)/hw/xfree86/common \
|
||||||
$(GLX_INCS) \
|
$(GLX_INCS) \
|
||||||
|
|
|
@ -22,7 +22,7 @@ DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \
|
||||||
|
|
||||||
bin_PROGRAMS = Xorg
|
bin_PROGRAMS = Xorg
|
||||||
|
|
||||||
AM_CFLAGS = @XORG_CFLAGS@
|
AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
|
||||||
INCLUDES = @XORG_INCS@
|
INCLUDES = @XORG_INCS@
|
||||||
|
|
||||||
Xorg_SOURCES = xorg.c
|
Xorg_SOURCES = xorg.c
|
||||||
|
|
|
@ -50,7 +50,7 @@ ARCH_SOURCES = \
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# FIXME: NetBSD Aperture defines (configure.ac)
|
# FIXME: NetBSD Aperture defines (configure.ac)
|
||||||
AM_CFLAGS = -DUSESTDRES $(XORG_CFLAGS)
|
AM_CFLAGS = -DUSESTDRES $(XORG_CFLAGS) $(DIX_CFLAGS)
|
||||||
|
|
||||||
INCLUDES = $(XORG_INCS)
|
INCLUDES = $(XORG_INCS)
|
||||||
|
|
||||||
|
|
|
@ -53,6 +53,6 @@ libbus_la_SOURCES = Pci.c Pci.h $(PCI_SOURCES) $(PLATFORM_PCI_SOURCES) \
|
||||||
|
|
||||||
INCLUDES = $(XORG_INCS)
|
INCLUDES = $(XORG_INCS)
|
||||||
|
|
||||||
AM_CFLAGS = $(XORG_CFLAGS)
|
AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS)
|
||||||
|
|
||||||
EXTRA_DIST = $(sdk_HEADERS)
|
EXTRA_DIST = $(sdk_HEADERS)
|
||||||
|
|
|
@ -12,6 +12,6 @@ libhurd_la_SOURCES = hurd_bell.c hurd_init.c hurd_mmap.c \
|
||||||
$(srcdir)/../shared/kmod_noop.c \
|
$(srcdir)/../shared/kmod_noop.c \
|
||||||
$(srcdir)/../shared/agp_noop.c
|
$(srcdir)/../shared/agp_noop.c
|
||||||
|
|
||||||
AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS)
|
AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(DIX_CFLAGS)
|
||||||
|
|
||||||
INCLUDES = $(XORG_INCS)
|
INCLUDES = $(XORG_INCS)
|
||||||
|
|
|
@ -34,7 +34,7 @@ liblinux_la_SOURCES = lnx_init.c lnx_video.c lnx_mouse.c \
|
||||||
$(APM_SRCS) \
|
$(APM_SRCS) \
|
||||||
$(PLATFORM_PCI_SUPPORT)
|
$(PLATFORM_PCI_SUPPORT)
|
||||||
|
|
||||||
AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(PLATFORM_DEFINES)
|
AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES)
|
||||||
|
|
||||||
INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack
|
INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack
|
||||||
|
|
||||||
|
|
|
@ -18,6 +18,6 @@ libmisc_la_SOURCES = xf86_Util.c Delay.c $(ARCH_SRCS)
|
||||||
|
|
||||||
INCLUDES = $(XORG_INCS)
|
INCLUDES = $(XORG_INCS)
|
||||||
|
|
||||||
AM_CFLAGS = $(XORG_CFLAGS)
|
AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS)
|
||||||
|
|
||||||
EXTRA_DIST = $(I386_SRCS) $(PORTIO_SRCS) $(ILHACK_SRCS)
|
EXTRA_DIST = $(I386_SRCS) $(PORTIO_SRCS) $(ILHACK_SRCS)
|
||||||
|
|
|
@ -30,7 +30,7 @@ nodist_libsolaris_la_SOURCES = $(SOLARIS_INOUT_SRC)
|
||||||
sdk_HEADERS = agpgart.h
|
sdk_HEADERS = agpgart.h
|
||||||
nodist_sdk_HEADERS = solaris-$(SOLARIS_INOUT_ARCH).il
|
nodist_sdk_HEADERS = solaris-$(SOLARIS_INOUT_ARCH).il
|
||||||
|
|
||||||
AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS)
|
AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(DIX_CFLAGS)
|
||||||
|
|
||||||
INCLUDES = $(XORG_INCS)
|
INCLUDES = $(XORG_INCS)
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@ SUBDIRS = \
|
||||||
$(XEGL_SUBDIRS)
|
$(XEGL_SUBDIRS)
|
||||||
|
|
||||||
AM_CFLAGS = \
|
AM_CFLAGS = \
|
||||||
\
|
$(DIX_CFLAGS) \
|
||||||
-DHAVE_XGL_CONFIG_H \
|
-DHAVE_XGL_CONFIG_H \
|
||||||
-DHAVE_DIX_CONFIG_H \
|
-DHAVE_DIX_CONFIG_H \
|
||||||
-I$(top_srcdir)/GL/glx \
|
-I$(top_srcdir)/GL/glx \
|
||||||
|
|
|
@ -9,7 +9,7 @@ SUBDIRS = \
|
||||||
$(XGL_MODULE_DIRS)
|
$(XGL_MODULE_DIRS)
|
||||||
|
|
||||||
AM_CFLAGS = \
|
AM_CFLAGS = \
|
||||||
\
|
$(DIX_CFLAGS) \
|
||||||
-DHAVE_XGL_CONFIG_H \
|
-DHAVE_XGL_CONFIG_H \
|
||||||
-DHAVE_DIX_CONFIG_H \
|
-DHAVE_DIX_CONFIG_H \
|
||||||
$(XEGLMODULES_CFLAGS)
|
$(XEGLMODULES_CFLAGS)
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
AM_CFLAGS = \
|
AM_CFLAGS = \
|
||||||
|
$(DIX_CFLAGS) \
|
||||||
-I$(srcdir)/.. \
|
-I$(srcdir)/.. \
|
||||||
-I$(srcdir)/../.. \
|
-I$(srcdir)/../.. \
|
||||||
$(XEGLMODULES_CFLAGS)
|
$(XEGLMODULES_CFLAGS)
|
||||||
|
|
|
@ -15,7 +15,7 @@ AM_CFLAGS = \
|
||||||
-I$(top_srcdir)/GL/include \
|
-I$(top_srcdir)/GL/include \
|
||||||
-I@MESA_SOURCE@/include \
|
-I@MESA_SOURCE@/include \
|
||||||
-I@MESA_SOURCE@/src/mesa/glapi \
|
-I@MESA_SOURCE@/src/mesa/glapi \
|
||||||
\
|
$(DIX_CFLAGS) \
|
||||||
-DHAVE_XGL_CONFIG_H \
|
-DHAVE_XGL_CONFIG_H \
|
||||||
-DHAVE_DIX_CONFIG_H \
|
-DHAVE_DIX_CONFIG_H \
|
||||||
$(XGLXMODULES_CFLAGS)
|
$(XGLXMODULES_CFLAGS)
|
||||||
|
|
|
@ -2,7 +2,7 @@ if GLX
|
||||||
GLX_LIB = $(top_builddir)/hw/xgl/glxext/libxglglxext.la
|
GLX_LIB = $(top_builddir)/hw/xgl/glxext/libxglglxext.la
|
||||||
endif
|
endif
|
||||||
|
|
||||||
AM_CFLAGS = \
|
AM_CFLAGS = $(DIX_CFLAGS) \
|
||||||
-I$(srcdir)/.. \
|
-I$(srcdir)/.. \
|
||||||
-I$(srcdir)/../.. \
|
-I$(srcdir)/../.. \
|
||||||
$(XGLXMODULES_CFLAGS)
|
$(XGLXMODULES_CFLAGS)
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
SUBDIRS = module
|
SUBDIRS = module
|
||||||
|
|
||||||
AM_CFLAGS = \
|
AM_CFLAGS = \
|
||||||
\
|
$(DIX_CFLAGS) \
|
||||||
-DHAVE_XGL_CONFIG_H \
|
-DHAVE_XGL_CONFIG_H \
|
||||||
-DHAVE_DIX_CONFIG_H \
|
-DHAVE_DIX_CONFIG_H \
|
||||||
$(XGLMODULES_CFLAGS) \
|
$(XGLMODULES_CFLAGS) \
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
AM_CFLAGS = \
|
AM_CFLAGS = \
|
||||||
\
|
$(DIX_CFLAGS) \
|
||||||
-DHAVE_XGL_CONFIG_H \
|
-DHAVE_XGL_CONFIG_H \
|
||||||
-DHAVE_DIX_CONFIG_H \
|
-DHAVE_DIX_CONFIG_H \
|
||||||
$(XGLMODULES_CFLAGS) \
|
$(XGLMODULES_CFLAGS) \
|
||||||
|
|
|
@ -161,7 +161,7 @@ CLEANFILES = $(BUILT_SOURCES)
|
||||||
|
|
||||||
AM_YFLAGS = -d
|
AM_YFLAGS = -d
|
||||||
AM_LFLAGS = -i
|
AM_LFLAGS = -i
|
||||||
AM_CFLAGS = -DHAVE_XWIN_CONFIG_H \
|
AM_CFLAGS = -DHAVE_XWIN_CONFIG_H $(DIX_CFLAGS) \
|
||||||
$(XWINMODULES_CFLAGS)
|
$(XWINMODULES_CFLAGS)
|
||||||
|
|
||||||
dist_man1_MANS = XWin.man XWinrc.man
|
dist_man1_MANS = XWin.man XWinrc.man
|
||||||
|
|
Loading…
Reference in New Issue
Block a user