e6f35f28fb
OsInitColors always just returned TRUE, so just remove calls to it and insane special-case logic. Remove unused kcolor.c implementation, and merge oscolor.h into oscolor.c since it was the only user. Remove open-coded strncasecmp in oscolor.c. Since we no longer need to call OsInitColors after reading the config file, just call PostConfigInit() from one place, and move PM handling to one place so we can install the signal handlers earlier.
56 lines
975 B
Makefile
56 lines
975 B
Makefile
noinst_LTLIBRARIES = libos.la
|
|
|
|
AM_CFLAGS = $(DIX_CFLAGS)
|
|
|
|
SECURERPC_SRCS = rpcauth.c
|
|
XDMCP_SRCS = xdmcp.c
|
|
STRLCAT_SRCS = strlcat.c strlcpy.c
|
|
XORG_SRCS = log.c
|
|
|
|
libos_la_SOURCES = \
|
|
WaitFor.c \
|
|
access.c \
|
|
auth.c \
|
|
connection.c \
|
|
io.c \
|
|
mitauth.c \
|
|
oscolor.c \
|
|
osdep.h \
|
|
osinit.c \
|
|
utils.c \
|
|
xdmauth.c \
|
|
xstrans.c \
|
|
xprintf.c \
|
|
$(XORG_SRCS)
|
|
|
|
if SECURE_RPC
|
|
libos_la_SOURCES += $(SECURERPC_SRCS)
|
|
endif
|
|
|
|
if XDMCP
|
|
libos_la_SOURCES += $(XDMCP_SRCS)
|
|
endif
|
|
|
|
if NEED_STRLCAT
|
|
libos_la_SOURCES += $(STRLCAT_SRCS)
|
|
endif
|
|
|
|
EXTRA_DIST = $(SECURERPC_SRCS) $(INTERNALMALLOC_SRCS) \
|
|
$(XDMCP_SRCS) $(STRLCAT_SRCS)
|
|
|
|
if XSERVER_DTRACE
|
|
# Generate dtrace object code for probes in libos & libdix
|
|
dtrace.o: $(top_srcdir)/dix/Xserver.d $(am_libos_la_OBJECTS)
|
|
$(DTRACE) -G -C -o $@ -s $(top_srcdir)/dix/Xserver.d .libs/*.o ../dix/.libs/*.o
|
|
|
|
noinst_PROGRAMS = os.O
|
|
|
|
os.O: dtrace.o $(am_libos_la_OBJECTS)
|
|
ld -r -o $@ dtrace.o .libs/*.o
|
|
endif
|
|
|
|
os.c:
|
|
touch $@
|
|
|
|
CLEANFILES = os.c
|