mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-17 00:32:57 +00:00
get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE
Get rid of almost all uses of these definitions. They're still defined for delinquent out-of-tree drivers, and also for the Mesa build. As well as for miinitext.c. But largely gone.
This commit is contained in:
parent
881953813c
commit
84683f19b4
141 changed files with 146 additions and 652 deletions
|
|
@ -33,7 +33,7 @@ INCLUDES = $(XORG_INCS) -I$(top_srcdir)/hw/xfree86/parser
|
|||
|
||||
OPTIONSPATH=$(libdir)/X11
|
||||
|
||||
xorgcfg_CFLAGS = @SERVER_DEFINES@ $(XORG_CFLAGS) $(CURSESDEFINES) \
|
||||
xorgcfg_CFLAGS = $(XORG_CFLAGS) $(CURSESDEFINES) \
|
||||
$(XORGCFG_DEP_CFLAGS) -DXKB_RULES_DIR=\"$(XKB_BASE_DIRECTORY)/rules\" \
|
||||
-DPROJECT_ROOT=\"$(PROJECTROOT)\" -DOPTIONSPATH=\"$(OPTIONSPATH)\"
|
||||
xorgcfg_LDADD = $(XORGCFG_DEP_LIBS) ../../parser/libxf86config.a $(LOADERLIB) \
|
||||
|
|
|
|||
|
|
@ -36,9 +36,6 @@
|
|||
|
||||
#else
|
||||
|
||||
#ifndef XFree86LOADER
|
||||
#define XFree86LOADER /* not really */
|
||||
#endif
|
||||
#define IN_LOADER
|
||||
|
||||
#include "xf86.h"
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ bin_PROGRAMS = xorgconfig
|
|||
X11dir = $(libdir)/X11
|
||||
dist_X11_DATA = Cards
|
||||
|
||||
xorgconfig_CFLAGS = @SERVER_DEFINES@ @XORGCONFIG_DEP_CFLAGS@ \
|
||||
xorgconfig_CFLAGS = @XORGCONFIG_DEP_CFLAGS@ \
|
||||
-DCARD_DATABASE_FILE='"$(X11dir)/Cards"' \
|
||||
-DPROJECTROOT='"$(PROJECTROOT)"' \
|
||||
-DFILEMANSUFFIX='"$(FILE_MAN_SUFFIX)"' \
|
||||
|
|
|
|||
Loading…
Reference in a new issue